diff --git a/app/Controllers/Business.php b/app/Controllers/Business.php index 14f853e4..e94afc9c 100644 --- a/app/Controllers/Business.php +++ b/app/Controllers/Business.php @@ -21,7 +21,7 @@ class Business extends BaseController $where = ['isactive !=' => NULL]; } $BusinessModel = new BusinessModel(); - $data['page_name'] = 'Buiness Listing'; + $data['page_name'] = 'Buiness Details'; $data['businesses'] = $BusinessModel->where($where)->findAll(); // $data['lastQuery'] = $BusinessModel->getLastQuery(); // print_r($data);die; diff --git a/app/Controllers/Customer.php b/app/Controllers/Customer.php index c29e1438..04ddaedc 100644 --- a/app/Controllers/Customer.php +++ b/app/Controllers/Customer.php @@ -24,7 +24,7 @@ class Customer extends BaseController } $CustomerModel = new CustomerModel(); - $data['page_name'] = 'Customer Listing'; + $data['page_name'] = 'Customer Details'; $data['customer'] = $CustomerModel->where($where)->orderBy('customer_id', 'DESC')->findAll(); // print_r($data); die(); @@ -43,7 +43,7 @@ class Customer extends BaseController if ($id === '0') { // Add Customer - $data['page_name'] = 'Add Customer'; + $data['page_name'] = 'Add Customer Details'; $data['customer'] = []; $data['customer_billing'] = []; $data['customer_shipping'] = []; @@ -51,7 +51,7 @@ class Customer extends BaseController $data['invoices'] = []; } else if ($id !== '0') { // Edit Customer - $data['page_name'] = 'Edit Customer'; + $data['page_name'] = 'Edit Customer Details'; // Load your Customer Model $customerModel = new CustomerModel(); @@ -292,7 +292,7 @@ class Customer extends BaseController } public function customer_group(){ - $data['page_name'] = 'Customer Group'; + $data['page_name'] = 'Customer Group Details'; $model = new CustomerModel(); $data['customer_group'] = $model->getGroupDetails(); $this->render_page('customer_group', $data); @@ -303,33 +303,35 @@ class Customer extends BaseController $data['field'] = [ '' => 'Choose the Field', - 'city' => 'City', - 'state' => 'State', - 'type' => 'Type', - 'postal code' => 'Postal Code', - 'schemes' => 'Schemes', - 'category' => 'Category' + 'C.type' => 'Type', + 'CA.city' => 'City', + 'CA.state' => 'State', + 'CM.name' => 'Category', + 'I.invoice_date' => 'Invoice Date', + 'S.to_subscription' => 'Due Date', ]; $data['operator'] = [ '' => 'Choose the operator', - 'equal' => 'equal to (=)', - 'not equal' => 'not equal (!=)', - 'like' => 'like (%)', - 'contain' => 'contain (in)', - 'not contain' => 'not contain (not in)', - 'between' => 'between (between)', - 'greater than' => 'greater than (>)', - 'greater than or equal to' => 'greater than or equal to (>=)', - 'less than' => 'lesser than (<)', - 'less than or equal to' => 'greater than or equal to (<=)' + 'equal' => 'Equal to (=)', + 'not equal' => 'Not Equal (!=)', + 'like' => 'Like (%)', + 'greater than' => 'Greater than (>)', + 'greater than or equal to' => 'Greater than or Equal to (>=)', + 'less than' => 'Less than (<)', + 'less than or equal to' => 'Less than or Equal to (<=)', + 'contain' => 'Contain (in)', + 'not contain' => 'Not Contain (not in)', + 'between' => 'Between', + 'is null' => 'Is NULL', + 'is not null' => 'Is Not NULL', ]; $data['customer_group'] = []; if ($id === '0') { // Add Customer - $data['page_name'] = 'Customer Group From'; + $data['page_name'] = 'Add Customer Group'; } else if ($id !== '0') { // Edit Customer - $data['page_name'] = 'Customer Group From'; + $data['page_name'] = 'Edit Customer Group'; // Load your Customer Model $model = new CustomerModel(); @@ -339,9 +341,9 @@ class Customer extends BaseController if (!empty($result)) { $data['customer_group']['groupname'] = $result[0]['group_name']; - $data['customer_group']['column'] = unserialize($result[0]['column']); - $data['customer_group']['operator'] = unserialize($result[0]['operator']); - $data['customer_group']['values'] = unserialize($result[0]['value']); + $data['customer_group']['column'] = $result[0]['column'] ? unserialize($result[0]['column']) : []; + $data['customer_group']['operator'] = $result[0]['operator'] ? unserialize($result[0]['operator']) : []; + $data['customer_group']['values'] = $result[0]['value'] ? unserialize($result[0]['value']) : []; $data['customer_group']['group_id'] = $result[0]['group_id']; $data['customer_group']['isactive'] = $result[0]['isactive']; } @@ -349,6 +351,7 @@ class Customer extends BaseController $this->render_page('customer_group_form', $data); } public function preview_customer_group($id){ + try { helper('session'); $model = new CustomerModel(); $model->setTable('customer_groups'); @@ -356,9 +359,22 @@ class Customer extends BaseController $result = $model->where($where)->findAll(); $db = \Config\Database::connect(); $sql = (string)$result[0]['group_query']; - $query = $db->query($sql); - $results = $query->getResultArray(); - return $this->response->setJSON($results); + if($sql){ + $query = $db->query($sql); + $results = $query->getResultArray(); + if(empty($results)){ + throw new \Exception("Data Not Available"); + }else{ + return $this->response->setJSON($results); + } + }else{ + return $this->response->setJSON([]); + } + + } catch (\Exception $e) { + $this->logger->error("Customer Group: Err Occur = ".$e->getMessage()." File = ". $e->getFile() . " Line = " . $e->getLine()); + session()->setFlashdata('error', 'Message: ' . $e->getMessage()); + } } public function delete_customer_group($id){ try { @@ -419,23 +435,23 @@ class Customer extends BaseController // Handle different operators and build corresponding conditions switch ($operator) { case 'equal': - $conditionStrings[] = "$column = '$value'"; + $conditionStrings[] = "LOWER($column) = LOWER('$value') "; break; case 'not equal': - $conditionStrings[] = "$column <> '$value'"; + $conditionStrings[] = "LOWER($column) <> LOWER('$value') "; break; case 'like': - $conditionStrings[] = "$column LIKE '%$value%'"; + $conditionStrings[] = "LOWER($column) LIKE '%$value%'"; break; case 'contain': - case 'where in': + case 'in': $values = explode(',', $value); - $conditions[] = "$column IN ('" . implode("', '", $values) . "')"; + $conditionStrings[] = "LOWER($column) IN ('" . implode("', '", $values) . "')"; break; case 'not contain': - case 'where not in': + case 'not in': $values = explode(',', $value); - $conditions[] = "$column NOT IN ('" . implode("', '", $values) . "')"; + $conditionStrings[] = "LOWER($column) NOT IN ('" . implode("', '", $values) . "')"; break; case 'between': $dates = explode(',', $value); @@ -453,6 +469,12 @@ class Customer extends BaseController case 'less than or equal to': $conditionStrings[] = "$column <= $value"; break; + case 'is null': + $conditionStrings[] = "$column IS NULL"; + break; + case 'is not null': + $conditionStrings[] = "$column IS NOT NULL"; + break; } } @@ -467,20 +489,28 @@ class Customer extends BaseController // Now you can use $whereCondition in your SQL query $db = \Config\Database::connect(); - $sql = "SELECT customer_id,CONCAT(first_name,'',last_name) as customer_name,email,mobile_no FROM customers WHERE ".$whereCondition; - + // $sql = "SELECT customer_id,CONCAT(first_name,'',last_name) as customer_name,email,mobile_no FROM customers WHERE ".$whereCondition; + $sql = "SELECT CA.city,CA.state,I.invoice_date,C.customer_id,CONCAT(C.first_name,'',C.last_name) as customer_name,C.email,C.mobile_no ,S.to_subscription as due_date, C.isactive ,count(I.invoice_id) as invoice_count_raised_by_customer, S.scheme_id , CM.name + FROM customers as C + LEFT JOIN invoice I on I.customer_id = C.customer_id and I.isactive = 1 + LEFT JOIN customer_addresses CA on CA.customer_id = C.customer_id and CA.address_type = 1 and CA.isactive = 1 + LEFT JOIN subscription S on S.customer_id = C.customer_id + LEFT JOIN category CM on CM.id = S.scheme_id + WHERE C.isactive = 1 AND ".$whereCondition." GROUP BY C.customer_id"; + $this->logger->info("Customer Group: SQL = ".$sql); // echo $sql; // Execute the query $query = $db->query($sql); // Get the result $results = $query->getResult(); + $this->logger->info("Customer Group: ".json_encode($results)); $group_id = $request_data['group_id']; // Get the ID for update - $isactive = $request_data['isactive']; + $isactive = $group_id != "" ? $request_data['isactive'] : 'on'; if($string_flag == "save"){ $data['group_query'] = $sql; $data['group_id'] = $group_id; - $data['isactive'] = $group_id ? (($isactive == 'on') ? 1 : 0) : 1; + $data['isactive'] = (($isactive == 'on') ? 1 : 0); $data['created_by'] = $session_uid; $data['updated_by'] = $session_uid; $statement = $model->saveGroupDetails($data); diff --git a/app/Controllers/Notifications.php b/app/Controllers/Notifications.php index 30c70f29..76004f59 100755 --- a/app/Controllers/Notifications.php +++ b/app/Controllers/Notifications.php @@ -141,7 +141,7 @@ class Notifications extends BaseController } public function template_creation(){ - $data['page_name'] = 'Template'; + $data['page_name'] = 'Template Details'; $model = new NotificationModel(); $data['template'] = $model->getTemplateDetails(); $this->render_page('template_creation', $data); @@ -221,15 +221,14 @@ class Notifications extends BaseController $session_uid = get_logged_user_id(); $id = $this->request->getPost('template_id'); $subject = $this->request->getPost('subject') ? $this->request->getPost('subject') : NULL; - $isactive = $this->request->getPost('isactive'); + $isactive = $id != "" ? $this->request->getPost('isactive') : 'on'; $data = [ 'template_id' => $id, 'template_name' => $this->request->getPost('templatename'), 'subject' => $subject, 'message' => $this->request->getPost('templatemessage'), 'mode' => $this->request->getPost('mode'), - 'group_id' => $this->request->getPost('group_id'), - 'isactive' => $id ? (($isactive == 'on') ? 1 : 0) : 1, + 'isactive' => (($isactive == 'on') ? 1 : 0), 'created_by' => $session_uid, 'updated_by' => $session_uid ]; @@ -243,8 +242,6 @@ class Notifications extends BaseController }else{ throw new \Exception("Template: Err Occur"); } - - }catch(\Exception $e) { $this->logger->error("Template: Err Occur =".$e->getMessage()); session()->setFlashdata('error', 'Message: ' .$e->getMessage()); @@ -253,7 +250,7 @@ class Notifications extends BaseController } public function campaign_creation(){ - $data['page_name'] = 'Campaign'; + $data['page_name'] = 'Campaign Details'; $model = new NotificationModel(); $data['campaign'] = $model->getCampaignDetails(); $this->render_page('campaign_creation', $data); diff --git a/app/Controllers/Scheme.php b/app/Controllers/Scheme.php index 1da28a29..ec40d197 100644 --- a/app/Controllers/Scheme.php +++ b/app/Controllers/Scheme.php @@ -22,7 +22,7 @@ class Scheme extends BaseController } $SchemeModel = new SchemeModel(); - $data['page_name'] = 'Scheme Listing'; + $data['page_name'] = 'Scheme Details'; $data['scheme'] = $SchemeModel->getSchemeNamesAndDurationsByBusiness($session_bid); diff --git a/app/Models/NotificationModel.php b/app/Models/NotificationModel.php index 31416afd..926e2189 100644 --- a/app/Models/NotificationModel.php +++ b/app/Models/NotificationModel.php @@ -41,8 +41,7 @@ class NotificationModel extends Model return $this->db->table('templates as T' ) ->join('users as U1', 'U1.user_id = T.created_by', 'left') ->join('users as U2', 'U2.user_id = T.updated_by', 'left') - ->join('customer_groups as CG', 'CG.group_id = T.group_id', 'left') - ->select('T.template_id,T.template_name,T.mode,CG.group_id,CG.group_name,T.created_on,T.created_by,T.updated_on,T.updated_by,DATE_FORMAT(T.created_on, "%d-%m-%Y %h:%i %p") AS formatted_created_on,concat(U1.first_name," ",U1.last_name) as created_by_name,concat(U2.first_name," ",U2.last_name) as updated_by_name,T.isactive') + ->select('T.template_id,T.template_name,T.mode,T.created_on,T.created_by,T.updated_on,T.updated_by,DATE_FORMAT(T.created_on, "%d-%m-%Y %h:%i %p") AS formatted_created_on,concat(U1.first_name," ",U1.last_name) as created_by_name,concat(U2.first_name," ",U2.last_name) as updated_by_name,T.isactive') ->get()->getResultArray(); } diff --git a/app/Views/book_list.php b/app/Views/book_list.php index deb249e5..854a61a8 100644 --- a/app/Views/book_list.php +++ b/app/Views/book_list.php @@ -3,7 +3,7 @@
- " class="btn btn-primary waves-effect"> Add New + " class="btn btn-primary waves-effect"> Add Book

@@ -66,7 +66,7 @@ - " class="delete-button"> + " class="delete-button"> diff --git a/app/Views/business_form.php b/app/Views/business_form.php index 694d20bc..5e0100d0 100644 --- a/app/Views/business_form.php +++ b/app/Views/business_form.php @@ -32,7 +32,7 @@

-
+ " >
diff --git a/app/Views/business_list.php b/app/Views/business_list.php index ce4b6a3d..d8665792 100644 --- a/app/Views/business_list.php +++ b/app/Views/business_list.php @@ -39,9 +39,9 @@ - " class="edit-button" title="Click to Edit Business"> + " class="edit-button" title="Click to Edit Business"> - " class="delete-button" title="Click to Delete Business"> + " class="delete-button" title="Click to Delete Business"> diff --git a/app/Views/campaign_creation.php b/app/Views/campaign_creation.php index 80064304..6f3793dd 100644 --- a/app/Views/campaign_creation.php +++ b/app/Views/campaign_creation.php @@ -62,7 +62,7 @@ " class="edit-button" title="Click to Edit Campaign" > - " class="delete-button" title="Click to Delete Campaign" > + " class="delete-button" title="Click to Delete Campaign" > diff --git a/app/Views/campaign_creation_form.php b/app/Views/campaign_creation_form.php index 4ed11e47..a3cadf71 100644 --- a/app/Views/campaign_creation_form.php +++ b/app/Views/campaign_creation_form.php @@ -24,16 +24,6 @@
-
- - -
@@ -48,7 +38,7 @@
- +
@@ -58,6 +48,16 @@
+
+ + +
- + " >
diff --git a/app/Views/customer_group.php b/app/Views/customer_group.php index 3cc75e0e..cb1df249 100644 --- a/app/Views/customer_group.php +++ b/app/Views/customer_group.php @@ -52,9 +52,9 @@ - " class="edit-button" title="Edit" > + " class="edit-button" title="Edit" > - " class="delete-button" title="Delete" > + " class="delete-button" title="Delete" > @@ -75,10 +75,11 @@
- +
- + + @@ -110,28 +111,26 @@ $(document).ready(function() { $('#scrollable-modal').on('show.bs.modal', function(event) { // Get the data-primary-key attribute from the modal trigger var primaryKey = $(event.relatedTarget).data('primary-key'); - console.log(primaryKey); var groupName = $(event.relatedTarget).data('group-name'); $('#scrollableModalTitle').text(groupName + ' - Data Preview'); - console.log(groupName); - - var route = ""+primaryKey; - console.log(route); + + // Get the table reference + var table = $("#data-table tbody"); + var route = ""+primaryKey; + $.ajax({ method: 'GET', url: route, success: function(response) { if (response.length > 0) { - // Get the table reference - var table = $("#data-table tbody"); - // Clear existing rows table.empty(); - + $x=0; // Loop through the response and create table rows $.each(response, function (index, item) { var row = $(""); - row.append($(""); + table.append(""); } }, error: function () { - alert("An error occurred."); + // alert("An error occurred."); + console.log("CG Preview List - An error occurred."); + table.empty(); + table.append(""); } }); }); diff --git a/app/Views/customer_group_form.php b/app/Views/customer_group_form.php index ecad5b56..fc7f3a37 100644 --- a/app/Views/customer_group_form.php +++ b/app/Views/customer_group_form.php @@ -4,7 +4,7 @@

- + " >
@@ -15,8 +15,8 @@
-

Select Criteria

-
+

Select Criteria

+
Name#Name Email Mobile
").text(item.customer_name)); + row.append($("").text(++$x)); + row.append($("").text(item.customer_name)); row.append($("").text(item.email)); row.append($("").text(item.mobile_no)); table.append(row); @@ -139,11 +138,14 @@ $(document).ready(function() { } else { // Handle the case where there is no data table.empty(); - table.append("
No data available
No data available
No data available
@@ -27,7 +27,7 @@ - +
-
@@ -121,10 +118,11 @@
- +
- + + @@ -151,58 +149,93 @@ +

diff --git a/app/Views/event_form.php b/app/Views/event_form.php index b3bd4807..c4b79301 100644 --- a/app/Views/event_form.php +++ b/app/Views/event_form.php @@ -4,7 +4,7 @@

- + " >
diff --git a/app/Views/event_list.php b/app/Views/event_list.php index 06651b69..37ba51bb 100644 --- a/app/Views/event_list.php +++ b/app/Views/event_list.php @@ -3,7 +3,7 @@
- Add New + Add Event

diff --git a/app/Views/invoice_form.php b/app/Views/invoice_form.php index d8055940..97e52884 100644 --- a/app/Views/invoice_form.php +++ b/app/Views/invoice_form.php @@ -17,7 +17,7 @@

- + " >
diff --git a/app/Views/invoice_list.php b/app/Views/invoice_list.php index ed64e377..03b99b62 100644 --- a/app/Views/invoice_list.php +++ b/app/Views/invoice_list.php @@ -5,7 +5,7 @@
- Add New + class="btn btn-primary"> Add Invoice

@@ -46,8 +46,8 @@
diff --git a/app/Views/setting_list.php b/app/Views/setting_list.php index ec2cbd2f..9a53a543 100644 --- a/app/Views/setting_list.php +++ b/app/Views/setting_list.php @@ -3,7 +3,7 @@
- " class="btn btn-primary"> Add New + " class="btn btn-primary"> Add Setting

diff --git a/app/Views/subscribers_list.php b/app/Views/subscribers_list.php index 530cb1e9..c8a9a5ca 100644 --- a/app/Views/subscribers_list.php +++ b/app/Views/subscribers_list.php @@ -6,7 +6,7 @@ -" class="btn btn-primary"> Add New +" class="btn btn-primary"> Add Subscription

@@ -44,12 +44,12 @@
-
Name#Name Email Mobile
- " class="edit-button"> - " class="delete-button"> + " class="edit-button"> + " class="delete-button">
₹ " class="approve-button" title="Approve the Invoice">  + " class="approve-button" title="Approve the Invoice">  - " class="edit-button" title="Edit the Invoice">  + " class="edit-button" title="Edit the Invoice">  - " class="edit-button" title="Edit the Invoice">  + " class="edit-button" title="Edit the Invoice">  " class="download-pdf-button" title="Download the Invoice">  diff --git a/app/Views/subscription_form.php b/app/Views/subscription_form.php index bc1d0a9e..811494e5 100644 --- a/app/Views/subscription_form.php +++ b/app/Views/subscription_form.php @@ -5,7 +5,7 @@

+ action="" >
diff --git a/app/Views/template/footer.php b/app/Views/template/footer.php index db72a6c3..b754871d 100644 --- a/app/Views/template/footer.php +++ b/app/Views/template/footer.php @@ -784,11 +784,11 @@ - - + + - +