From 5a7d027a2b7c2260a370f4562d33afa3f23e42f5 Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Fri, 13 Oct 2023 15:55:01 +0530 Subject: [PATCH 1/6] Book module Message : ps --- app/Controllers/Books.php | 81 +++++++++++++++++++++++++++++------- app/Models/BooksModel.php | 18 ++++++++ app/Models/CustomerModel.php | 5 +-- app/Views/book_form.php | 4 +- app/Views/book_list.php | 18 ++++++++ 5 files changed, 105 insertions(+), 21 deletions(-) diff --git a/app/Controllers/Books.php b/app/Controllers/Books.php index 8d51d4b0..5a165bfb 100755 --- a/app/Controllers/Books.php +++ b/app/Controllers/Books.php @@ -54,6 +54,7 @@ class Books extends BaseController ## For inserting/updating details of book public function insert_books() { + try{ helper('session'); $session_uid = get_logged_user_id(); $session_bid = get_business_id(); @@ -121,13 +122,29 @@ class Books extends BaseController $data['isactive'] = 1; $data['category'] = 1; $data['created_by'] = $session_uid; - $BooksModel->insert($data); + if ($BooksModel->insert($data)) { + session()->setFlashdata('success', 'Book has been added successfully.'); + $this->logger->info("Books: has been added successfully. Inserted ID = " . $BooksModel->insertID()); + } else { + session()->setFlashdata('error', 'Book could not be added. Please try again..'); + $this->logger->error("Books: Err could not be added. Please try again."); + } } else { // It's an update operation $isactive = $this->request->getPost('isactive'); $data['isactive'] = ($isactive == 'on') ? 1 : 0; $data['updated_by'] = $session_uid; - $BooksModel->update($book_id, $data); + if ($BooksModel->update($book_id, $data)) { + session()->setFlashdata('success', 'Book has been updated successfully.'); + $this->logger->info("Books: has been updated successfully. Updated Book ID = " . $book_id); + } else { + session()->setFlashdata('error', 'Book update failed. Please try again.'); + $this->logger->error("Books: Err Failed to update ID =" . $book_id); + } + } + } catch (\Exception $e) { + $this->logger->error("Book: Err Occur = ".$e->getMessage()." File = ". $e->getFile() . " Line = " . $e->getLine()); + session()->setFlashdata('error', 'Message: ' . $e->getMessage()); } return redirect()->route('book_list'); } @@ -135,21 +152,55 @@ class Books extends BaseController ## For delete the book details (Which means inactive the details) public function delete_books($id) { - - helper('session'); - $session_uid = get_logged_user_id(); - - $BooksModel = new BooksModel(); - - $existingBook = $BooksModel->find($id); - if (!$existingBook) { - return redirect()->route('book_list'); + try { + helper('session'); + $session_uid = get_logged_user_id(); + $BooksModel = new BooksModel(); + $where = ['book_id' => (int)$id, 'isactive =' => 1]; + // $existingBook = $BooksModel->find($id); + $existingBook = $BooksModel->where($where)->find($id); + if ($existingBook) { + $this->logger->Info("BOOK: Going to Inactive ID = ".$id); + $data = ['isactive' => 0 , 'updated_by' => $session_uid]; + if ($BooksModel->update($id, $data)) { + $activeBookImages = $BooksModel->getData('book_images', $where); + if(!empty($activeBookImages)){ + for ($y = 0; $y < count($activeBookImages); $y++) { + $bookImgIds[$y] = $activeBookImages[$y]->book_img_id; + } + if(!empty($bookImgIds)){ + $this->logger->Info("BOOK: Images Going to Inactived = ".implode(" ",$bookImgIds)); + $inactive_img_whereIn[0] = 'book_img_id'; + $inactive_img_whereIn[1] = $bookImgIds; + $BooksModel->inactiveMissingDetails('book_images',$where, $inactive_img_whereIn); + } + } + $activeBookCategory = $BooksModel->getData('book_categories', $where); + if(!empty($activeBookCategory)){ + for ($z = 0; $z < count($activeBookCategory); $z++) { + $bookCategoryIds[$z] = $activeBookCategory[$z]->id; + } + if(!empty($bookCategoryIds)){ + $this->logger->Info("BOOK: Categories Going to Inactived = ".implode(" ",$bookCategoryIds)); + $inactive_category_whereIn[0] = 'id'; + $inactive_category_whereIn[1] = $bookCategoryIds; + $BooksModel->inactiveMissingDetails('book_categories',$where, $inactive_category_whereIn); + } + } + + session()->setFlashdata('success', 'Deleted successfully.'); + $this->logger->info("BOOK: has been Inactived successfully. Inactived ID = " . $id); + } else { + $this->logger->error("BOOK: Not able to Inactive ID =" . $id); + throw new \Exception("Data Not able to Deleted"); + } + } + } catch (\Exception $e) { + $this->logger->error("Book: Err Occur = ".$e->getMessage()." File = ". $e->getFile() . " Line = " . $e->getLine()); + session()->setFlashdata('error', 'Message: ' . $e->getMessage()); } - - $data['isactive'] = 0; - $data['updated_by'] = $session_uid; - $BooksModel->update($id, $data); return redirect()->route('book_list'); } + } diff --git a/app/Models/BooksModel.php b/app/Models/BooksModel.php index 80dfc8d6..4a7d9ca2 100644 --- a/app/Models/BooksModel.php +++ b/app/Models/BooksModel.php @@ -58,4 +58,22 @@ class BooksModel extends Model return $books; } +public function getData($table, $where = null,$whereIn = null) +{ + $query = $this->db->table($table); + if ($where) { + $query->where($where); + } + if($whereIn){ + // $query->whereIn($column_name,$missingValues) + $query->whereIn($whereIn[0],$whereIn[1]); + } + return $query->get()->getResult(); +} + +public function inactiveMissingDetails($table_name,$where,$whereIn){ + $dataToUpdate = ['isactive' => 0]; + $this->db->table($table_name)->where($where)->whereIn($whereIn[0],$whereIn[1])->update($dataToUpdate); +} + } diff --git a/app/Models/CustomerModel.php b/app/Models/CustomerModel.php index 79a7a894..7afe40a5 100644 --- a/app/Models/CustomerModel.php +++ b/app/Models/CustomerModel.php @@ -9,11 +9,8 @@ class CustomerModel extends Model { protected $table = 'customers'; protected $primaryKey = 'customer_id '; -<<<<<<< HEAD - protected $allowedFields = ['customer_id ','first_name','city','last_name','email','mobile_no','country','state','postal_code' ,'address','profile_picture','date_of_birth','gender','mode','isactive','business_id']; -======= + // protected $allowedFields = ['customer_id ','first_name','city','last_name','email','mobile_no','country','state','postal_code' ,'address','profile_picture','date_of_birth','gender','mode','isactive','business_id']; protected $allowedFields = ['customer_id ','first_name','city','last_name','email','mobile_no','country','state','postal_code' ,'address','profile_picture','date_of_birth','gender','mode','type','isactive','business_id','created_by','updated_by']; ->>>>>>> caaaaa0ffd2a11af5f49570cb1fadb521e89b52f public function insertCustomer($data) { diff --git a/app/Views/book_form.php b/app/Views/book_form.php index 6bef9284..20499904 100644 --- a/app/Views/book_form.php +++ b/app/Views/book_form.php @@ -53,7 +53,7 @@
- +
Please provide.
@@ -83,7 +83,7 @@
- +
diff --git a/app/Views/book_list.php b/app/Views/book_list.php index 28e8b58e..deb249e5 100644 --- a/app/Views/book_list.php +++ b/app/Views/book_list.php @@ -7,6 +7,24 @@

+ getFlashdata('success') || session()->getFlashdata('error')) : ?> + getFlashdata('success')) : ?> + + + getFlashdata('error')) : ?> + + +
From f726377124a7b67f497fb6009912fabe09964364 Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Fri, 13 Oct 2023 16:38:19 +0530 Subject: [PATCH 2/6] Scheme Message : ps --- app/Controllers/Books.php | 5 +- app/Controllers/Scheme.php | 117 ++++++++++++++++++++++--------------- app/Models/BooksModel.php | 16 +++-- app/Models/SchemeModel.php | 29 ++++++++- app/Views/scheme_list.php | 18 ++++++ 5 files changed, 131 insertions(+), 54 deletions(-) diff --git a/app/Controllers/Books.php b/app/Controllers/Books.php index 5a165bfb..97ba44b5 100755 --- a/app/Controllers/Books.php +++ b/app/Controllers/Books.php @@ -120,7 +120,6 @@ class Books extends BaseController if (empty($book_id)) { // It's an insert operation $data['isactive'] = 1; - $data['category'] = 1; $data['created_by'] = $session_uid; if ($BooksModel->insert($data)) { session()->setFlashdata('success', 'Book has been added successfully.'); @@ -172,7 +171,7 @@ class Books extends BaseController $this->logger->Info("BOOK: Images Going to Inactived = ".implode(" ",$bookImgIds)); $inactive_img_whereIn[0] = 'book_img_id'; $inactive_img_whereIn[1] = $bookImgIds; - $BooksModel->inactiveMissingDetails('book_images',$where, $inactive_img_whereIn); + $BooksModel->inactiveMissingDetails('book_images',$data,$where, $inactive_img_whereIn); } } $activeBookCategory = $BooksModel->getData('book_categories', $where); @@ -184,7 +183,7 @@ class Books extends BaseController $this->logger->Info("BOOK: Categories Going to Inactived = ".implode(" ",$bookCategoryIds)); $inactive_category_whereIn[0] = 'id'; $inactive_category_whereIn[1] = $bookCategoryIds; - $BooksModel->inactiveMissingDetails('book_categories',$where, $inactive_category_whereIn); + $BooksModel->inactiveMissingDetails('book_categories',$data,$where, $inactive_category_whereIn); } } diff --git a/app/Controllers/Scheme.php b/app/Controllers/Scheme.php index 91ede95e..665767f2 100644 --- a/app/Controllers/Scheme.php +++ b/app/Controllers/Scheme.php @@ -57,6 +57,7 @@ class Scheme extends BaseController ## For inserting/updating details of scheme public function insert_scheme() { + try{ helper('session'); $session_bid = get_business_id(); $session_uid = get_logged_user_id(); @@ -76,30 +77,32 @@ class Scheme extends BaseController if (empty($scheme_id)) { // It's an insert operation $data['isactive'] = 1; - $data['created_by'] = $session_uid; - $SchemeModel->insert($data); - // $last_inserted_id = 100; - $last_inserted_id = $SchemeModel->insertID(); - - // Retrieve the category name 'membership' - $category_name = 'membership'; - - // Find the category ID for 'membership' from the category table - $db = db_connect(); - $category = $db->table('category') - ->select('id') - ->where('name', $category_name) - ->get() - ->getRow(); - - // Check if the category exists - if ($category) { - // Insert data into book_categories table - $db->table('book_categories')->insert([ - 'book_id' => $last_inserted_id, - 'category_id' => $category->id - ]); + if ($SchemeModel->insert($data)) { + $last_inserted_id = $SchemeModel->insertID(); + // Retrieve the category name 'membership' + $category_name = 'membership'; + // Find the category ID for 'membership' from the category table + $db = db_connect(); + $category = $db->table('category') + ->select('id') + ->where('name', $category_name) + ->get() + ->getRow(); + // Check if the category exists + if ($category) { + // Insert data into book_categories table + $db->table('book_categories')->insert([ + 'book_id' => $last_inserted_id, + 'category_id' => $category->id, + 'created_by' => $session_uid + ]); + } + session()->setFlashdata('success', 'Scheme has been added successfully.'); + $this->logger->info("Scheme: has been added successfully. Inserted ID = " . $last_inserted_id); + } else { + session()->setFlashdata('error', 'Scheme could not be added. Please try again..'); + $this->logger->error("Scheme: Err could not be added. Please try again."); } } else { @@ -107,37 +110,59 @@ class Scheme extends BaseController $isactive = $this->request->getPost('isactive'); $data['isactive'] = ($isactive == 'on') ? 1 : 0; $data['updated_by'] = $session_uid; - $SchemeModel->update($scheme_id, $data); + if ($SchemeModel->update($scheme_id, $data)) { + session()->setFlashdata('success', 'Scheme has been updated successfully.'); + $this->logger->info("Scheme: has been updated successfully. Updated Scheme ID = " . $scheme_id); + } else { + session()->setFlashdata('error', 'Scheme update failed. Please try again.'); + $this->logger->error("Scheme: Err Failed to update ID =" . $scheme_id); + } } + } catch (\Exception $e) { + $this->logger->error("Scheme: Err Occur = ".$e->getMessage()." File = ". $e->getFile() . " Line = " . $e->getLine()); + session()->setFlashdata('error', 'Message: ' . $e->getMessage()); + } return redirect()->route('scheme_list'); } ## For delete the Scheme details (Which means inactive the details) public function delete_scheme($id) { - $SchemeModel = new SchemeModel(); - - // Check if the business ID exists - $existingScheme = $SchemeModel->find($id); - - if (!$existingScheme) { - // return redirect()->to(base_url('Business/index'))->with('error', 'Business not found.'); - return redirect()->route('scheme_list'); + try { + helper('session'); + $session_uid = get_logged_user_id(); + $SchemeModel = new SchemeModel(); + $where = ['book_id' => (int)$id, 'isactive =' => 1]; + // $existingScheme = $SchemeModel->find($id); + $existingScheme = $SchemeModel->where($where)->find($id); + if ($existingScheme) { + $this->logger->Info("Scheme: Going to Inactive ID = ".$id); + $data = ['isactive' => 0 , 'updated_by' => $session_uid]; + if ($SchemeModel->update($id, $data)) { + $activeSchemeCategory = $SchemeModel->getData('book_categories', $where); + if(!empty($activeSchemeCategory)){ + for ($z = 0; $z < count($activeSchemeCategory); $z++) { + $SchemeCategoryIds[$z] = $activeSchemeCategory[$z]->id; + } + if(!empty($SchemeCategoryIds)){ + $this->logger->Info("Scheme: Categories Going to Inactived = ".implode(" ",$SchemeCategoryIds)); + $inactive_category_whereIn[0] = 'id'; + $inactive_category_whereIn[1] = $SchemeCategoryIds; + $SchemeModel->inactiveMissingDetails('book_categories',$data,$where, $inactive_category_whereIn); + } + } + + session()->setFlashdata('success', 'Deleted successfully.'); + $this->logger->info("Scheme: has been Inactived successfully. Inactived ID = " . $id); + } else { + $this->logger->error("Scheme: Not able to Inactive ID =" . $id); + throw new \Exception("Data Not able to Deleted"); + } + } + } catch (\Exception $e) { + $this->logger->error("Scheme: Err Occur = ".$e->getMessage()." File = ". $e->getFile() . " Line = " . $e->getLine()); + session()->setFlashdata('error', 'Message: ' . $e->getMessage()); } - - helper('session'); - $session_uid = get_logged_user_id(); - // Delete the business record - $data['isactive'] = 0; - $data['updated_by'] = $session_uid; - //echo 'id='.$id; - print_r($data); - //die(); - $SchemeModel->update($id, $data); - // print_r($data);die(); - //$BusinessModel->delete($id); - - // return redirect()->to(base_url('Business/index'))->with('success', 'Business deleted successfully.'); return redirect()->route('scheme_list'); } } diff --git a/app/Models/BooksModel.php b/app/Models/BooksModel.php index 4a7d9ca2..98a6211d 100644 --- a/app/Models/BooksModel.php +++ b/app/Models/BooksModel.php @@ -71,9 +71,17 @@ public function getData($table, $where = null,$whereIn = null) return $query->get()->getResult(); } -public function inactiveMissingDetails($table_name,$where,$whereIn){ - $dataToUpdate = ['isactive' => 0]; - $this->db->table($table_name)->where($where)->whereIn($whereIn[0],$whereIn[1])->update($dataToUpdate); -} + public function inactiveMissingDetails($table_name,$dataToUpdate,$where = null,$whereIn = null) + { + $this->db->table($table_name); + $query = $this->db->table($table_name); + if ($where) { + $query->where($where); + } + if ($whereIn) { + $query->whereIn($whereIn[0], $whereIn[1]); + } + return $query->update($dataToUpdate); + } } diff --git a/app/Models/SchemeModel.php b/app/Models/SchemeModel.php index 513bc406..ab3e1fa5 100644 --- a/app/Models/SchemeModel.php +++ b/app/Models/SchemeModel.php @@ -9,7 +9,7 @@ class SchemeModel extends Model { protected $table = 'books'; protected $primaryKey = 'book_id'; - protected $allowedFields = ['book_id ','title','sku','description','price','features','duration','business_id','updated_by','category','isactive']; + protected $allowedFields = ['book_id ','title','sku','description','price','features','duration','business_id','updated_by','category','isactive','created_by']; public function insertScheme($data) { @@ -25,6 +25,7 @@ class SchemeModel extends Model $builder->join('category', 'category.id = book_categories.category_id', 'left'); $builder->where('books.business_id', $business_id); $builder->where('category.name', 'membership'); + $builder->where('books.isactive', 1); $query = $builder->get(); @@ -109,6 +110,32 @@ public function getAllSchemes() { return $this->findAll(); } + + public function getData($table, $where = null, $whereIn = null) + { + $query = $this->db->table($table); + if ($where) { + $query->where($where); + } + if ($whereIn) { + // $query->whereIn($column_name,$missingValues) + $query->whereIn($whereIn[0], $whereIn[1]); + } + return $query->get()->getResult(); + } + + public function inactiveMissingDetails($table_name,$dataToUpdate,$where = null,$whereIn = null) + { + $this->db->table($table_name); + $query = $this->db->table($table_name); + if ($where) { + $query->where($where); + } + if ($whereIn) { + $query->whereIn($whereIn[0], $whereIn[1]); + } + return $query->update($dataToUpdate); + } } diff --git a/app/Views/scheme_list.php b/app/Views/scheme_list.php index 8f25239f..372adbbe 100644 --- a/app/Views/scheme_list.php +++ b/app/Views/scheme_list.php @@ -7,6 +7,24 @@

+ getFlashdata('success') || session()->getFlashdata('error')) : ?> + getFlashdata('success')) : ?> + + + getFlashdata('error')) : ?> + + +
From 628d77a6db2ebcd31af36deca583a1d988a8506b Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Fri, 13 Oct 2023 18:22:54 +0530 Subject: [PATCH 3/6] Api Invoice Adress issues 1 : ps --- app/Controllers/ApiIntegration.php | 4 ++-- app/Views/invoice_form.php | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/app/Controllers/ApiIntegration.php b/app/Controllers/ApiIntegration.php index a78d5aae..33645835 100644 --- a/app/Controllers/ApiIntegration.php +++ b/app/Controllers/ApiIntegration.php @@ -719,14 +719,14 @@ class ApiIntegration extends ResourceController if (count($billing_array) > 0) { foreach ($billing_array as $bill) { if($bill->first_name != ""){ - $billing_addr = "".$bill->address_1 .",". $bill->address_2 ."
".$bill->city." ".$bill->postcode."
".$bill->state." ".$bill->country.".
"; + $billing_addr = $bill->address_1 . " " . $bill->address_2 . ",\n" . $bill->city . ",\n" . $bill->state . " - " . $bill->postal_code . ",\n" . $bill->country . "."; } } } if (count($shipping_array) > 0) { foreach ($shipping_array as $ship) { if($ship->first_name != ""){ - $shipping_addr = "".$ship->address_1 .",". $ship->address_2 ."
".$ship->city." ".$ship->postcode."
".$ship->state." ".$ship->country.".
"; + $shipping_addr = $ship->address_1 . " " . $ship->address_2 . ",\n" . $ship->city . ",\n" . $ship->state . " - " . $ship->postal_code . ",\n" . $ship->country . "."; } } } diff --git a/app/Views/invoice_form.php b/app/Views/invoice_form.php index 9eeece37..6559c9cf 100644 --- a/app/Views/invoice_form.php +++ b/app/Views/invoice_form.php @@ -45,12 +45,12 @@ -
-
@@ -644,8 +644,7 @@ $(document).ready(function() { customer_billing = ""; if (cb.length > 0) { $.each(cb, function(k, v) { - customer_billing = v.address_1 + "," + v.address_2 + "," + v.city + - "," + v.state + "," + v.country + "." + v.postal_code + customer_billing = v.address_1 + " " + v.address_2 + ",\n" + v.city + ",\n" + v.state + " - "+v.postal_code+",\n"+ v.country +"." customer_billing_id = v.customer_address_id }); } @@ -703,8 +702,7 @@ $(document).ready(function() { customer_shipping = ""; if (cs.length > 0) { $.each(cs, function(k, v) { - customer_shipping = v.address_1 + "," + v.address_2 + "," + v.city + - "," + v.state + "," + v.country + "." + v.postal_code + customer_shipping = v.address_1 + " " + v.address_2 + ",\n" + v.city + ",\n" + v.state + " - "+v.postal_code+",\n"+ v.country +"." }); } // console.log(customer_shipping); From bc6041b89d8639cd9db8c7c4993cfb8391d9ccd9 Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Fri, 13 Oct 2023 19:35:47 +0530 Subject: [PATCH 4/6] Api created by Updated by : ps --- app/Controllers/ApiIntegration.php | 52 +++++++++++++++++++++++------- app/Models/ApiIntegrationModel.php | 18 +++++++++-- 2 files changed, 56 insertions(+), 14 deletions(-) diff --git a/app/Controllers/ApiIntegration.php b/app/Controllers/ApiIntegration.php index 33645835..52f521f0 100644 --- a/app/Controllers/ApiIntegration.php +++ b/app/Controllers/ApiIntegration.php @@ -11,6 +11,24 @@ class ApiIntegration extends ResourceController { use ResponseTrait; + private $global_variable_business_id; + private $global_variable_user_id; + private $global_variable_user_name; + private $global_variable_role; + + public function __construct() + { + $this->global_variable_business_id = 1; + $this->global_variable_role = "online"; + $api_model = new ApiIntegrationModel(); + $table = 'users'; + $where = ['role'=>$this->global_variable_role,'business_id'=>(int)$this->global_variable_business_id]; + $existing_data = $api_model->getData($table, $where); + $this->global_variable_user_id = isset($existing_data[0]->user_id) ? (int)$existing_data[0]->user_id : NULL; + $this->global_variable_user_name = isset($existing_data[0]->user_id) ? $existing_data[0]->first_name." ".$existing_data[0]->last_name : NULL; + $this->logger->info("Api Integration : User = ".$this->global_variable_user_name); + } + public function api_integration($api_request_text) { $this->logger->info("Api Integration : Request Text = ".$api_request_text); try { @@ -142,6 +160,7 @@ class ApiIntegration extends ResourceController $primary_key_id = (int)$existing_data[0][$table_column[0]]; $this->logger->info("Api CallMethods : ".$table." its PrimaryKey ID = ".$primary_key_id); $inactive_data['isactive'] = 0; + $inactive_data['updated_by'] = $this->global_variable_user_id; $update_where = ['isactive' => 1, $table_column[0] => $primary_key_id]; $api_model->updateData($table, $inactive_data, $update_where); $get_existing_child_details = $api_model->getData($table_child, $update_where); @@ -253,9 +272,10 @@ class ApiIntegration extends ResourceController $book_data['price'] = (isset($records['sale_price']) && $records['sale_price'] != '') ? $records['sale_price'] : ((isset($records['regular_price']) && $records['regular_price'] != '') ? $records['regular_price'] : ((isset($records['price']) && $records['price'] != '') ? $records['price'] : NULL)); $book_data['sku'] = isset($records['sku']) ? $records['sku'] : NULL; $book_data['isactive'] = (isset($records['status']) && strtolower($records['status']) === "publish") ? 1 : 0; - $book_data['business_id'] = 1; + $book_data['business_id'] = $this->global_variable_business_id; $images = $records['images']; if ((int)$countAll == 0) { + $book_data['created_by'] = $this->global_variable_user_id; $insert_result = $api_model->insertData('books', $book_data); $last_insert_book_id = $insert_result['info']; $extensive_correspondence .= $insert_result['info'] ? "Book id : " . $insert_result['info'] @@ -265,6 +285,7 @@ class ApiIntegration extends ResourceController $insert_result['err'] ? $this->logger->error("Api SaveBookDetails : Err = ".$insert_result['err']):""; } else { $last_insert_book_id = $book_id; + $book_data['updated_by'] = $this->global_variable_user_id; /** Draft status means entry must but inactive. publish means active that's why comment here * $book_where = ['book_id' => $book_id, 'isactive' => 1, 'wp_api_product_id' => $wordpress_book_id]; **/ @@ -310,7 +331,8 @@ class ApiIntegration extends ResourceController $inactive_where = ['isactive' => 1, 'book_id' => (int)$last_insert_book_id]; $inactive_whereIn[0] = 'wp_api_img_id'; $inactive_whereIn[1] = $missingValues; - $api_model->inactiveMissingDetails('book_images', $inactive_where, $inactive_whereIn); + $data_to_batch_update = ['isactive' => 0,'updated_by'=>$this->global_variable_user_id]; + $api_model->inactiveMissingDetails('book_images',$data_to_batch_update, $inactive_where, $inactive_whereIn); } } } @@ -401,7 +423,8 @@ class ApiIntegration extends ResourceController $where2 = ['isactive' => 1]; $whereIn2[0] = 'category_id'; $whereIn2[1] = $book_categories_to_inactive; - $api_model->inactiveMissingDetails('book_categories', $where2, $whereIn2); + $data_to_batch_update2 = ['isactive' => 0,'updated_by'=>$this->global_variable_user_id]; + $api_model->inactiveMissingDetails('book_categories',$data_to_batch_update2, $where2, $whereIn2); //echo $api_model->getlastQuery(); } } // loop closed @@ -478,13 +501,14 @@ class ApiIntegration extends ResourceController $customer_data['email'] = $records['email']; $customer_data['profile_picture'] = $records['avatar_url']; $customer_data['wp_api_customer_id'] = $wordpress_customer_id; - $customer_data['mode'] = 'online'; - $customer_data['business_id'] = 1; + $customer_data['mode'] = $this->global_variable_role; + $customer_data['business_id'] = $this->global_variable_business_id; $billing = $records['billing']; $shipping = $records['shipping']; if ((int)$countAll == 0) { + $customer_data['created_by'] = $this->global_variable_user_id; $insert_result = $api_model->insertData('customers', $customer_data); $last_insert_customer_id = $insert_result['info']; $extensive_correspondence .= $insert_result['info'] ? "Customer id : " . $insert_result['info'] @@ -493,6 +517,7 @@ class ApiIntegration extends ResourceController $insert_result['info'] ? $this->logger->info("Api SaveCustomerDetails : Customer id = ".$insert_result['info']):""; $insert_result['err'] ? $this->logger->error("Api SaveCustomerDetails : Err = ".$insert_result['err']):""; } else { + $customer_data['updated_by'] = $this->global_variable_user_id; $last_insert_customer_id = $customer_id; $customer_where = ['customer_id' => $customer_id, 'isactive' => 1, 'wp_api_customer_id' => $wordpress_customer_id]; $update_result = $api_model->updateData('customers', $customer_data, $customer_where); @@ -545,7 +570,8 @@ class ApiIntegration extends ResourceController $inactive_where = ['isactive' => 1, 'customer_id' => (int)$last_insert_customer_id,'address_type'=>1]; $inactive_whereIn[0] = 'address_1'; $inactive_whereIn[1] = $missingBillingValues; - $api_model->inactiveMissingDetails('customer_addresses', $inactive_where, $inactive_whereIn); + $data_to_batch_update = ['isactive' => 0,'updated_by'=>$this->global_variable_user_id]; + $api_model->inactiveMissingDetails('customer_addresses',$data_to_batch_update, $inactive_where, $inactive_whereIn); } } } @@ -626,7 +652,8 @@ class ApiIntegration extends ResourceController $inactive_where = ['isactive' => 1, 'customer_id' => (int)$last_insert_customer_id, 'address_type'=>2]; $inactive_whereIn[0] = 'address_1'; $inactive_whereIn[1] = $missingShippingValues; - $api_model->inactiveMissingDetails('customer_addresses', $inactive_where, $inactive_whereIn); + $data_to_batch_update = ['isactive' => 0,'updated_by'=>$this->global_variable_user_id]; + $api_model->inactiveMissingDetails('customer_addresses',$data_to_batch_update, $inactive_where, $inactive_whereIn); $this->logger->info("Api SaveCustomerDetails : Missing Shipping " .implode(",",$missingShippingValues)." Are inactived"); } } @@ -762,7 +789,7 @@ class ApiIntegration extends ResourceController $invoice_data['order_number']=$records['order_key']; $invoice_data['payment_method']=$records['payment_method_title']; $invoice_data['event_id']=NULL; - $invoice_data['business_id']=1; + $invoice_data['business_id']=$this->global_variable_business_id; $invoice_data['shipping_address']=$shipping_addr; $invoice_data['shipping_address_id']=NULL; $invoice_data['billing_address']=$billing_addr; @@ -772,6 +799,7 @@ class ApiIntegration extends ResourceController $invoice_data['invoice_type'] = 1; if ((int)$countAll == 0) { + $invoice_data['created_by'] = $this->global_variable_user_id; $insert_result = $api_model->insertData('invoice', $invoice_data); $last_insert_invoice_id = $insert_result['info']; $extensive_correspondence .= $insert_result['info'] ? "Invoice id : " . $insert_result['info'] @@ -782,6 +810,7 @@ class ApiIntegration extends ResourceController } else { $last_insert_invoice_id = $invoice_id; $customer_where = ['invoice_id' => $invoice_id, 'isactive' => 1, 'wp_api_order_id' => $wordpress_order_id]; + $invoice_data['updated_by'] = $this->global_variable_user_id; $update_result = $api_model->updateData('invoice', $invoice_data, $customer_where); $extensive_correspondence .= $update_result['info'] ? "Invoice id : " . $last_insert_invoice_id . " ( " . $update_result['info'] . ")" : " ( Err :" . $update_result['err'] . ")"; @@ -829,7 +858,8 @@ class ApiIntegration extends ResourceController $inactive_where = ['isactive' => 1, 'invoice_id' => (int)$last_insert_invoice_id]; $inactive_whereIn[0] = 'wp_api_line_items_id'; $inactive_whereIn[1] = $missingValues; - $api_model->inactiveMissingDetails('invoiceitems', $inactive_where, $inactive_whereIn); + $data_to_batch_update = ['isactive' => 0,'updated_by'=>$this->global_variable_user_id]; + $api_model->inactiveMissingDetails('invoiceitems',$data_to_batch_update, $inactive_where, $inactive_whereIn); } } } @@ -890,7 +920,7 @@ class ApiIntegration extends ResourceController $subscription_data[$x]['from_subscription'] = $fromDate; $subscription_data[$x]['to_subscription'] = $toDate; $subscription_data[$x]['mode'] = $result_book_category[$x]['category_name']; - $subscription_data[$x]['business_id']=1; + $subscription_data[$x]['business_id']=$this->global_variable_business_id; $this->logger->info("Api SaveSalesDetails : Subscription Data inx = $x Request data = ".json_encode($subscription_data)); } } @@ -1089,7 +1119,7 @@ class ApiIntegration extends ResourceController $book_category_data[$a]['id'] = $masterCategoryId; $book_category_data[$a]['name'] = $r->name; $book_category_data[$a]['wp_api_category_id'] = $r->id; - $book_category_data[$a]['business_id'] = 1; + $book_category_data[$a]['business_id'] = $this->global_variable_business_id; $book_category_data[$a]['parent_wp_api_category_id'] = NULL; $a++; $this->logger->info("Api SaveCategoriesMasterDetails : Categories Data = $a Request data to save on master category = " . json_encode($book_category_data)); diff --git a/app/Models/ApiIntegrationModel.php b/app/Models/ApiIntegrationModel.php index b7e3f066..1312a41a 100644 --- a/app/Models/ApiIntegrationModel.php +++ b/app/Models/ApiIntegrationModel.php @@ -83,9 +83,21 @@ class ApiIntegrationModel extends Model return $text; } - public function inactiveMissingDetails($table_name,$where,$whereIn){ - $dataToUpdate = ['isactive' => 0]; - $this->db->table($table_name)->where($where)->whereIn($whereIn[0],$whereIn[1])->update($dataToUpdate); + // public function inactiveMissingDetails($table_name,$where,$whereIn){ + // $dataToUpdate = ['isactive' => 0]; + // $this->db->table($table_name)->where($where)->whereIn($whereIn[0],$whereIn[1])->update($dataToUpdate); + // } + public function inactiveMissingDetails($table_name,$dataToUpdate,$where = null,$whereIn = null) + { + $this->db->table($table_name); + $query = $this->db->table($table_name); + if ($where) { + $query->where($where); + } + if ($whereIn) { + $query->whereIn($whereIn[0], $whereIn[1]); + } + $query->update($dataToUpdate); } public function getBookCategories($product_id){ From 77d56c076d8b21da96b55f5e49cb209007c7a851 Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Mon, 16 Oct 2023 15:13:34 +0530 Subject: [PATCH 5/6] api Shipping Address Detils : ps --- app/Controllers/ApiIntegration.php | 100 +++++++++++++++++++++++------ 1 file changed, 82 insertions(+), 18 deletions(-) diff --git a/app/Controllers/ApiIntegration.php b/app/Controllers/ApiIntegration.php index 52f521f0..a533b1cf 100644 --- a/app/Controllers/ApiIntegration.php +++ b/app/Controllers/ApiIntegration.php @@ -26,10 +26,10 @@ class ApiIntegration extends ResourceController $existing_data = $api_model->getData($table, $where); $this->global_variable_user_id = isset($existing_data[0]->user_id) ? (int)$existing_data[0]->user_id : NULL; $this->global_variable_user_name = isset($existing_data[0]->user_id) ? $existing_data[0]->first_name." ".$existing_data[0]->last_name : NULL; - $this->logger->info("Api Integration : User = ".$this->global_variable_user_name); } public function api_integration($api_request_text) { + $this->logger->info("Api Integration : UID = ".$this->global_variable_user_id." * ".$this->global_variable_user_name); $this->logger->info("Api Integration : Request Text = ".$api_request_text); try { $request_data = $this->request->getVar(); @@ -742,20 +742,30 @@ class ApiIntegration extends ResourceController if(isset($records['billing']) && gettype($records['billing']) === 'object') {$billing_array = [$records['billing']];} if(isset($records['shipping']) && gettype($records['shipping']) === 'object') {$shipping_array = [$records['shipping']];} - + $where = ['wp_api_customer_id' => (int)$records['customer_id'], 'isactive' => 1]; + $local_customer = $api_model->getData('customers', $where); + $local_customer_id = !empty($local_customer) ? $local_customer[0]->customer_id : NULL; + $this->logger->info((!empty($local_customer)) ? "Api SaveSalesDetails : in wordpress customer ref ID = ".$records['customer_id']." is available on Customer table and its PrimaryKey = ".$local_customer_id."(local customer id)" : "Api SaveSalesDetails : in wordpress customer ref ID = ".$records['customer_id']." Not available on Customer table"); + if (count($billing_array) > 0) { - foreach ($billing_array as $bill) { - if($bill->first_name != ""){ - $billing_addr = $bill->address_1 . " " . $bill->address_2 . ",\n" . $bill->city . ",\n" . $bill->state . " - " . $bill->postal_code . ",\n" . $bill->country . "."; - } - } + // foreach ($billing_array as $bill) { + // if($bill->first_name != ""){ + // $billing_addr = $bill->address_1 . " " . $bill->address_2 . ",\n" . $bill->city . ",\n" . $bill->state . " - " . $bill->postal_code . ",\n" . $bill->country . "."; + // } + // } + $result_billing_addr = $this->save_invoice_address_in_customer_address($billing_array,1,(int)$local_customer_id); + $billing_addr_id = $result_billing_addr['addr_id']; + $billing_addr = $result_billing_addr['addr']; } if (count($shipping_array) > 0) { - foreach ($shipping_array as $ship) { - if($ship->first_name != ""){ - $shipping_addr = $ship->address_1 . " " . $ship->address_2 . ",\n" . $ship->city . ",\n" . $ship->state . " - " . $ship->postal_code . ",\n" . $ship->country . "."; - } - } + // foreach ($shipping_array as $ship) { + // if($ship->first_name != ""){ + // $shipping_addr = $ship->address_1 . " " . $ship->address_2 . ",\n" . $ship->city . ",\n" . $ship->state . " - " . $ship->postal_code . ",\n" . $ship->country . "."; + // } + // } + $result_shipping_addr = $this->save_invoice_address_in_customer_address($shipping_array,2,(int)$local_customer_id); + $shipping_addr_id = $result_shipping_addr['addr_id']; + $shipping_addr = $result_shipping_addr['addr']; } if (count($records['line_items']) > 0) { @@ -771,9 +781,7 @@ class ApiIntegration extends ResourceController $subtotal = $lineitems_subtotal + (float)$records['shipping_total']; $tax = $lineitems_tax + (float)$records['shipping_tax']; $total = ($lineitems_total)+(float)$records['shipping_total'] + (float)$records['shipping_tax']; - $where = ['wp_api_customer_id' => (int)$records['customer_id'], 'isactive' => 1]; - $local_customer = $api_model->getData('customers', $where); - $local_customer_id = !empty($local_customer) ? $local_customer[0]->customer_id : ""; + $invoice_data['invoice_id']=$invoice_id; $invoice_data['invoice_number']=$records['number']; @@ -791,13 +799,12 @@ class ApiIntegration extends ResourceController $invoice_data['event_id']=NULL; $invoice_data['business_id']=$this->global_variable_business_id; $invoice_data['shipping_address']=$shipping_addr; - $invoice_data['shipping_address_id']=NULL; + $invoice_data['shipping_address_id']=$shipping_addr_id; $invoice_data['billing_address']=$billing_addr; - $invoice_data['billing_address_id'] =NULL; + $invoice_data['billing_address_id'] =$billing_addr_id; $invoice_data['shipping_charge'] = isset($records['shipping_total'])?$records['shipping_total']:NULL; $invoice_data['notes'] = isset($records['customer_note'])?$records['customer_note']:NULL; $invoice_data['invoice_type'] = 1; - if ((int)$countAll == 0) { $invoice_data['created_by'] = $this->global_variable_user_id; $insert_result = $api_model->insertData('invoice', $invoice_data); @@ -1131,4 +1138,61 @@ class ApiIntegration extends ResourceController $this->logger->error("Api SaveCategoriesMasterDetails : Err = Categories Data Not Found"); } } + + public function save_invoice_address_in_customer_address($request_addr_array,$flag,$customer_id){ + $this->logger->info("Api saveInvoiceAddressInCustomerAddress = ".json_encode($request_addr_array)); + $this->logger->info("Api saveInvoiceAddressInCustomerAddress Flag = ".$flag." Customer Id = ".$customer_id); + $api_model = new ApiIntegrationModel(); + $where = ['customer_id' =>$customer_id,'address_type'=>$flag, + 'first_name'=>$request_addr_array[0]->first_name,'last_name'=>$request_addr_array[0]->last_name, + 'address_1'=>$request_addr_array[0]->address_1,'address_2'=>$request_addr_array[0]->address_2, + 'city'=>$request_addr_array[0]->city,'state'=>$request_addr_array[0]->state, + 'postal_code'=>$request_addr_array[0]->postcode]; + $existing_addr = $api_model->getData('customer_addresses', $where); + $this->logger->info("Api saveInvoiceAddressInCustomerAddress Count = ".count($existing_addr)); + $final_array['addr_id'] = NULL; + $final_array['addr'] = NULL; + + $addr_data = []; + + if (!empty($existing_addr)) { + $final_array['addr_id'] = isset($existing_addr) && !empty($existing_addr) ? $existing_addr[0]->customer_address_id : NULL; + $this->logger->info("Api saveInvoiceAddressInCustomerAddress Ex Addr id = ".$final_array['addr_id']); + if($existing_addr[0]->first_name != ""){ + $final_array['addr'] = $existing_addr[0]->address_1 . " " . $existing_addr[0]->address_2 . ",\n" . $existing_addr[0]->city . ",\n" . $existing_addr[0]->state . " - " . $existing_addr[0]->postal_code . ",\n" . $existing_addr[0]->country . "."; + } + $this->logger->info("Api saveInvoiceAddressInCustomerAddress Ex Addr = ".$final_array['addr']); + } + if (empty($existing_addr)) { + foreach ($request_addr_array as $addr) { + if($addr->first_name != ""){ + $addr_data['first_name'] = $addr->first_name; + $addr_data['last_name'] = $addr->last_name; + $addr_data['company'] = $addr->company; + $addr_data['address_1'] = $addr->address_1; + $addr_data['address_2'] = $addr->address_2; + $addr_data['city'] = $addr->city; + $addr_data['state'] = $addr->state; + $addr_data['country'] = $addr->country; + $addr_data['postal_code'] = $addr->postcode; + $addr_data['email'] = isset($addr->email)? $addr->email:""; + $addr_data['mobile_no'] = isset($addr->phone)?$addr->phone:""; + $addr_data['customer_id'] = $customer_id; + $addr_data['address_type'] = $flag; + $addr_data['customer_address_id'] = NULL; + $addr_data['created_by'] = $this->global_variable_user_id; + $final_array['addr'] = $addr->address_1 . " " . $addr->address_2 . ",\n" . $addr->city . ",\n" . $addr->state . " - " . $addr->postcode . ",\n" . $addr->country . "."; + } + } + $this->logger->info("Api saveInvoiceAddressInCustomerAddress New Addr = ".$final_array['addr']); + if(!empty($addr_data)){ + + $insert_result = $api_model->insertData('customer_addresses',$addr_data); + $final_array['addr_id'] = $insert_result['info']; + $this->logger->info("Api saveInvoiceAddressInCustomerAddress New Addr id = ".$final_array['addr_id']); + } + + } + return $final_array; + } } \ No newline at end of file From f67028962d9527cd21dcfe6d48b087997f277959 Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Wed, 18 Oct 2023 17:46:37 +0530 Subject: [PATCH 6/6] Dashboard + due date mail : ps --- app/Controllers/Home.php | 7 + app/Controllers/Invoice.php | 24 +- app/Controllers/Notifications.php | 67 +++++- app/Models/HomeModel.php | 67 ++++++ app/Models/InvoiceModel.php | 2 +- app/Models/NotificationModel.php | 40 +++- app/Views/approve_template.php | 12 +- app/Views/dashboard.php | 378 ++++++++++++++++++++++++------ public/uploads/avatar.png | Bin 24988 -> 5786 bytes 9 files changed, 505 insertions(+), 92 deletions(-) mode change 100755 => 100644 public/uploads/avatar.png diff --git a/app/Controllers/Home.php b/app/Controllers/Home.php index db71d573..917b2eda 100644 --- a/app/Controllers/Home.php +++ b/app/Controllers/Home.php @@ -22,6 +22,13 @@ class Home extends BaseController $model = new HomeModel(); $data['customer'] = $model->customers($where); $data['customer']['label'] = "Customer"; + $data['invoice'] = $model->invoice(); + $data['active_category'] = $model->schemes(); + $data['expiring_membership'] = $model->expiring_membership_list(); + // $data['active_category'] = array_filter($model->schemes(), function ($element) { + // return $element['count'] !== '0' ; + // }); + $data['book_published'] = $model->book_published_list(); $this->render_page('dashboard', $data); } diff --git a/app/Controllers/Invoice.php b/app/Controllers/Invoice.php index f1f53f51..fbadc66e 100644 --- a/app/Controllers/Invoice.php +++ b/app/Controllers/Invoice.php @@ -432,6 +432,13 @@ class Invoice extends BaseController $tax = ""; $total_amount = ""; $payment_method = ""; + $business_name= ""; + $business_address= ""; + $business_city= ""; + $business_state= ""; + $business_postal_code= ""; + $business_email= ""; + $business_mobile_no= ""; if (isset($details)) { $this->logger->info("Invoice: approve notification Request data type = ".gettype($details)); } @@ -449,6 +456,13 @@ class Invoice extends BaseController $tax = $rec['tax']; $total_amount = $rec['total_amount']; $payment_method = $rec['payment_method']; + $business_name= $rec['business_name']; + $business_address= $rec['business_address']; + $business_city= $rec['business_city']; + $business_state= $rec['business_state']; + $business_postal_code= $rec['business_postal_code']; + $business_email= $rec['business_email']; + $business_mobile_no= $rec['business_mobile_no']; } $records['invoice_order_number'] = $reference_number; $records['invoice_serial_number'] = $invoice_serial_number; @@ -479,12 +493,12 @@ class Invoice extends BaseController

Best regards,

    -
  • VijayaBharathamBooks,
    • -
  • Sri Kasi, 12, M.V. Naidu Street, Chetpet, Chennai.
    • -
  • Call Us: +91 89391 49466
    • -
  • Email Us: contact@vijayabharathambooks.com
    • "; +
  • ".$business_name.",
    • +
  • ".$business_address." ".$business_city." ".$business_state." - ".$business_postal_code."
    • +
  • Call Us: +91 ".$business_mobile_no."
    • +
  • Email Us: ".$business_email."
    • "; - $template = "Dear " . $recipient_name . ",\r\r\n\nYour Invoice has been approved.\n\nDetails:\r\n- Approval Date: " . $approval_date . "\r\n- Approved By: " . $approved_by . "\r\n- Reference ID: " . $reference_number . "\r\n\nBest regards,\nVijayaBharathamBooks,\nSri Kasi, 12, M.V. Naidu Street, Chetpet, Chennai.\nCall Us: +91 89391 49466\nEmail Us: contact@vijayabharathambooks.com"; + $template = "Dear " . $recipient_name . ",\r\r\n\nYour Invoice has been approved.\n\nDetails:\r\n- Approval Date: " . $approval_date . "\r\n- Approved By: " . $approved_by . "\r\n- Reference ID: " . $reference_number . "\r\n\nBest regards,\n".$business_name.",\n".$business_address." ".$business_city." ".$business_state." - ".$business_postal_code.".\nCall Us: +91 ".$business_mobile_no."\nEmail Us:".$business_email; $params = (object) Null; $params->number = (int)'91' . $recipient_mobile; diff --git a/app/Controllers/Notifications.php b/app/Controllers/Notifications.php index ca741efc..89d38483 100755 --- a/app/Controllers/Notifications.php +++ b/app/Controllers/Notifications.php @@ -3,12 +3,13 @@ namespace App\Controllers; use App\Helpers\NotificationHelper; +use App\Models\NotificationModel; class Notifications extends BaseController { ## Email Section : - public function mail_custom_notifications() + public function mail_custom_notificationsi() { $request = \Config\Services::request(); if ($request->is('post')) { @@ -70,4 +71,68 @@ class Notifications extends BaseController $data['page_name'] = 'Custom Notifications'; $this->render_page('notifications_form', $data); } + + // public function due_date_notifications() + public function mail_custom_notifications() + { + $model = new NotificationModel(); + $details = $model->getSubscriptionDueDetail(); + + $records = []; + $recipient_name = ""; + $recipient_email = ""; + $recipient_mobile = ""; + $subscription_name = ""; + $business_name= ""; + $to_subscription= ""; + if (isset($details)) { + $this->logger->info("Notification : Duedate notification Request data type = ".gettype($details)); + } + helper('notification'); + $notification = new NotificationHelper(); + foreach ($details as $rec) { + $recipient_name = $rec['customer_name']; + $recipient_email = $rec['customer_email']; + $recipient_mobile = $rec['customer_mobile']; + // $recipient_email = "sanjeev.p@venbainfotech.com"; + // $recipient_mobile = 6369084112; + $business_name= $rec['business_name']; + $subscription_name = $rec['title']; + $to_subscription= $rec['to_subscription']; + + } + $records['template_name'] = ''; + $records['recipient_name'] = $recipient_name; + $records['recipient_email'] = $recipient_email ? $recipient_email : "sanjeev.p@venbainfotech.com"; + $records['subject'] = $business_name ." - Due Date Reminder"; + $records['description'] = " + + Due Date Reminder + +

    Hello ".$recipient_name.",

    +

    This is a reminder that the following subscription is due soon:

    +

    Subscription Name:".$subscription_name."

    +

    Due Date: ".$to_subscription."

    +

    Please make sure to complete this subscription on time.

    +

    Thank you.

    + + "; + + $template = "Hello " . $recipient_name . ",\r\r\n\nThis is a reminder that the following subscription is due soon:\r\n- Subscription Name: " . $subscription_name . "\r\n Due Date: " . $to_subscription . "\r\n\nPlease make sure to complete this subscription on time.\n Thank you."; + + $params = (object) Null; + $params->number = (int)'91' . $recipient_mobile; + $params->type = "text"; + $params->message = $template; + $params->instance_id = WAAI_INSTANCE; + $params->access_token = WAAI_TOKEN; + $this->logger->info("Notification : Duedate notification Email Request data = ".json_encode($records)); + + $email_result = $notification->sendEmail($records); + $this->logger->info("Notification : Duedate notification Email Response = " . json_encode($email_result)); + $this->logger->info("Notification : Duedate notification Whatsapp Request data = ".json_encode($params)); + $whatsapp_result = $notification->sendWhatsAppMessage(SEND_WAAI_URL, "POST", $params); + $this->logger->info("Notification : Duedate notification Whatsapp Response = " . json_encode($whatsapp_result)); + + } } diff --git a/app/Models/HomeModel.php b/app/Models/HomeModel.php index 1b774092..4135c532 100644 --- a/app/Models/HomeModel.php +++ b/app/Models/HomeModel.php @@ -24,4 +24,71 @@ class HomeModel extends Model $customer['today'] = $todayCustomers; return $customer; } + + public function invoice() { + if (date('m') <= 3) { + $invoice['financial_year'] = (date('Y')-1) . '-' . date('Y'); + $start_date = (date('Y')-1).'-04-01'; + $end_date = date('Y').'-03-31'; + } else { + $invoice['financial_year'] = date('Y') . '-' . (date('Y') + 1); + $start_date = date('Y').'-04-01'; + $end_date = (date('Y')+1).'-03-31'; + } + $date_where = ['DATE(created_on)' => date('Y-m-d'),'isactive'=>1]; + $date_query = $this->db->table('invoice')->where($date_where)->countAllResults(); + $month_where = ['MONTH(created_on)' => date('m'),'isactive'=>1]; + $month_query = $this->db->table('invoice')->where($month_where)->countAllResults(); + $fin_year_where = ['DATE(created_on) >= ' => $start_date , 'DATE(created_on) <= ' => $end_date,'isactive'=>1]; + $fin_year_query = $this->db->table('invoice')->where($fin_year_where)->countAllResults(); + $invoice['today'] = $date_query; + $invoice['month'] = $month_query; + $invoice['year'] = $fin_year_query; + return $invoice; + } + + public function schemes(){ + $query = $this->db->table('category AS C') + ->select('C.id,C.name,LEFT(C.name, 1) AS first_letter, COUNT(S.customer_id) AS count') + ->join('subscription AS S', 'C.id = S.scheme_id', 'left') + ->where(['C.isactive'=>1,'C.business_id'=>1]) + ->groupBy('C.id, S.scheme_id'); + $results = $query->get()->getResultArray(); + return $results; + } + + public function expiring_membership_list(){ + $now = date('Y-m-d'); + $last30days = date('Y-m-d', strtotime('+30 days')); + + return $this->db->table('subscription as S') + ->join('customers as C', 'C.customer_id = S.customer_id', 'left') + ->join('category as CM', 'CM.id = S.scheme_id', 'left') + ->join('book_categories as BC', 'BC.category_id = S.scheme_id', 'left') + ->join('books as BK', 'BC.book_id = BK.book_id', 'left') + ->select('CM.name, CONCAT(C.first_name, " ", C.last_name) as customer_name, C.email as customer_email, C.mobile_no as customer_mobile, S.sub_id, S.scheme_id, S.customer_id, S.from_subscription, S.to_subscription, S.business_id, S.to_subscription, S.from_subscription, BK.title, BK.book_id,DATEDIFF(S.to_subscription, CURDATE()) as countdays') + ->where('S.to_subscription >=', $now) + ->where('S.to_subscription <=', $last30days) + ->where('BC.category_id', 5) + ->groupBy('S.sub_id') + ->get() + ->getResultArray(); + } + + public function book_published_list(){ + $now = date('Y-m-d'); + $oneMonthAgo = date('Y-m-d', strtotime($now . ' -1 month')); + + return $this->db->table('books as B') + ->select("B.book_id, B.title, B.created_on, B.publisher, B.author, B.publication_date, DATE_FORMAT(B.publication_date, '%d-%m-%Y') as publication_date_format, GROUP_CONCAT(CM.name, ',') as categories") + ->join('book_categories as BC', 'BC.book_id = B.book_id and BC.isactive = 1', 'left') + ->join('category as CM', 'BC.category_id = CM.id', 'left') + ->where('B.created_on >=', $oneMonthAgo) + ->where('B.created_on <=', $now) + ->where('B.isactive', 1) + ->groupBy('B.book_id') + ->get() + ->getResultArray(); + } + } diff --git a/app/Models/InvoiceModel.php b/app/Models/InvoiceModel.php index 82f58a1e..b508a178 100644 --- a/app/Models/InvoiceModel.php +++ b/app/Models/InvoiceModel.php @@ -53,7 +53,7 @@ public function updateData($table, $data, $where) ->join('business as B', 'B.business_id = I.business_id', 'left') ->join('users as U1', 'U1.user_id = I.created_by', 'left') ->join('users as U2', 'U2.user_id = I.updated_by', 'left') - ->select('I.invoice_id, I.invoice_number, I.customer_id,concat(C.first_name," ",C.last_name) as customer_name , I.invoice_date, I.due_date, I.subtotal, I.tax, I.discount, I.total_amount,I.status, I.payment_status, I.order_number, I.payment_method,I.invoice_type, I.event_id,E.event_name, I.business_id,B.title as business_name, I.created_on, I.created_by,concat(U1.first_name," ",U1.last_name) as created_by_name, I.updated_on, I.updated_by,concat(U2.first_name," ",U2.last_name) as updated_by_name, I.isactive,C.email as customer_email,C.mobile_no as customer_mobile,I.shipping_address_id,I.shipping_address,I.billing_address_id,I.billing_address') + ->select('I.invoice_id, I.invoice_number, I.customer_id,concat(C.first_name," ",C.last_name) as customer_name , I.invoice_date, I.due_date, I.subtotal, I.tax, I.discount, I.total_amount,I.status, I.payment_status, I.order_number, I.payment_method,I.invoice_type, I.event_id,E.event_name, I.business_id,B.title as business_name, I.created_on, I.created_by,concat(U1.first_name," ",U1.last_name) as created_by_name, I.updated_on, I.updated_by,concat(U2.first_name," ",U2.last_name) as updated_by_name, I.isactive,C.email as customer_email,C.mobile_no as customer_mobile,I.shipping_address_id,I.shipping_address,I.billing_address_id,I.billing_address,B.address as business_address,B.city as business_city,B.state as business_state,B.postal_code as business_postal_code,B.email as business_email,B.mobile_no as business_mobile_no') ->where($where) ->get() ->getResultArray(); diff --git a/app/Models/NotificationModel.php b/app/Models/NotificationModel.php index 5050766d..73ab77f3 100644 --- a/app/Models/NotificationModel.php +++ b/app/Models/NotificationModel.php @@ -3,20 +3,36 @@ namespace App\Models; use CodeIgniter\Model; class NotificationModel extends Model { - protected $table = 'users'; - protected $primaryKey = 'user_id'; - protected $allowedFields = ['user_id','user_name','email','first_name','last_name','password','mobile_no','date_of_birth','address','gender','profile_picture','city','state','postal_code','country','role','isactive','business_id']; + protected $table; - public function saveData($data, $id = null) + public function setCustomTable($tableName) { - if ($id === null) { - // Insert new record - return $this->insert($data); - } else { - // Update existing record - return $this->update($id, $data); - } + $this->table = $tableName; + } + + // public function getTasksDueLastWeek() + // { + // $now = date('Y-m-d'); + // $oneWeekAgo = date('Y-m-d', strtotime('-7 days', strtotime($now))); + + // return $this->where('due_date >=', $oneWeekAgo) + // ->where('due_date <=', $now) + // ->findAll(); + // } + + public function getSubscriptionDueDetail(){ + $now = date('Y-m-d'); + $lastWeek = date('Y-m-d', strtotime('+7 days')); + return $this->db->table('subscription as S' ) + ->join('customers as C', 'C.customer_id = S.customer_id', 'left') + ->join('category as CM', 'CM.id = S.scheme_id', 'left') + ->join('business as B', 'B.business_id = S.business_id', 'left') + ->join('book_categories as BC', 'BC.category_id = S.scheme_id', 'left') + ->join('books as BK', 'BC.book_id = BK.book_id', 'left') + ->select('CM.name,concat(C.first_name, " ", C.last_name) as customer_name,C.email as customer_email,C.mobile_no as customer_mobile,S.sub_id,S.scheme_id,S.customer_id,S.from_subscription,S.to_subscription,S.business_id,B.title as business_name,B.address as business_address,B.city as business_city,B.state as business_state,B.postal_code as business_postal_code,B.email as business_email,B.mobile_no as business_mobile_no,S.to_subscription,S.from_subscription,BK.title,BK.book_id') + ->where('S.to_subscription >=', $now)->where('S.to_subscription <=',$lastWeek) + ->groupBy('S.sub_id') + ->get()->getResultArray(); } - } diff --git a/app/Views/approve_template.php b/app/Views/approve_template.php index 7e2e3d47..cc65a5b2 100644 --- a/app/Views/approve_template.php +++ b/app/Views/approve_template.php @@ -149,12 +149,12 @@


    - 22/2, SriKrishna Apartments
     - 1st Street, Subramania Nagar, Kodambakkam
     - CHENNAI 600024
     - Tamil Nadu
     - +919445062922
     - arasubu@gmail.com
     +
    +
    +
    +
    + +91
     +

    diff --git a/app/Views/dashboard.php b/app/Views/dashboard.php index cc2f879e..746fca29 100644 --- a/app/Views/dashboard.php +++ b/app/Views/dashboard.php @@ -1,93 +1,337 @@ - -
    -
    -
    -
    -
    -
    - -
    - -
    -

    -

    +
    +

    +

    +
    -
    -
    +
    -
    -
    -
    -
    -
    - -
    -
    -

    8574

    -

    Online Orders

    +
    +
    +
    +
    +
    + +
    +
    +

    8574

    +

    Online Orders

    +
    -
    -
    +
    -
    -
    -
    -
    -
    - -
    -
    -

    ₹ 958.25

    -

    Revenue

    +
    +
    +
    +
    +
    + +
    +
    +

    ₹ 958.25

    +

    Revenue

    +
    -
    -
    +
    -
    -
    -
    -
    -
    - -
    -
    -

    ₹ 89.25

    -

    Daily Average

    +
    +
    +
    +
    +
    + +
    +
    +

    ₹ 89.25

    +

    Daily Average

    +
    -
    -
    +
    -
    +
    - \ No newline at end of file + + + +
    +
    +
    +
    +
    +
    + +
    +
    +

    Today : +

    +
    +
    + MTD : + YTD : +
    +
    +
    +
    +
    + +
    +
    +
    +

    Schemes

    +
    + + +
    +
    +
    + +
    +
    +
    +
    +

    + Subscribers +

    +
    +
    +
    + + + + +
    +
    +
    +
    +
    + +
    +
    +
    +
    +

    Expiring Membership List

    +
    +
    +
+ + + + + + + + + + "; + // print_r($expiring_membership); + // print ""; + foreach ($expiring_membership as $e) : ?> + + + + + + + + + +
#NameScheme NameExpiring In
+
+ + 		days
+
+ + + + + +
+
+
+

Books Published in Last One Month

+
+
+ + + + + + + + + + + + + + + + +
Book DetailsCategory
+

+ +

+

+ +

+

+ +

+ 		+ + + +
+
+
+
+
+
+ + \ No newline at end of file diff --git a/public/uploads/avatar.png b/public/uploads/avatar.png old mode 100755 new mode 100644 index 29ce634387f662bc995e3c74976f4f0a66b16d36..c037568966af131da7d6902b698cb981d6e2c241 GIT binary patch literal 5786 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 Y2Pc}VdwfKqod5s;07*qoM6N<$g6+Bxv;Y7A literal 24988 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