From 4df97de3421691bf44e15c7291f76a934401513f Mon Sep 17 00:00:00 2001 From: "venkatesh.r" Date: Sat, 11 Oct 2025 17:01:11 +0530 Subject: [PATCH 001/109] CHANGE_EB_EXCEL_CHANGE : RV --- app/Views/rfq/gpa.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/Views/rfq/gpa.php b/app/Views/rfq/gpa.php index 955b5851..a9c74b6f 100644 --- a/app/Views/rfq/gpa.php +++ b/app/Views/rfq/gpa.php @@ -71,10 +71,11 @@ - + +
From f9171b2d55dcc49473aa4ea440827e9292b594ea Mon Sep 17 00:00:00 2001 From: venba-Inspriron-3558 Date: Sat, 11 Oct 2025 17:22:43 +0530 Subject: [PATCH 002/109] FIX_Branch id checked --- app/Views/client_branch.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/Views/client_branch.php b/app/Views/client_branch.php index 6673a4af..e99072a8 100755 --- a/app/Views/client_branch.php +++ b/app/Views/client_branch.php @@ -305,6 +305,8 @@ $('#btnBranchAdd').click(function() { $('#branch_form')[0].reset(); $('#branch_form').parsley().reset(); $('#pre_branch_id').val(''); + $('#branch_id_primarykey').val(''); + $('.ac').css('display', 'block'); contactCount = 1 @@ -371,13 +373,14 @@ $("#branch_form").submit(function(event) { var selectedValues = $("#selected").val(); console.log(selectedValues, selectedValues); + console.log("branch_id_primarykey", $('#branch_id_primarykey').val()); + let level_contect_data = getContactsData(); console.log('level_contect_data', level_contect_data); event.preventDefault(); branch_PrimaryKey = $('#client_id_branch').val(); - console.log('branch_PrimaryKey', branch_PrimaryKey) if (branch_PrimaryKey === '') { From 31a423240bbcdfc96f3a3d3a688f5e6ffcdd6b4f Mon Sep 17 00:00:00 2001 From: vadivelJ96 Date: Sat, 11 Oct 2025 18:20:00 +0530 Subject: [PATCH 003/109] CHANGE_UI_FIX - VADIVEL J 2025-10-11 --- app/Views/client_branch.php | 2 +- app/Views/client_onboarding.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Views/client_branch.php b/app/Views/client_branch.php index 024c3741..b959254b 100755 --- a/app/Views/client_branch.php +++ b/app/Views/client_branch.php @@ -74,7 +74,7 @@
+ class="btn btn-primary waves-effect waves-light btn-sm ">Fetch Client Branch (Pre-Enrolment)
diff --git a/app/Views/client_onboarding.php b/app/Views/client_onboarding.php index b27a9673..3dc798d6 100755 --- a/app/Views/client_onboarding.php +++ b/app/Views/client_onboarding.php @@ -407,7 +407,7 @@
- + From d88147a53d283639b8a1056cb24c6c94e395f2dc Mon Sep 17 00:00:00 2001 From: venba-Inspriron-3558 Date: Sat, 11 Oct 2025 18:48:37 +0530 Subject: [PATCH 004/109] FIX_resolved - Email duplication based on ClientBrach testcase wise. --- app/Views/client_branch.php | 117 ++++++++++++++++++++++++++---------- 1 file changed, 85 insertions(+), 32 deletions(-) diff --git a/app/Views/client_branch.php b/app/Views/client_branch.php index 31e08346..178439fa 100755 --- a/app/Views/client_branch.php +++ b/app/Views/client_branch.php @@ -986,55 +986,108 @@ function validateDuplicateByClientBranch(input, field, submitButId) { let message = label ? label + " is duplicate!" : "Value is duplicate!"; console.log(`cId: ${clientId} | bId: ${branchId}`); - + // Don't forgot be careful // 1 Local duplication check (User entered) let isLocalDuplicate = false; $('input[name="' + field + '[]"]').each(function(index) { + let compareVal = $(this).val().trim(); console.log(`Entered value: ${value} | Contact ${index+1} value: ${$(this).val()}`); - if (this !== input && $(this).val().trim() === value) { + if (this !== input && compareVal !== '' && compareVal === value) { isLocalDuplicate = true; - return false; // break loop + return false; } }); if (isLocalDuplicate) { console.log(`r u n Local`); - console.log(`btn Dis - true`); + console.log(`duplicate found for ${field}`); toastr.warning(message, 'WARNING'); $('#' + submitButId).prop('disabled', true); - return; // don’t call server if duplicate in UI + return; } - + + // important Skip empty values + if (value === '') { + checkAllFieldsValid(submitButId); + return; + } + // Don't forgot be careful // 2 Server-side duplicate check (DB) - if (!isLocalDuplicate && value !== '') { - - $.ajax({ - url: '', - type: 'POST', - data: { - client_id: clientId, - branch_id: branchId, - value: value, - field: field - }, - dataType: 'json', - success: function(response) { - if (response.isDuplicate) { - console.log(`r u n Server`); - console.log(`btn Dis - true`); - toastr.warning(message, 'WARNING'); - $('#' + submitButId).prop('disabled', true); - } else { - console.log(`btn Dis - false`); - $('#' + submitButId).prop('disabled', false); - } - }, - error: function(xhr, status, error) { - console.error('AJAX Error:', error); + $.ajax({ + url: '', + type: 'POST', + data: { + client_id: clientId, + branch_id: branchId, + value: value, + field: field + }, + dataType: 'json', + success: function(response) { + if (response.isDuplicate) { + console.log(`r u n Server`); + console.log(`duplicate found for ${field}`); + toastr.warning(message, 'WARNING'); + $('#' + submitButId).prop('disabled', true); + } else { + console.log(`No duplicate for ${field}`); + checkAllFieldsValid(submitButId); } - }); + }, + error: function(xhr, status, error) { + console.error('AJAX Error:', error); + } + }); +} + + +// recheck all contacts before enabling submit +function checkAllFieldsValid(submitButId) { + let emailDuplicates = false; + let mobileDuplicates = false; + + // cross check all EMAIL duplicates + let emailSeen = []; + $('input[name="email[]"]').each(function() { + let val = $(this).val().trim(); + if (val && emailSeen.includes(val)) { + emailDuplicates = true; + } else if (val) { + emailSeen.push(val); + } + }); + + // cross check all MOBILE duplicates + let mobileSeen = []; + $('input[name="mobile[]"]').each(function() { + let val = $(this).val().trim(); + if (val && mobileSeen.includes(val)) { + mobileDuplicates = true; + } else if (val) { + mobileSeen.push(val); + } + }); + + if (emailDuplicates || mobileDuplicates) { + $('#' + submitButId).prop('disabled', true); + // show correct message based on what’s duplicated + if (emailDuplicates && mobileDuplicates) { + toastr.warning("Email and Mobile values are duplicate!", "WARNING"); + console.log('Both Email and Mobile duplicates'); + } else if (emailDuplicates) { + toastr.warning("Email duplicate!", "WARNING"); + console.log('Cross Check Email duplicates'); + } else if (mobileDuplicates) { + toastr.warning("Mobile duplicate!", "WARNING"); + console.log('Cross Check Mobile duplicates'); + } + console.log(`btn Dis - true`); + } else { + console.log('unique — enable'); + console.log(`btn Dis - false`); + $('#' + submitButId).prop('disabled', false); } } From 950c117a2eaef439c8391ecf5bc1e47df6caa778 Mon Sep 17 00:00:00 2001 From: "venkatesh.r" Date: Sat, 11 Oct 2025 19:32:05 +0530 Subject: [PATCH 005/109] CHANGE_HR_ACCESS_SAVE --- app/Controllers/ClientController.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Controllers/ClientController.php b/app/Controllers/ClientController.php index ee7ae376..1529e549 100755 --- a/app/Controllers/ClientController.php +++ b/app/Controllers/ClientController.php @@ -7305,7 +7305,9 @@ class ClientController extends AdminController $pre_hr_id = $db2->table('client_branch cb') ->select('lc.id') ->join('level_contacts lc','lc.ref_id = cb.id') - ->where('cb.id',$pre_branch_id)->where('cb.is_Active',1)->where('lc.is_Active',1)->get()->getResultArray()[0]['id']??""; + ->where('lc.contact_type', 'client') + ->where('cb.id',$pre_branch_id)->where('cb.is_Active',1) + ->where('lc.is_Active',1)->get()->getResultArray()[0]['id']??""; return $pre_hr_id; } From fadcd8d6857a0b6a15e1651915f58b039be3ecf2 Mon Sep 17 00:00:00 2001 From: "venkatesh.r" Date: Mon, 13 Oct 2025 14:36:36 +0530 Subject: [PATCH 006/109] FEAT_MASTERS : RV --- app/Controllers/MasterController.php | 91 +- app/Models/VehicleTypeModel.php | 54 + app/Views/nhance_branch_list.php | 207 ++++ app/Views/vehicle_type_list.php | 1692 ++++++++++++++++++++++++++ 4 files changed, 2043 insertions(+), 1 deletion(-) create mode 100644 app/Models/VehicleTypeModel.php create mode 100644 app/Views/nhance_branch_list.php create mode 100644 app/Views/vehicle_type_list.php diff --git a/app/Controllers/MasterController.php b/app/Controllers/MasterController.php index 013a9324..cde00cf7 100755 --- a/app/Controllers/MasterController.php +++ b/app/Controllers/MasterController.php @@ -33,6 +33,7 @@ use App\Models\ClientDepositModel; use App\Models\EmployeePolicyModel; use App\Models\FileModel; use App\Models\InsurerExcelExportTemplateModel; +use App\Models\NhanceBranchModel; use App\Models\SettingsModel; use App\Models\VehicleModel; @@ -1618,7 +1619,8 @@ class MasterController extends AdminController //Vehicle Master data Function public function VehicleMasterList() - { $data['tab_name'] = 'Vehicle Master'; + { + $data['tab_name'] = 'Vehicle Master'; $data['page_name'] = 'Vehicles'; $data['vehicle_type'] = [ 'two_wheeler' => 'Two Wheeler', @@ -2020,4 +2022,91 @@ class MasterController extends AdminController dd($result); } + public function nhanceBranchMaster() + { + $nhanceBranchModel = new NhanceBranchModel(); + + if ($this->request->is('post')) { + + $id = $this->request->getPost('pk') ?? null; + $data = $this->request->getPost(); + print_r($data); die; + + if (empty($id)) { + $update_status = $nhanceBranchModel->insert($data); + } else { + $update_status = $nhanceBranchModel->where('id', $id)->set($data)->update(); + } + + if ($update_status) { + return $this->respond([ + 'status' => true, + 'code' => 200, + 'message' => 'Nhance Branch Master updated successfully', + 'data' => $data + ], 200); + } else { + return $this->respond([ + 'status' => false, + 'code' => 400, + 'message' => 'Failed to update', + 'data' => $data + ], 200); + } + + } elseif ($this->request->is('get')) { + + $id = $this->request->getGet('pk') ?? null; + + if (!empty($id)) { + $data = $nhanceBranchModel->where('is_active', 1)->where('id', $id)->findAll(); + if (!empty($data)) { + return $this->respond(['status' => true, 'code' => 200, 'data' => $data], 200); + } else { + return $this->respond(['status' => false, 'code' => 400, 'message' => 'No data found'], 200); + } + } + + $data = $nhanceBranchModel->where('is_active', 1)->findAll(); + return $this->loadLayout('nhance_branch_list', ['data' => $data]); + + } elseif ($this->request->is('delete')) { + + $input = $this->request->getRawInput(); + $id = $input['pk'] ?? null; + + if (empty($id)) { + return $this->respond([ + 'status' => false, + 'code' => 404, + 'message' => 'No ID provided for deletion' + ], 200); + } + + $update_status = $nhanceBranchModel->where('id', $id)->set(['is_active' => 0])->update(); + + if ($update_status) { + return $this->respond([ + 'status' => true, + 'code' => 200, + 'message' => 'Data removed successfully', + 'pk' => $id + ], 200); + } else { + return $this->respond([ + 'status' => false, + 'code' => 400, + 'message' => 'Failed to remove data', + 'pk' => $id + ], 200); + } + } + } + + + public function vehicleTypeMaster() + { + + } + } \ No newline at end of file diff --git a/app/Models/VehicleTypeModel.php b/app/Models/VehicleTypeModel.php new file mode 100644 index 00000000..46fdc3c9 --- /dev/null +++ b/app/Models/VehicleTypeModel.php @@ -0,0 +1,54 @@ + +.dataTables_filter { + position: absolute; +} + + + +
+
+
+
+ + + + + + + + + + $row) { ?> + + + + + + + + +
S.No.Branch NameAction
+
+ +
+ Edit + Delete +
+
+
+
+
+
+
+ + + + + + + diff --git a/app/Views/vehicle_type_list.php b/app/Views/vehicle_type_list.php new file mode 100644 index 00000000..3cc0de76 --- /dev/null +++ b/app/Views/vehicle_type_list.php @@ -0,0 +1,1692 @@ + + + + +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
S.No.Mobile NoRoleStatusAction
first_name; ?>email; ?>mobile; ?>user_role; ?> + + is_active == 1){ echo 'Active'; }else{ echo 'In-Active'; } ?> + + +
+ +
+ Edit + Delete +
+
+
+ + +
+
+
+ +
+ + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
TeamModuleAccess Rights
ManagementBDS - All accessAll access
FinanceBDS - Policy TransactionPolicy | Endorsement | Statement Upload
BDS - ReportTAT wise | ACM Status wise | ACM TAT wise
BDS - Pending ActionsFinance Team
BDS - MastersVehicle | CD
BDS - Documents✓
BusinessBDS - Policy TransactionPolicy | Endorsement
BDS - ReportTAT wise | ACM Status wise | ACM TAT wise
BDS - Pending ActionsBusiness Team
BDS - MastersVehicle | CD
BDS - Documents✓
POSBDS - Policy TransactionPolicy | Endorsement
BDS - ReportBDS, TAT wise | ACM Status wise | ACM TAT wise
EnrollmentInception File UploadAll access
ClaimsClaimsAll access
SalesLEADLead creation | RFQ creation
Business SupportLEADAll access
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
TeamModuleAccess Rights
HeadAll modulesAll access
AdminAll modulesAll access
ManagerAccess to all modules except the "Masters" moduleAll access
Account ManagerAccess to all modules except the "Masters" moduleAll access without "Delete option"
StaffBased on the "Teams"Based on the "Teams"
+
+
+ + + + + + \ No newline at end of file From 654041d725377580c7f914546f85a7de4549f194 Mon Sep 17 00:00:00 2001 From: "venkatesh.r" Date: Mon, 13 Oct 2025 14:44:59 +0530 Subject: [PATCH 007/109] CHANGE_ROUTE --- app/Config/Routes.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 31453be4..0cd7f7fe 100755 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -395,6 +395,8 @@ $routes->group("/util", ["filter" => "authMVC"], function ($routes) { $routes->get('getMemberDataExcelFileErrors', 'LeadsController::getMemberDataExcelFileErrors'); $routes->post('savePlacementDataAndValidateMemberDataFile', 'LeadsController::savePlacementDataAndValidateMemberDataFile'); $routes->get('checkMemberDataFileValidationStatus', 'LeadsController::checkMemberDataFileValidationStatus'); + $routes->match(['get', 'post', 'delete'], 'nhanceBranchMaster', 'MasterController::nhanceBranchMaster'); + }); $routes->post("policy_tranction/sendInstallmentRemainderMail","PolicyTransactionController::sendInstallmentRemainderMail"); From df1932e5acbdafedb97ac431e10dd023877cda4b Mon Sep 17 00:00:00 2001 From: vadivelJ96 Date: Mon, 13 Oct 2025 15:26:30 +0530 Subject: [PATCH 008/109] CHANGE_UI_FIX - VADIVEL J 2025-10-13 --- app/Controllers/TestingController.php | 46 +++++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/app/Controllers/TestingController.php b/app/Controllers/TestingController.php index e6f377c7..d003037e 100644 --- a/app/Controllers/TestingController.php +++ b/app/Controllers/TestingController.php @@ -362,6 +362,17 @@ class TestingController extends BaseController $pre_clients_list = $this->getNonDuplicatePreClients(); + $log_post_clients_list = $post_clients_list ; + + $log_pre_clients_list = $pre_clients_list ; + + log_message('error', 'Post Clients to be processed: ' . count($log_post_clients_list)); + log_message('error', 'Pre Clients to be processed: ' . count($log_pre_clients_list)); + + + + $matched_Count = 0 ; + $expected_match_count = min(count($post_clients_list), count($pre_clients_list)); if ( @@ -372,12 +383,18 @@ class TestingController extends BaseController $postDB = \Config\Database::connect(); $preDB = \Config\Database::connect('preDB'); - foreach ($post_clients_list as $post_client) { + foreach ($post_clients_list as $index => $post_client) { - foreach ($pre_clients_list as $pre_client) { + foreach ($pre_clients_list as $index => $pre_client) { if (trim($post_client['short_name']) == trim($pre_client['short_name'])) { + unset($log_post_clients_list[$index]); + unset($log_pre_clients_list[$index]); + + $matched_Count++; + + $postDB->table('clients')->where('id', $post_client['id'])->update(['pre_client_id' => $pre_client['id']]); $preDB->table('clients')->where('id', $pre_client['id'])->update(['post_client_id' => $post_client['id']]); @@ -426,7 +443,32 @@ class TestingController extends BaseController } } } + + + log_message('error', 'Expected Match Count : ' . $expected_match_count); + log_message('error', 'Total Matched Count: ' . $matched_Count); + log_message('error', 'Total UnMatched Count: ' . $expected_match_count - $matched_Count); + + + log_message('error','unmatched_reocrds'); + + $log_post_clients_list = array_values($log_post_clients_list); + $log_pre_clients_list = array_values($log_pre_clients_list); + + if( (count($log_pre_clients_list) < count($log_post_clients_list))){ + log_message('error',"unmatched records count from pre- ". count($log_pre_clients_list)); + log_message('error',print_r($log_pre_clients_list,true)); + } else { + log_message('error',"unmatched records count from post - ".count($log_post_clients_list)); + log_message('error',print_r($log_post_clients_list,true)); + } + + } + + return $this->response->setJSON(['status' => 'success', 'message' => 'Client and Branch mapping completed.'])->setStatusCode(200); + + } From eb7e3f3f92fc3ca0fb3b28e35c8861933c7b7a45 Mon Sep 17 00:00:00 2001 From: "venkatesh.r" Date: Tue, 14 Oct 2025 10:26:31 +0530 Subject: [PATCH 009/109] CHANGE_BDS_CHANGES --- app/Controllers/ClientController.php | 2 +- app/Controllers/PolicyTransactionController.php | 15 ++++++++++++--- app/Models/ClientPolicyModel.php | 1 + app/Models/EmployeePolicyModel.php | 2 ++ 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/app/Controllers/ClientController.php b/app/Controllers/ClientController.php index 1529e549..bcadb66d 100755 --- a/app/Controllers/ClientController.php +++ b/app/Controllers/ClientController.php @@ -4669,7 +4669,7 @@ class ClientController extends AdminController // Additional logic for non-individual clients (client_type != 2) $branch_insert = null; if ($client_type != 2) { - $unit[] = $postData['short_name'] . '-' . $postData['branch_code'] ?? 001; + $unit[] = $postData['short_name'] . '-' . ($postData['branch_code'] ?? 001); $branch_data = [ 'client_id' => $client_insert, 'branch_name' => $postData['branch_name'], diff --git a/app/Controllers/PolicyTransactionController.php b/app/Controllers/PolicyTransactionController.php index db8be45b..d2b45648 100644 --- a/app/Controllers/PolicyTransactionController.php +++ b/app/Controllers/PolicyTransactionController.php @@ -594,6 +594,7 @@ class PolicyTransactionController extends BaseController 'client_branch_id' => $data['client_branch_id'] ?? 0, 'cd_ac_pk' => $data['cd_ac_no'] ?? null, 'gst' => 18, + 'policy_entry_from' => 2, ]; } @@ -1397,6 +1398,12 @@ class PolicyTransactionController extends BaseController ->orderBy('id', 'asc') ->first(); + $pt_id = null; + if(!empty($data)){ + $inception_data = $this->policyTransactionModel->where('policy_no', $data['policy_no'])->where('client_id', $data['client_id'])->first(); + $pt_id = $inception_data['id']; + } + if (!empty($data['policy_start_date'])) { $data['policy_start_date'] = change_date_format($data['policy_start_date'], 'Y-m-d', 'd/m/Y'); @@ -1559,7 +1566,7 @@ class PolicyTransactionController extends BaseController // print_r($data['endorse_eff_date']); die; if ($data) { - return $this->respond(['status' => true, 'data' => $data], 200); + return $this->respond(['status' => true, 'data' => $data, 'pt_id' => $pt_id], 200); } else { return $this->respond(['status' => false], 200); } @@ -1709,14 +1716,16 @@ class PolicyTransactionController extends BaseController ") ->join('policy_transaction', 'policy_transaction.id = pt_co_share_details.pt_id') ->where('policy_transaction.client_id', $client_id) - ->where('policy_transaction.client_policy_id', $client_policy_id) + // ->where('policy_transaction.client_policy_id', $client_policy_id) + ->where('policy_transaction.id', $client_policy_id) ->where('policy_transaction.action_type', 'inception') ->where('policy_transaction.is_active', 1) ->findAll(); $is_copay_yes = $this->policyTransactionModel ->where('client_id', $client_id) - ->where('client_policy_id', $client_policy_id) + // ->where('client_policy_id', $client_policy_id) + ->where('id', $client_policy_id) ->where('action_type', 'inception') ->where('is_active', 1) ->first(); diff --git a/app/Models/ClientPolicyModel.php b/app/Models/ClientPolicyModel.php index 132080de..152cad7f 100755 --- a/app/Models/ClientPolicyModel.php +++ b/app/Models/ClientPolicyModel.php @@ -55,6 +55,7 @@ class ClientPolicyModel extends Model "cd_ac_pk", "is_lgbtq", "placement_json", + "policy_entry_from", ]; // Callbacks diff --git a/app/Models/EmployeePolicyModel.php b/app/Models/EmployeePolicyModel.php index 348d309d..041ac791 100755 --- a/app/Models/EmployeePolicyModel.php +++ b/app/Models/EmployeePolicyModel.php @@ -1492,6 +1492,7 @@ class EmployeePolicyModel extends Model tpa.tpa_logo AS tpa_logo, tpa.front_card, tpa.back_card, + tpa.network_hospitals, tpa.short_name AS tpa_short_name' ) @@ -1557,6 +1558,7 @@ class EmployeePolicyModel extends Model tpa.tpa_logo AS tpa_logo, tpa.front_card, tpa.back_card, + tpa.network_hospitals, tpa.short_name AS tpa_short_name' ) From 19c3c12f5876c23daf9e7415ef8dde7b62d94c71 Mon Sep 17 00:00:00 2001 From: vadivelJ96 Date: Tue, 14 Oct 2025 10:40:39 +0530 Subject: [PATCH 010/109] CHANGE_Mail_template_filename_issue - VADIVEL J 2025-10-14 --- app/Helpers/utility_helper.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Helpers/utility_helper.php b/app/Helpers/utility_helper.php index c03ffcc9..f66229f5 100755 --- a/app/Helpers/utility_helper.php +++ b/app/Helpers/utility_helper.php @@ -57,6 +57,7 @@ if (!function_exists('file_Upload')) { if ($fileToUpload !== null && $fileToUpload->isValid() && !$fileToUpload->hasMoved()) { $fileToUpload->move($filepath); $fileName = $fileToUpload->getName(); + $fileName = preg_replace('/[\s\x{00A0}\x{200B}-\x{200D}\x{FEFF}]/u', '', $fileName); return $fileName; } else { return ""; From eeef23512d60e0d4123f6706a10b233e912045e2 Mon Sep 17 00:00:00 2001 From: "venkatesh.r" Date: Tue, 14 Oct 2025 14:08:39 +0530 Subject: [PATCH 011/109] CHANGE_VEHICLE_NO_VALIDATION : RV --- .../policy_transaction_inception_form.php | 1946 +++++++++++------ 1 file changed, 1264 insertions(+), 682 deletions(-) diff --git a/app/Views/policy_transaction_inception_form.php b/app/Views/policy_transaction_inception_form.php index 4ccac05a..268d952b 100644 --- a/app/Views/policy_transaction_inception_form.php +++ b/app/Views/policy_transaction_inception_form.php @@ -1,162 +1,260 @@ + +
@@ -200,117 +298,116 @@
- -
- -
-
-
-
-
- - + + $value) { + echo ""; } - ?> - -
- + } + ?> +
-
- -
- - -
- -
- - -
- -
- - -
- - - -
- - -
+
-
+
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ + + +
+ + +
+
+
- +
-
- -
+
+ +
@@ -526,344 +623,340 @@
- Submit + Submit
@@ -5616,6 +6160,8 @@ $(".individual_client").find("select, input, textarea").val("").prop("required", true); } + toggleRequiredWithAsterisk('#gst', false); + toggleRequiredWithAsterisk('#mobile', false); $("#client_form_row_div").on("input change", "input, select, textarea", function () { if ($("#client_type").val() === "") { @@ -5661,39 +6207,75 @@ toastr.warning(message, 'WARNING'); // $(input).val(''); isGSTValid = false; - $('#client_add_modal_submit_btn').prop('disabled', true); + $('#client_form_submit_btn').prop('disabled', true); + $('#vehicle_form_submit_btn_id_for_disable').prop('disabled', true); } else { isGSTValid = true; - $('#client_add_modal_submit_btn').prop('disabled', false); + $('#client_form_submit_btn').prop('disabled', false); + $('#vehicle_form_submit_btn_id_for_disable').prop('disabled', false); } }); - $('#hide_smbt_btn button').prop('disabled', false); + $('#hide_smbt_btn_button').prop('disabled', false); } $('#client_type').on('change', function() { let client_type = $(this).val(); + console.log( "client_type", client_type); if(client_type == 1){ $('.group_client').show(); $('.individual_client').hide(); $(".group_client").find("select, input, textarea").val("").prop("required", true); $(".individual_client").find("select, input, textarea").val("").prop("required", false); + toggleRequiredWithAsterisk('#gst', false); }else{ $('.group_client').hide(); $('.individual_client').show(); $(".group_client").find("select, input, textarea").val("").prop("required", false); $(".individual_client").find("select, input, textarea").val("").prop("required", true); + toggleRequiredWithAsterisk('#gst', false); } }); + function toggleRequiredWithAsterisk(inputSelector, makeRequired) { + + var $input = $(inputSelector); + var $label = $input.closest('.form-group').find('label'); + + console.log('Toggling required for:', inputSelector, 'Make required:', makeRequired); + + if(makeRequired) { + $input.attr('required', true); + console.log('Added required attribute'); + + // Add asterisk if not already present + if($label.find('span.text-danger').length === 0) { + $label.append(' *'); + console.log('Added * to label'); + } else { + console.log('* already exists in label'); + } + } else { + $input.removeAttr('required'); + console.log('Removed required attribute'); + + // Remove asterisk + $label.find('span.text-danger').remove(); + console.log('Removed * from label'); + } + + console.log('Current input attributes:', $input.prop('outerHTML')); + console.log('Current label html:', $label.html()); + } + $(document).on("input change", "input[name='total[]']", function () { let val = $(this).val(); console.log("✅ total[] changed:", val); }); - \ No newline at end of file + From 5700b1cc252c0ca684002e2035a8ca44832a89e5 Mon Sep 17 00:00:00 2001 From: vadivelJ96 Date: Tue, 14 Oct 2025 14:19:57 +0530 Subject: [PATCH 012/109] CHANGE_Mail_template_filename_issue - VADIVEL J 2025-10-14 --- app/Config/Routes.php | 1 + app/Controllers/TestingController.php | 72 +++++++++++++++++++++++++++ 2 files changed, 73 insertions(+) diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 0cd7f7fe..58aa95b4 100755 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -713,6 +713,7 @@ $routes->group('test', function($routes) { $routes->get('mapping_client_id_and_branch_id','TestingController::mapping_client_id_and_branch_id'); $routes->get('membervalidation', 'TestingController::membervalidation'); $routes->get('generateExcel', 'TestingController::generateExcel'); + $routes->get('logo_renaming','TestingController::logo_renaming'); }); $routes->cli('cli/testcli', 'TestingController::testcli'); diff --git a/app/Controllers/TestingController.php b/app/Controllers/TestingController.php index d003037e..9104f3f5 100644 --- a/app/Controllers/TestingController.php +++ b/app/Controllers/TestingController.php @@ -715,4 +715,76 @@ class TestingController extends BaseController ]; } + + public function logo_renaming(){ + + $directory = ROOTPATH . 'public/uploads/logo/'; + + if (!is_dir($directory)) { + die("Directory not found: $directory"); + } + + $files = scandir($directory); + + $client_logo_files = $this->get_client_logo_files(); + + $rename_files = ""; + $failed_rename_files = ""; + + foreach ($files as $file) { + // Skip system entries + if ($file === '.' || $file === '..' ) { + continue; + } + + + $oldPath = $directory . $file; + + if (is_file($oldPath) && in_array(trim($file) , $client_logo_files)) { + + // Remove all spaces from filename + $newFileName = preg_replace('/\s+|\x{00A0}|\x{200B}|\x{200C}|\x{200D}|\x{FEFF}/u', '', $file); + + $newPath = $directory . $newFileName; + + // Only rename if the name changed + if ($oldPath !== $newPath) { + if (rename($oldPath, $newPath)) { + $rename_files .= "\n Renamed: $file → $newFileName \n"; + } else { + $failed_rename_files .= "\n Failed file: $file \n"; + } + } + } + } + log_message('error', 'Renamed Files: ' . $rename_files); + log_message('error', 'Failed Renames: ' . $failed_rename_files); + + return $this->response->setJSON(['status' => 'success', + 'message' => 'Logo renaming completed. kindly check backend logs for details', + 'data' => [ + 'renamed_files' => $rename_files, + 'failed_renames' => $failed_rename_files + ] + ])->setStatusCode(200); + } + + public function get_client_logo_files(){ + + $db = \Config\Database::connect(); + + $sql = "SELECT client_logo FROM clients WHERE client_logo IS NOT NULL AND TRIM(client_logo) <> '' "; + + $query = $db->query($sql); + + $results = $query->getResultArray() ?? []; + + $files = array_map(function($item) { + return trim($item['client_logo']); + }, $results); + + return $files; + } + + } From 77406ef3359e7c667dcfbfece170f6cad74f7f1e Mon Sep 17 00:00:00 2001 From: vadivelJ96 Date: Tue, 14 Oct 2025 14:55:01 +0530 Subject: [PATCH 013/109] CHANGE_Mail_template_filename_issue - VADIVEL J 2025-10-14 --- app/Controllers/TestingController.php | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/app/Controllers/TestingController.php b/app/Controllers/TestingController.php index 9104f3f5..a7cdddd1 100644 --- a/app/Controllers/TestingController.php +++ b/app/Controllers/TestingController.php @@ -757,8 +757,12 @@ class TestingController extends BaseController } } } + + $dbUpdated = $this->update_client_logo_files(); + log_message('error', 'Renamed Files: ' . $rename_files); log_message('error', 'Failed Renames: ' . $failed_rename_files); + log_message('error', 'Database Update Status: ' . ($dbUpdated ? 'Success' : 'No changes made')); return $this->response->setJSON(['status' => 'success', 'message' => 'Logo renaming completed. kindly check backend logs for details', @@ -786,5 +790,22 @@ class TestingController extends BaseController return $files; } + public function update_client_logo_files(){ + + $db = \Config\Database::connect(); + + $sql = "UPDATE clients + SET client_logo = REPLACE(REPLACE(REPLACE(client_logo, CHAR(160), ''), ' ', ''), '\t', '') + WHERE client_logo IS NOT NULL + AND TRIM(client_logo) <> '' + "; + + $query = $db->query($sql); + + return $db->affectedRows() > 0; + + + } + } From 7b1d98d86ce749e15495f13ecc0c92982b467d49 Mon Sep 17 00:00:00 2001 From: venba-Inspriron-3558 Date: Tue, 14 Oct 2025 15:03:43 +0530 Subject: [PATCH 014/109] FIX_Master screen --- app/Config/Routes.php | 3 + app/Controllers/MasterController.php | 174 +++++++++++- app/Models/RTOModel.php | 57 ++++ app/Views/layout/header.php | 9 + app/Views/nhance_branch_list.php | 159 ++++++++--- .../policy_transaction_inception_form.php | 61 +++++ app/Views/rto_master_list.php | 254 ++++++++++++++++++ app/Views/vehicle_type_master_list.php | 230 ++++++++++++++++ 8 files changed, 905 insertions(+), 42 deletions(-) create mode 100644 app/Models/RTOModel.php create mode 100644 app/Views/rto_master_list.php create mode 100755 app/Views/vehicle_type_master_list.php diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 58aa95b4..877ba46e 100755 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -396,6 +396,9 @@ $routes->group("/util", ["filter" => "authMVC"], function ($routes) { $routes->post('savePlacementDataAndValidateMemberDataFile', 'LeadsController::savePlacementDataAndValidateMemberDataFile'); $routes->get('checkMemberDataFileValidationStatus', 'LeadsController::checkMemberDataFileValidationStatus'); $routes->match(['get', 'post', 'delete'], 'nhanceBranchMaster', 'MasterController::nhanceBranchMaster'); + $routes->match(['get', 'post', 'delete'], 'vehicleTypeMaster', 'MasterController::vehicleTypeMaster'); + $routes->match(['get', 'post', 'delete'], 'rtoMaster', 'MasterController::rtoMaster'); + }); diff --git a/app/Controllers/MasterController.php b/app/Controllers/MasterController.php index cde00cf7..19cde67b 100755 --- a/app/Controllers/MasterController.php +++ b/app/Controllers/MasterController.php @@ -36,6 +36,8 @@ use App\Models\InsurerExcelExportTemplateModel; use App\Models\NhanceBranchModel; use App\Models\SettingsModel; use App\Models\VehicleModel; +use App\Models\VehicleTypeModel; +use App\Models\RTOModel; use CodeIgniter\CLI\CLI; @@ -2022,15 +2024,19 @@ class MasterController extends AdminController dd($result); } + //---------------------------------------------------------------------------------------------------------- + public function nhanceBranchMaster() { $nhanceBranchModel = new NhanceBranchModel(); + $method = $this->request->getMethod(); + $data['tab_name'] = 'Nhance Branch'; + $data['page_name'] = 'Nhance Branchs'; - if ($this->request->is('post')) { + if ($method === 'post') { $id = $this->request->getPost('pk') ?? null; $data = $this->request->getPost(); - print_r($data); die; if (empty($id)) { $update_status = $nhanceBranchModel->insert($data); @@ -2054,7 +2060,7 @@ class MasterController extends AdminController ], 200); } - } elseif ($this->request->is('get')) { + } elseif ($method === 'get') { $id = $this->request->getGet('pk') ?? null; @@ -2070,7 +2076,7 @@ class MasterController extends AdminController $data = $nhanceBranchModel->where('is_active', 1)->findAll(); return $this->loadLayout('nhance_branch_list', ['data' => $data]); - } elseif ($this->request->is('delete')) { + } elseif ($method === 'delete') { $input = $this->request->getRawInput(); $id = $input['pk'] ?? null; @@ -2106,7 +2112,167 @@ class MasterController extends AdminController public function vehicleTypeMaster() { + $vehicleTypeModel = new VehicleTypeModel(); + $method = $this->request->getMethod(); + $data['tab_name'] = 'Vehicle Type'; + $data['page_name'] = 'Vehicle Types'; + if ($method === 'post') { + $id = $this->request->getPost('pk') ?? null; + $data = $this->request->getPost(); + + if (empty($id)) { + $update_status = $vehicleTypeModel->insert($data); + } else { + $update_status = $vehicleTypeModel->where('id', $id)->set($data)->update(); + } + + if ($update_status) { + return $this->respond([ + 'status' => true, + 'code' => 200, + 'message' => 'Vehicle Type Master updated successfully', + 'data' => $data + ], 200); + } else { + return $this->respond([ + 'status' => false, + 'code' => 400, + 'message' => 'Failed to update', + 'data' => $data + ], 200); + } + + } elseif ($method === 'get') { + + $id = $this->request->getGet('pk') ?? null; + + if (!empty($id)) { + $data = $vehicleTypeModel->where('is_active', 1)->where('id', $id)->findAll(); + if (!empty($data)) { + return $this->respond(['status' => true, 'code' => 200, 'data' => $data], 200); + } else { + return $this->respond(['status' => false, 'code' => 400, 'message' => 'No data found'], 200); + } + } + + $data = $vehicleTypeModel->where('is_active', 1)->findAll(); + return $this->loadLayout('vehicle_type_master_list', ['data' => $data]); + + } elseif ($method === 'delete') { + + $input = $this->request->getRawInput(); + $id = $input['pk'] ?? null; + + if (empty($id)) { + return $this->respond([ + 'status' => false, + 'code' => 404, + 'message' => 'No ID provided for deletion' + ], 200); + } + + $update_status = $vehicleTypeModel->where('id', $id)->set(['is_active' => 0])->update(); + + if ($update_status) { + return $this->respond([ + 'status' => true, + 'code' => 200, + 'message' => 'Data removed successfully', + 'pk' => $id + ], 200); + } else { + return $this->respond([ + 'status' => false, + 'code' => 400, + 'message' => 'Failed to remove data', + 'pk' => $id + ], 200); + } + } + } + + public function rtoMaster() + { + $rtoModel = new RTOModel(); + $method = $this->request->getMethod(); + $data['tab_name'] = 'RTO'; + $data['page_name'] = 'RTO'; + + if ($method === 'post') { + + $id = $this->request->getPost('pk') ?? null; + $data = $this->request->getPost(); + + if (empty($id)) { + $update_status = $rtoModel->insert($data); + } else { + $update_status = $rtoModel->where('id', $id)->set($data)->update(); + } + + if ($update_status) { + return $this->respond([ + 'status' => true, + 'code' => 200, + 'message' => 'RTO Master updated successfully', + 'data' => $data + ], 200); + } else { + return $this->respond([ + 'status' => false, + 'code' => 400, + 'message' => 'Failed to update', + 'data' => $data + ], 200); + } + + } elseif ($method === 'get') { + + $id = $this->request->getGet('pk') ?? null; + + if (!empty($id)) { + $data = $rtoModel->where('is_active', 1)->where('id', $id)->findAll(); + if (!empty($data)) { + return $this->respond(['status' => true, 'code' => 200, 'data' => $data], 200); + } else { + return $this->respond(['status' => false, 'code' => 400, 'message' => 'No data found'], 200); + } + } + + $data = $rtoModel->where('is_active', 1)->findAll(); + return $this->loadLayout('rto_master_list', ['data' => $data]); + + } elseif ($method === 'delete') { + + $input = $this->request->getRawInput(); + $id = $input['pk'] ?? null; + + if (empty($id)) { + return $this->respond([ + 'status' => false, + 'code' => 404, + 'message' => 'No ID provided for deletion' + ], 200); + } + + $update_status = $rtoModel->where('id', $id)->set(['is_active' => 0])->update(); + + if ($update_status) { + return $this->respond([ + 'status' => true, + 'code' => 200, + 'message' => 'Data removed successfully', + 'pk' => $id + ], 200); + } else { + return $this->respond([ + 'status' => false, + 'code' => 400, + 'message' => 'Failed to remove data', + 'pk' => $id + ], 200); + } + } } } \ No newline at end of file diff --git a/app/Models/RTOModel.php b/app/Models/RTOModel.php new file mode 100644 index 00000000..6f5abcab --- /dev/null +++ b/app/Models/RTOModel.php @@ -0,0 +1,57 @@ + Users +
  • + Nhance Branch +
    • +
  • + Vehicle Type +
    • +
  • + RTO +
    • diff --git a/app/Views/nhance_branch_list.php b/app/Views/nhance_branch_list.php index 97660071..f3655ec8 100644 --- a/app/Views/nhance_branch_list.php +++ b/app/Views/nhance_branch_list.php @@ -14,25 +14,43 @@ S.No. Branch Name + Action + $row) { ?> - +    +
    - Edit - Delete + + Edit + + + + Delete + +
    + + + No data available + + @@ -43,14 +61,15 @@
    +
    + + +
    +
    From b1d67886e2a22e621cd38d2a00470488ec399ab9 Mon Sep 17 00:00:00 2001 From: "venkatesh.r" Date: Wed, 15 Oct 2025 10:15:47 +0530 Subject: [PATCH 017/109] FIX_FAMILY_COM --- app/Views/view_rfq.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/Views/view_rfq.php b/app/Views/view_rfq.php index d3139864..1c213669 100644 --- a/app/Views/view_rfq.php +++ b/app/Views/view_rfq.php @@ -1360,7 +1360,7 @@ $(document).ready(function () { if (lead_status != "won") { console.log("Lead status is not 'won', setting interval for submitData"); - // startInterval(); + startInterval(); } else { console.log("Lead status is 'won', submitData will not be called"); } @@ -1557,8 +1557,8 @@ function saveFamilyMembersDetails() { function resetFamiliyDialogModalValues() { - $('#familiy_dialog_row_index').val(''); - $('#familiy_dialog_column_index').val(''); + // $('#familiy_dialog_row_index').val(''); + // $('#familiy_dialog_column_index').val(''); // Reset Self $('#family_self').prop('checked', true); @@ -3751,6 +3751,8 @@ function setCellInnerHTMLByCellIndex(tableId, rowIndex, colIndex, htmlContent) { // Set the innerHTML of the cell cell.innerHTML = htmlContent; console.log(`Updated cell at row ${rowIndex}, column ${colIndex} with content: ${htmlContent}`); + $('#familiy_dialog_row_index').val(''); + $('#familiy_dialog_column_index').val(''); } else { console.error(`Column index ${colIndex} does not exist in row ${rowIndex}`); } From ebb7b929419b1b1cab24aea8bfd3865234d15f35 Mon Sep 17 00:00:00 2001 From: "venkatesh.r" Date: Wed, 15 Oct 2025 10:17:36 +0530 Subject: [PATCH 018/109] CHANGE_BDS_CHANGE --- app/Controllers/ClientController.php | 2 +- .../PolicyTransactionController.php | 33 ++++++++++++------- 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/app/Controllers/ClientController.php b/app/Controllers/ClientController.php index bcadb66d..a625d914 100755 --- a/app/Controllers/ClientController.php +++ b/app/Controllers/ClientController.php @@ -1613,7 +1613,7 @@ class ClientController extends AdminController if ($update) { - $policy_transaction_update = $this->deactivatePolicyTransactionsPolicy($id); + // $policy_transaction_update = $this->deactivatePolicyTransactionsPolicy($id); return $this->respond(['status' => true, 'code' => 200], 200); } else { diff --git a/app/Controllers/PolicyTransactionController.php b/app/Controllers/PolicyTransactionController.php index d2b45648..338b4c16 100644 --- a/app/Controllers/PolicyTransactionController.php +++ b/app/Controllers/PolicyTransactionController.php @@ -381,7 +381,7 @@ class PolicyTransactionController extends BaseController } if ($data['client_type'] == 1 && $data['status'] == 'completed' && $data['is_cd_reduce_from_bds'] == 1) { - $this->processCompletedStatus($data, $client_policy_id, $data['insurer_id']); + $this->processCompletedStatus($data, $client_policy_id, $data['insurer_id'], $insert); } } @@ -435,7 +435,7 @@ class PolicyTransactionController extends BaseController if($old_pt_data['status'] != "completed"){ if ($data['status'] == 'completed' && $data['ct_type'] == 2) { if ($data['client_type'] == 1 && $data['is_cd_reduce_from_bds'] == 1) { - $this->processCompletedStatus($data, $data['client_policy_id'], $data['insurer_id']); + $this->processCompletedStatus($data, $data['client_policy_id'], $data['insurer_id'], $id); } } } @@ -610,7 +610,7 @@ class PolicyTransactionController extends BaseController $this->policyTransactionStatusModel->insert($statusData); } - private function processCompletedStatus($data, $client_policy_id, $insurer_id) + private function processCompletedStatus($data, $client_policy_id, $insurer_id, $policyTranId) { $totalAmount = (int)$data['total'][0] ?? 0; $description = 'The following amount of Rs. ' . $totalAmount . '/- has been debited for the ' . $data['emp_count'] . ' employees at Inception (BDS).'; @@ -631,7 +631,12 @@ class PolicyTransactionController extends BaseController 'cd_ac_pk' => $data['cd_ac_pk'] ]; - DepositHelper::saveDeposit($cdTransactionData, get_session_userid()); + $result = DepositHelper::saveDeposit($cdTransactionData, get_session_userid()); + + if(isset($result) && $result['success'] == true){ + $update_data['ct_tran_id'] = $result['insert_id']; + $this->policyTransactionModel->where('id', $policyTranId)->set($update_data)->update(); + } } private function cdCorrection($data, $amt) @@ -1026,13 +1031,12 @@ class PolicyTransactionController extends BaseController } } - public function removePolicyTransaction($id) - { + public function removePolicyTransaction($id, $type = 0) + { if ($id) { - $data['is_active'] = 0; $policy_transaction_data = $this->policyTransactionModel->where('id', $id)->first(); - if($policy_transaction_data['policy_type_id'] > 7){ + if($policy_transaction_data['policy_type_id'] > 7 && $type == 0){ $this->policyTransactionModel->where('id', $id)->set($data)->update(); $this->PTCOShareDetailsModel->where('pt_id', $id)->set($data)->update(); $this->clientPolicyModel->where('id', $policy_transaction_data['client_policy_id'])->set($data)->update(); @@ -1347,15 +1351,16 @@ class PolicyTransactionController extends BaseController } private function handleCompletedStatus($data, $policy_tran_id) - { + { if ($data['client_type'] == 1 && $data['status'] == 'completed' && $data['is_cd_reduce_from_bds'] == 1) { $tolamt = (int) $data['total'][0] ?? 0; $description = 'The following amount of Rs. ' . round($tolamt, 2) . '/- has been' . ($data['action_type'] == 'deletion' ? ' Credit ' : ' Debit ') . 'from the policy transaction (BDS)'; + $cd_tranction_data = [ - 'amount' => $tolamt, + 'amount' => abs($tolamt), 'sub_type_id' => $data['action_type'] == 'deletion' ? 3 : 4, 'client_id' => $data['client_id'], 'client_policy_id' => $data['client_policy_id'], @@ -1370,7 +1375,13 @@ class PolicyTransactionController extends BaseController 'cd_ac_pk' => $data['cd_ac_pk'] ?? null, ]; - DepositHelper::saveDeposit($cd_tranction_data, get_session_userid()); + $result = DepositHelper::saveDeposit($cd_tranction_data, get_session_userid()); + + if(isset($result['success']) && $result['success']){ + $update_data['ct_tran_id'] = $result['insert_id']; + $this->policyTransactionModel->where('id', $policy_tran_id)->set($update_data)->update(); + } + } } From 5bcab5b7a5d6efe699b9ba79d03b77ec22ea59f4 Mon Sep 17 00:00:00 2001 From: venba-Inspriron-3558 Date: Wed, 15 Oct 2025 14:14:20 +0530 Subject: [PATCH 019/109] FIX_UI_support_Search_with_icon --- app/Views/leads_form_handler.php | 52 ++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/app/Views/leads_form_handler.php b/app/Views/leads_form_handler.php index cb17bb22..563c5933 100644 --- a/app/Views/leads_form_handler.php +++ b/app/Views/leads_form_handler.php @@ -452,6 +452,58 @@ if (isset($selected_lead_type)) { $('#salse_person_id').trigger('change'); } + // $('#client_name').on('input', generateShortName); + + let shortNameTimer; + + $('#client_name').on('input', function() { + clearTimeout(shortNameTimer); + shortNameTimer = setTimeout(generateShortName, 200); + }); + + function generateShortName() { + let clientInput = $("#client_name"); + let shortInput = $("#client_short_name"); + let newClientName = clientInput.val().trim(); + + console.log(`LN : NEW - ${newClientName}`); + if (newClientName.length == 0) { + shortInput.val(''); + return; + } + + let shortName = newClientName.substring(0, 10).replace(/\s+/g, '').toUpperCase(); + makeUniqueShortName(shortName); + } + + function makeUniqueShortName(baseName) { + let input = $("#client_short_name")[0]; + + checkDuplicateTableFieldValue("clients", "short_name", baseName, function(isDuplicate) { + if (isDuplicate) { + let counter = 1; + function tryNext() { + let padded = String(counter).padStart(3, '0'); // 001, 002, 003 + let newName = baseName + padded; + + checkDuplicateTableFieldValue("clients", "short_name", newName, function(exists) { + if (exists) { + counter++; + tryNext(); + } else { + $("#client_short_name").val(newName); + validateInput(input, "clients", "short_name"); + } + }); + } + tryNext(); + } else { + $("#client_short_name").val(baseName); + validateInput(input, "clients", "short_name"); + } + }); + } + function validateInput(input, table, field){ let client_type = $('#client_type').val(); From aec914c9880f786a8adcbda2e126c20d148dddbc Mon Sep 17 00:00:00 2001 From: "venkatesh.r" Date: Wed, 15 Oct 2025 15:25:14 +0530 Subject: [PATCH 020/109] CHANGE_BDS_CHANGES : RV --- app/Controllers/ClientController.php | 8 +- app/Controllers/DashboardController.php | 15 +- app/Controllers/EmployeeController.php | 51 +- .../PolicyTransactionController.php | 111 +- app/Helpers/DepositHelper.php | 3 +- app/Models/ClientDepositModel.php | 3 +- app/Models/EmployeePolicyModel.php | 4 +- app/Models/PolicyTransactionModel.php | 22 +- app/Views/DashBoard.php | 6 +- .../policy_transaction_endorsement_form.php | 4959 +++++++++-------- .../policy_transaction_endorsement_list.php | 43 +- .../policy_transaction_inception_form.php | 373 +- .../policy_transaction_inception_list.php | 1 + writable/e_card_template/new_ecard.html | 271 + 14 files changed, 3216 insertions(+), 2654 deletions(-) create mode 100644 writable/e_card_template/new_ecard.html diff --git a/app/Controllers/ClientController.php b/app/Controllers/ClientController.php index b3ce68e4..e09c74ec 100755 --- a/app/Controllers/ClientController.php +++ b/app/Controllers/ClientController.php @@ -518,8 +518,8 @@ class ClientController extends AdminController public function updateEmpAndPolicyStatus() { - $return = $this->clientPolicyModel->updateStatus(); + return $return; $this->myLogger->logme('error', 'Client Policy Status Update Count: {data}', ['data' => $return['client']]); $this->myLogger->logme('error', 'Employee Policy Status Update Count: {data}', ['data' => $return['emp']]); } @@ -5066,10 +5066,12 @@ class ClientController extends AdminController ->where('policy_no', $policy_no) ->countAllResults(); + $client_policy_data = $this->clientPolicyModel->where('is_active', 1)->where('policy_status', 1)->where('policy_no', trim($policy_no))->first(); + if ($data > 0) { - return $this->respond(['status' => true, 'message' => 'This policy number is already linked to another client', 'data' => $data, 'code' => 409, 'received_data' => $received_data], 200); + return $this->respond(['status' => true, 'message' => 'This policy number is already linked to another client', 'data' => $data, 'code' => 409, 'received_data' => $received_data, 'client_policy_id' => $client_policy_data['id'] ?? null], 200); } else { - return $this->respond(['status' => false, 'message' => 'No Data Found', 'code' => 404, 'received_data' => $received_data], 200); + return $this->respond(['status' => false, 'message' => 'No Data Found', 'code' => 404, 'received_data' => $received_data, 'client_policy_id' => $client_policy_data['id'] ?? null], 200); } } diff --git a/app/Controllers/DashboardController.php b/app/Controllers/DashboardController.php index 73c2e31a..369f9444 100755 --- a/app/Controllers/DashboardController.php +++ b/app/Controllers/DashboardController.php @@ -225,20 +225,23 @@ class DashboardController extends AdminController $pendingActionsController = new PendingActionsController; $pendingActionsData = $pendingActionsController->getPendingActionsForDashBoard(); - $businessTeamData = $this->policyTransactionModel->getBusinessReportList(); - $financeTeamData = $this->policyTransactionModel->getFinanceReportList(); - $businessTeamStatusData = $this->data_construct_for_bds($businessTeamData); - $financeTeamStatusData = $this->data_construct_for_bds($financeTeamData); + //BDS dashboard data + // $businessTeamData = $this->policyTransactionModel->getBusinessReportList(); + // $financeTeamData = $this->policyTransactionModel->getFinanceReportList(); + // $businessTeamStatusData = $this->data_construct_for_bds($businessTeamData); + // $financeTeamStatusData = $this->data_construct_for_bds($financeTeamData); + $businessTeamData = []; + $financeTeamData = []; + $businessTeamStatusData = []; + $financeTeamStatusData = []; $data['client_branch_emp_list'] = $results; $session = \Config\Services::session(); $session->set('enrollment_data', json_encode($data)); - // echo "
    ";
             $data['pendingActionsData'] = $pendingActionsData;
             $data['businessTeamCount'] = count($businessTeamData) ?? 0;
-            // dd($businessTeamData);
             $data['financeTeamCount'] = count($financeTeamData) ?? 0;
             $data['businessTeamStatusData'] = $businessTeamStatusData;
             $data['financeTeamStatusData'] = $financeTeamStatusData;
diff --git a/app/Controllers/EmployeeController.php b/app/Controllers/EmployeeController.php
index a4666518..3bf6a341 100755
--- a/app/Controllers/EmployeeController.php
+++ b/app/Controllers/EmployeeController.php
@@ -35,7 +35,7 @@ use App\Controllers\JobWorker;
 use App\Controllers\Jobs\SubJob;
 use App\Controllers\EmployeeServiceController;
 use App\Controllers\EmpDataServiceController;
-
+use App\Models\ThzMasterModel;
 use CodeIgniter\API\ResponseTrait;
 
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
@@ -1471,6 +1471,7 @@ class EmployeeController extends AdminController
             $template_data_path = WRITEPATH . 'e_card_template/';
             // $tpa_short_name = strtolower(str_replace(' ', '_', $get_emp_code_and_client_policy_id['short_name'])) . '.html';
             $tpa_short_name = 'common.html';
+            // $tpa_short_name = 'new_ecard.html';
             $final_path = $template_data_path . $tpa_short_name;
         
             $this->myLogger->logme('error', 'Checking if template file exists at: ' . $final_path);
@@ -1523,10 +1524,12 @@ class EmployeeController extends AdminController
                     '{QR_IOS}' => base_url() . 'public/e_card_imgs/ios.png',
                     '{QR_ANDROID_2}' => base_url() . 'public/e_card_imgs/play_store.png',
                     '{QR_IOS_2}' => base_url() . 'public/e_card_imgs/appstore.png',
+                    '{NHANCE_N_LOGO}' => base_url() . 'public/assets/images/Nhance_Favi.png',
                 ];
 
                 $placeholders['{LEVELS}'] = $this->generateAcmAndMForEcard($client_id);
-        
+                $placeholders['{NETWORK_HOSPITAL}'] = $this->generateNetworkHospitalsForEcard($value['network_hospitals']);
+       
                 foreach ($placeholders as $placeholder => $replaceValue) {
                     $htmlContent = str_replace($placeholder, $replaceValue, $htmlContent);
                 }
@@ -1534,13 +1537,23 @@ class EmployeeController extends AdminController
                 $html .= $htmlContent;
             }
 
+            // return $html;
             // DomPdf 
             $options = new Options();
             $options->set('isRemoteEnabled', true);
             $options->set('isHtml5ParserEnabled', true);
 
             $dompdf = new Dompdf($options);
-            $dompdf->loadHtml('' . $html); // remove the margin
+            // $dompdf->loadHtml('' . $html); // remove the margin
+            $dompdf->loadHtml('
+                
+                ' . $html
+            );
+
             $dompdf->setPaper('A4', 'portrait');
             $dompdf->render();
 
@@ -2939,20 +2952,43 @@ class EmployeeController extends AdminController
     
         // Generate the HTML content
         $html = '';
-    
+        
+        $level_index = 1;
         foreach ($levels as $level => $contacts) {
             $displayLevel = $level == 3 ? 1 : 2; // Switch levels for display
-            $html .= '
    Level ' . $displayLevel . '
    ';
+            if($level_index == 1){
+                $html .= 'Level ' . $displayLevel . '
    ';
+            }else{
+                $html .= '
     Level ' . $displayLevel . '
    ';
+            }
             foreach ($contacts as $index => $contact) {
                 $html .= ($index + 1) . '. ' . $contact['first_name'] . ' / ' . $contact['mobile'] . ' / ' . $contact['email'] . '
    ';
             }
+            $level_index++;
         }
     
-        $html .= '


    ';
+        $html .= '
    ';
     
         return $html;
     }
 
+    public function generateNetworkHospitalsForEcard($network_hospitals)
+    {
+        $html = "";
+        if (!empty($network_hospitals)) {
+            $html = '
    
+                        Network Hospital:
+                        ' . $network_hospitals . '
+                    
    ';
+        }
+
+        // For debugging
+        // print_r($html); die;
+
+        return $html;
+    }
+
+
     public function getBatchFileData()
     {
         $file_id = $this->request->getGet('file_id');
@@ -3065,7 +3101,8 @@ class EmployeeController extends AdminController
             } else {
                 $text   = "create";
                 $data['created_by'] = get_session_userid();
-                $this->thzMasterModel->insert($data);
+                $thzMasterModel = new ThzMasterModel();
+                $thzMasterModel->insert($data);
                 $insertID = $this->partnerEndorsementRequestModel->insertID();
                 $result = true;
             }
diff --git a/app/Controllers/PolicyTransactionController.php b/app/Controllers/PolicyTransactionController.php
index 65c7db4f..41499b5a 100644
--- a/app/Controllers/PolicyTransactionController.php
+++ b/app/Controllers/PolicyTransactionController.php
@@ -263,6 +263,7 @@ class PolicyTransactionController extends BaseController
         $data = $this->preparePolicyData();
         $data['cd_ac_pk'] = $this->request->getPost('cd_ac_no');
         $data['issuer'] = 2;
+        $data['status'] = 'completed';
         $this->myLogger->logme('error', 'Policy Trancaction modified form data ( insert data ) : '. json_encode($data));
 
 
@@ -278,7 +279,6 @@ class PolicyTransactionController extends BaseController
         $data = $this->request->getPost();
 
         // print_r($data); die;
-        // var_dump($data); die;
 
         if (empty($data['policy_issue_date'])) {
             $data['policy_issue_date'] = null;
@@ -306,7 +306,6 @@ class PolicyTransactionController extends BaseController
             $data['last_action_date'] = change_date_format($data['last_action_date']);
         }
 
-
         // Separate Insurer and TPA Branch IDs and IDs
         if (isset($data['insurer_id']) && !empty($data['insurer_id'])) {
             list($data['insurer_branch_id'], $data['insurer_id']) = explode('-', $data['insurer_id']);
@@ -375,6 +374,7 @@ class PolicyTransactionController extends BaseController
 
                 $pt_co_share_details = $this->insertOrUpdateCoShareDetails($data, $insert);
 
+                $client_policy_id = null;
                 if ($data['ct_type'] == 2) {
                     $client_policy_insert_data = $this->prepareClientPolicyInsertData($data);
                     $client_policy_id = $this->clientPolicyModel->insert($client_policy_insert_data);
@@ -393,7 +393,6 @@ class PolicyTransactionController extends BaseController
             $clientController = new ClientController();
             $data['client_kyc_primary_table']  =  $clientController->generateKycPrimaryTable($data['client_id']);
             $data['client_kyc_other_table']  =  $clientController->generateKycOthersTable($data['client_id']);
-
             $data['entity_type_id'] =  $client_data['entity_type_id'];
 
             return $this->respondSuccess($insert, "Policy transaction created successfully", $data);
@@ -434,20 +433,20 @@ class PolicyTransactionController extends BaseController
                     }
                 }
 
-                if($old_pt_data['status'] != "completed"){
-                    if ($data['status'] == 'completed' && $data['ct_type'] == 2) {
-                        if ($data['client_type'] == 1 && $data['is_cd_reduce_from_bds'] == 1) {
-                            $this->processCompletedStatus($data, $data['client_policy_id'], $data['insurer_id'], $id);
-                        }
-                    }
-                }
+                // if($old_pt_data['status'] != "completed"){
+                //     if ($data['status'] == 'completed' && $data['ct_type'] == 2) {
+                //         if ($data['client_type'] == 1 && $data['is_cd_reduce_from_bds'] == 1) {
+                //             $this->processCompletedStatus($data, $data['client_policy_id'], $data['insurer_id'], $id);
+                //         }
+                //     }
+                // }
 
                 $data['pt_co_share_details'] = $this->PTCOShareDetailsModel->where('pt_id', $id)->where('is_active', 1)->findAll();
             }
 
             if(isset($data['cd_amt_changed']) && !empty($data['cd_amt_changed'])){
                 $policy_data = $this->policyTransactionModel->where('is_active', 1)->where('id', $id)->first();
-                $this->cdCorrection($policy_data, $data['cd_amt_changed']);
+                $this->cdCorrection($policy_data, $data['cd_amt_changed'], $id);
             }
 
             $client_data = $this->clientModel->where('id', $data['client_id'])->first();
@@ -469,10 +468,6 @@ class PolicyTransactionController extends BaseController
     {
         // Prepare data for insertion and updating
         $coShareDetails = [];
-
-        // print_r($data); die;
-        // die;
-
         if (isset($data['co_share_id']) && !empty($data['co_share_id'])) {
             $this->removePtCoShareRecords($data['co_share_id'], $pt_id);
         }
@@ -566,7 +561,6 @@ class PolicyTransactionController extends BaseController
             }
 
             // print_r($this->PTCOShareDetailsModel->getLastQuery()); die;
-
             // print_r($coShareDetails); 
             // die;
 
@@ -630,7 +624,8 @@ class PolicyTransactionController extends BaseController
             'updated_by' => get_session_userid(),
             'event_name' => 'inception',
             'is_active' => 1,
-            'cd_ac_pk'  => $data['cd_ac_pk']
+            'cd_ac_pk'  => $data['cd_ac_pk'],
+            'pt_id' => $policyTranId ?? null,
         ];
 
         $result = DepositHelper::saveDeposit($cdTransactionData, get_session_userid());
@@ -641,7 +636,7 @@ class PolicyTransactionController extends BaseController
         }
     }
 
-    private function cdCorrection($data, $amt)
+    private function cdCorrection($data, $amt, $policyTranId)
     {
         $totalAmount = (int)($amt ?? 0);
         $description = 'The following amount of Rs. ' . $totalAmount . '/- has been debited towards the difference arising from the change in the BDS base premium.';
@@ -659,7 +654,8 @@ class PolicyTransactionController extends BaseController
             'updated_by' => get_session_userid(),
             'event_name' => 'inception',
             'is_active' => 1,
-            'cd_ac_pk'  => $data['cd_ac_pk']
+            'cd_ac_pk'  => $data['cd_ac_pk'],
+            'pt_id' => $policyTranId ?? null,
         ];
 
         DepositHelper::saveDeposit($cdTransactionData, get_session_userid());
@@ -1039,13 +1035,22 @@ class PolicyTransactionController extends BaseController
             $data['is_active']  = 0;
             $policy_transaction_data = $this->policyTransactionModel->where('id', $id)->first();
             if($policy_transaction_data['policy_type_id'] > 7 && $type == 0){
+
                 $this->policyTransactionModel->where('id', $id)->set($data)->update();
                 $this->PTCOShareDetailsModel->where('pt_id', $id)->set($data)->update();
                 $this->clientPolicyModel->where('id', $policy_transaction_data['client_policy_id'])->set($data)->update();
                 $this->policyTransactionModel->where('client_policy_id', $policy_transaction_data['client_policy_id'])->set($data)->update();
+
+                $cd_transaction_model = new ClientDepositModel();
+                $this->$cd_transaction_model->where('policy_transaction_id', $id)->set($data)->update();
+
             }else{
                 $this->policyTransactionModel->where('id', $id)->set($data)->update();
                 $this->PTCOShareDetailsModel->where('pt_id', $id)->set($data)->update();
+                
+                $cd_transaction_model = new ClientDepositModel();
+                $this->$cd_transaction_model->where('policy_transaction_id', $id)->set($data)->update();
+
             }
             return $this->respond(['status' => true, 'code' => 200, 'message' => 'Policy Transaction removed successfully'], 200);
         } else {
@@ -1173,6 +1178,7 @@ class PolicyTransactionController extends BaseController
     {
         $id = $this->request->getPost('id');
         $data = $this->preparePolicyTransactionData();
+        $data['status'] = 'completed';
         // print_r($data); die;
 
         if (!$id) {
@@ -1340,9 +1346,9 @@ class PolicyTransactionController extends BaseController
         if ($update) {
 
             $this->insertTransactionStatus($id, $data, 1);
-            if($old_endorse_data['status'] != "completed"){
-                $this->handleCompletedStatus($data, $id);
-            }
+            // if($old_endorse_data['status'] != "completed"){
+            //     $this->handleCompletedStatus($data, $id);
+            // }
             $this->insertOrUpdateCoShareDetails($data, $id);
 
 
@@ -1358,30 +1364,33 @@ class PolicyTransactionController extends BaseController
 
             $tolamt = (int) $data['total'][0] ?? 0;
 
-            $description = 'The following amount of Rs. ' . round($tolamt, 2) . '/- has been' .
-                ($data['action_type'] == 'deletion' ? ' Credit ' : ' Debit ') . 'from the policy transaction (BDS)';
-            
-            $cd_tranction_data = [
-                'amount' => abs($tolamt),
-                'sub_type_id' => $data['action_type'] == 'deletion' ? 3 : 4,
-                'client_id' => $data['client_id'],
-                'client_policy_id' => $data['client_policy_id'],
-                'endorsement_no' => null,
-                'cd_ac_no' => $data['cd_ac_no'] ?? null,
-                'insurer_id' => $data['insurer_id'],
-                'description' => $description,
-                'transaction_type' => $data['action_type'] == 'deletion' ? 'Credit' : 'Debit',
-                'updated_by' => get_session_userid(),
-                'event_name' => $data['action_type'],
-                'is_active' => 1,
-                'cd_ac_pk' => $data['cd_ac_pk'] ?? null,
-            ];
+            if(!empty($tolamt)){
+                $description = 'The following amount of Rs. ' . round($tolamt, 2) . '/- has been' .
+                    ($data['action_type'] == 'deletion' ? ' Credit ' : ' Debit ') . 'from the policy transaction (BDS)';
+                
+                $cd_tranction_data = [
+                    'amount' => abs($tolamt),
+                    'sub_type_id' => $data['action_type'] == 'deletion' ? 3 : 4,
+                    'client_id' => $data['client_id'],
+                    'client_policy_id' => $data['client_policy_id'],
+                    'endorsement_no' => null,
+                    'cd_ac_no' => $data['cd_ac_no'] ?? null,
+                    'insurer_id' => $data['insurer_id'],
+                    'description' => $description,
+                    'transaction_type' => $data['action_type'] == 'deletion' ? 'Credit' : 'Debit',
+                    'updated_by' => get_session_userid(),
+                    'event_name' => $data['action_type'],
+                    'is_active' => 1,
+                    'cd_ac_pk' => $data['cd_ac_pk'] ?? null,
+                    'pt_id' => $policy_tran_id ?? null,
+                ];
 
-            $result = DepositHelper::saveDeposit($cd_tranction_data, get_session_userid());
+                $result = DepositHelper::saveDeposit($cd_tranction_data, get_session_userid());
 
-            if(isset($result['success']) && $result['success']){
-                $update_data['ct_tran_id'] = $result['insert_id'];
-                $this->policyTransactionModel->where('id', $policy_tran_id)->set($update_data)->update();
+                if(isset($result['success']) && $result['success']){
+                    $update_data['ct_tran_id'] = $result['insert_id'];
+                    $this->policyTransactionModel->where('id', $policy_tran_id)->set($update_data)->update();
+                }
             }
 
         }
@@ -1411,13 +1420,13 @@ class PolicyTransactionController extends BaseController
             ->orderBy('id', 'asc')
             ->first();
 
-        $pt_id = null;    
+        $pt_id = null;   
+
         if(!empty($data)){
             $inception_data = $this->policyTransactionModel->where('policy_no', $data['policy_no'])->where('client_id', $data['client_id'])->first();
             $pt_id = $inception_data['id'];
         }    
 
-
         if (!empty($data['policy_start_date'])) {
             $data['policy_start_date'] =  change_date_format($data['policy_start_date'], 'Y-m-d', 'd/m/Y');
         }
@@ -1578,6 +1587,16 @@ class PolicyTransactionController extends BaseController
 
         // print_r($data['endorse_eff_date']); die;
 
+        $pt_bp_amt = $this->PTCOShareDetailsModel
+            ->select('bp_amt, amount')
+            ->where('pt_id', $id)
+            ->where('co_share_type', 1)
+            ->where('is_active', 1)
+            ->first();
+
+        // dd(db_connect()->getLastQuery() ,$pt_bp_amt);
+        $data['base_cd_amount'] = $pt_bp_amt['amount'] ?? null;
+
         if ($data) {
             return $this->respond(['status' => true, 'data' => $data, 'pt_id' => $pt_id], 200);
         } else {
diff --git a/app/Helpers/DepositHelper.php b/app/Helpers/DepositHelper.php
index 9549f8a1..495797f3 100755
--- a/app/Helpers/DepositHelper.php
+++ b/app/Helpers/DepositHelper.php
@@ -66,7 +66,8 @@ class DepositHelper
             'updated_by' => $data['updated_by'],
             'balance' => $newBalance, // Include the new balance in the data array
             'cd_ac_pk'=> isset($data['cd_ac_pk'])?$data['cd_ac_pk']:null,
-            'record_date' => $data['record_date'] ?? null
+            'record_date' => $data['record_date'] ?? null,
+            'policy_transaction_id' => $data['pt_id'] ?? null
         ];
 
         // Insert data and get the insert ID
diff --git a/app/Models/ClientDepositModel.php b/app/Models/ClientDepositModel.php
index 9d45f38f..8a61b204 100755
--- a/app/Models/ClientDepositModel.php
+++ b/app/Models/ClientDepositModel.php
@@ -28,7 +28,8 @@ class ClientDepositModel extends Model
         "event_name",
         "unit",
         "cd_ac_pk",
-        "record_date"
+        "record_date",
+        "policy_transaction_id",
     ];
 
    
diff --git a/app/Models/EmployeePolicyModel.php b/app/Models/EmployeePolicyModel.php
index 041ac791..bea76e50 100755
--- a/app/Models/EmployeePolicyModel.php
+++ b/app/Models/EmployeePolicyModel.php
@@ -1471,7 +1471,7 @@ class EmployeePolicyModel extends Model
 
                     ep.tpa_id, 
                     ep.uhid,
-                    ep.policy_end_date,
+                    cp.policy_end_date,
                     ep.basic_cover_si,
 
                     clients.client_name, 
@@ -1537,7 +1537,7 @@ class EmployeePolicyModel extends Model
 
                     ep.tpa_id, 
                     ep.uhid,
-                    ep.policy_end_date,
+                    cp.policy_end_date,
                     ep.basic_cover_si,
 
                     clients.client_name, 
diff --git a/app/Models/PolicyTransactionModel.php b/app/Models/PolicyTransactionModel.php
index 6ea94e65..2e935ead 100644
--- a/app/Models/PolicyTransactionModel.php
+++ b/app/Models/PolicyTransactionModel.php
@@ -305,7 +305,7 @@ class PolicyTransactionModel extends Model
 
         if ($client_id == 0 && $insurer_id == 0 && $policy_type_id == 0 && $date_type == 0 && $issuer == 0) {
 
-            $fromDate = date('Y-m-d', strtotime('-30 days'));
+            $fromDate = date('Y-m-d', strtotime('-90 days'));
             $toDate = date('Y-m-d 23:59:59');
 
             $builder->where('policy_transaction.created_at >=', $fromDate)
@@ -881,7 +881,7 @@ class PolicyTransactionModel extends Model
 
         if ($client_id == 0 && $insurer_id == 0 && $policy_type_id == 0 && $date_type == 0 && $issuer == 0) {
 
-            $fromDate = date('Y-m-d', strtotime('-60 days'));
+            $fromDate = date('Y-m-d', strtotime('-90 days'));
             $toDate = date('Y-m-d 23:59:59');
 
             if (empty($where)) {
@@ -1060,7 +1060,7 @@ class PolicyTransactionModel extends Model
 
         // Default to Last 30 Days if No Filters Are Applied
         if (empty($client_id) && empty($insurer_id) && empty($policy_type_id) && empty($date_type) && empty($issuer) && empty($where)) {
-            $fromDate = date('Y-m-d', strtotime('-60 days'));
+            $fromDate = date('Y-m-d', strtotime('-90 days'));
             $toDate = date('Y-m-d 23:59:59');
 
             $builder->where('policy_transaction.created_at >=', $fromDate)
@@ -1108,7 +1108,7 @@ class PolicyTransactionModel extends Model
             ->join('client_branch', 'policy_transaction.client_branch_id = client_branch.id', 'left')
             ->join('insurers', 'pt_co_share_details.insurer_id = insurers.id', 'left')
             ->join('client_policy', 'policy_transaction.client_policy_id = client_policy.id', 'left')
-            ->join('policy_type', 'client_policy.policy_type_id = policy_type.id', 'left')
+            ->join('policy_type', 'policy_transaction.policy_type_id = policy_type.id', 'left')
             ->where('policy_transaction.is_active', 1)
             ->where('policy_transaction.action_type !=', 'inception');
 
@@ -1163,7 +1163,7 @@ class PolicyTransactionModel extends Model
 
         if ($client_id == 0 && $insurer_id == 0 && $policy_type_id == 0 && $date_type == 0 && $issuer == 0) {
 
-            $fromDate = date('Y-m-d', strtotime('-60 days'));
+            $fromDate = date('Y-m-d', strtotime('-90 days'));
             $toDate = date('Y-m-d 23:59:59');
 
             $builder->where('policy_transaction.created_at >=', $fromDate)
@@ -1313,7 +1313,7 @@ class PolicyTransactionModel extends Model
                 ->where('policy_transaction.' . $date_type . '<=', $endDate);
         } else {
 
-            $fromDate = date('Y-m-d', strtotime('-30 days'));
+            $fromDate = date('Y-m-d', strtotime('-90 days'));
             $toDate = date('Y-m-d 23:59:59');
 
             $builder->where('policy_transaction.created_at >=', $fromDate)
@@ -1416,7 +1416,7 @@ class PolicyTransactionModel extends Model
                 ->where('policy_transaction.' . $date_type . '<=', $endDate);
         } else {
 
-            $fromDate = date('Y-m-d', strtotime('-30 days'));
+            $fromDate = date('Y-m-d', strtotime('-90 days'));
             $toDate = date('Y-m-d 23:59:59');
 
             $builder->where('policy_transaction.created_at >=', $fromDate)
@@ -1457,7 +1457,7 @@ class PolicyTransactionModel extends Model
 
     public function getFinanceReportList($start_date = 0, $end_date = 0, $client_id = 0, $insurer_id = 0, $policy_type_id = 0, $date_type = 0, $issuer = 0, $status = 0)
     {
-        $dateThreshold = date('Y-m-d H:i:s', strtotime("- 3 days"));
+        $dateThreshold = date('Y-m-d H:i:s', strtotime("-90 days"));
 
         $builder = $this->db->table('policy_transaction')
             ->select("
@@ -1519,7 +1519,7 @@ class PolicyTransactionModel extends Model
                 ->where('policy_transaction.' . $date_type . '<=', $endDate);
         } else {
 
-            $fromDate = date('Y-m-d', strtotime('-30 days'));
+            $fromDate = date('Y-m-d', strtotime('-90 days'));
             $toDate = date('Y-m-d 23:59:59');
 
             $builder->where('policy_transaction.created_at >=', $fromDate)
@@ -1624,7 +1624,7 @@ class PolicyTransactionModel extends Model
             $builder->where('policy_transaction.' . $date_type . '>=', $startDate)
                 ->where('policy_transaction.' . $date_type . '<=', $endDate);
         } else {
-            $fromDate = date('Y-m-d', strtotime('-30 days'));
+            $fromDate = date('Y-m-d', strtotime('-90 days'));
             $toDate = date('Y-m-d 23:59:59');
 
             $builder->where('policy_transaction.created_at >=', $fromDate)
@@ -1712,7 +1712,7 @@ class PolicyTransactionModel extends Model
     //function for fetch renewal report data
     public function getRenewalReportData($start_date = null, $end_date = null, $client_type = null, $client = null, $issuer = null)
     {
-        $fromDate = date('Y-m-d', strtotime('-60 days'));
+        $fromDate = date('Y-m-d', strtotime('-90 days'));
         $toDate = date('Y-m-d 23:59:59');
 
         if (!empty($start_date) && !empty($end_date)) {
diff --git a/app/Views/DashBoard.php b/app/Views/DashBoard.php
index ba72d495..e71d67ff 100755
--- a/app/Views/DashBoard.php
+++ b/app/Views/DashBoard.php
@@ -208,7 +208,7 @@
 
                     
 
-                         
  • 
+                         
 
                     
                     
@@ -262,7 +262,7 @@
                     
 
                     
-                        
+                        
                     
                     
                         
diff --git a/app/Views/policy_transaction_endorsement_form.php b/app/Views/policy_transaction_endorsement_form.php
index 44482aab..9701ac2c 100644
--- a/app/Views/policy_transaction_endorsement_form.php
+++ b/app/Views/policy_transaction_endorsement_form.php
@@ -1,119 +1,118 @@
 
 
 
    • 
                     
 
-                    
-                    
-                        
  • 
-                            
-                                /assets/images/leads_sb.png" alt="Logo" height="20">
-                                 Leads 
-                            
-                        
    • 
-                    
-                    
-                    
-                        
  • 
-                            
-                                /assets/images/ticket.png" alt="Logo" height="20">
-                                Tickets
-                            
-                        
    • 
-                    
                     
                     
                         
  • 
@@ -2034,6 +2016,26 @@
                         
    • 
                     
 
+                    
+                    
+                        
  • 
+                            
+                                /assets/images/leads_sb.png" alt="Logo" height="20">
+                                 Leads 
+                            
+                        
    • 
+                    
+                    
+                    
+                        
  • 
+                            
+                                /assets/images/ticket.png" alt="Logo" height="20">
+                                Tickets
+                            
+                        
    • 
+                    
+
                     
                     
                         
  • 
diff --git a/app/Views/mail_template.php b/app/Views/mail_template.php
index 22582cf5..f2b322bd 100644
--- a/app/Views/mail_template.php
+++ b/app/Views/mail_template.php
@@ -32,6 +32,10 @@
   width: 100%;   /* default: allow full width */
 }
 
+p{
+  margin:0 !important;
+}
+
 /* On screens smaller than 600px → force 100% */
 @media screen and (max-width: 600px) {
   .mail-template-footer {
@@ -53,9 +57,16 @@
     
    
       
    
         
-          Client Logo
+        
    
+        
    
+
             		
         
            tags and their contents
-                                    data = data.replace(/]*>(.*?)<\/a>/gi, '');
-                                    // Also remove other HTML tags and  
-                                    data = $('
    ').html(data).text().replace(/\u00a0/g, ' ').trim();
+                                // If it's the first, 20th, 10th, or 11th column, clean the data
+                                if (column === 0 || column === 20 || column === 10 || column === 11) {
+                                    // Remove all  tags and their contents first
+                                    data = data.replace(/]*>.*?<\/a>/gi, '');
+
+                                    // Convert any HTML entities / remaining tags to plain text
+                                    // (jQuery used only for HTML decoding; you can replace with DOMParser if you prefer)
+                                    data = $('
    ').html(data).text();
+
+                                    // Normalize NBSP to space
+                                    data = data.replace(/\u00A0/g, ' ');
+
+                                    // Remove BOM, zero-width, and control characters
+                                    data = data.replace(/[\u0000-\u001F\u007F-\u009F\u200B-\u200F\uFEFF]/g, '').trim();
                                 }
 
-                                // Force K and L columns to string
+                                // Do NOT prepend \u200C. Return raw cleaned value.
+                                // If you need to force Excel as string, use the formula trick or prepend a single apostrophe.
                                 if (column === 10 || column === 11) {
-                                    // Option 1: prepend single quote
-                                    return '\u200C' + data;
-
-                                    // Option 2: use Excel formula trick
+                                    // Option A: return as Excel formula to preserve formatting
                                     // return '="' + data + '"';
+
+                                    // Option B: prepend apostrophe (visible in Excel formula bar, not in cell)
+                                    // return "'" + data;
+
+                                    return data;
                                 }
+
                                 return data;
+
                             }
                         }
                     },                   

From 711eea853be8c7679ab2187f354983907ca187fa Mon Sep 17 00:00:00 2001
From: vadivelJ96 
Date: Tue, 4 Nov 2025 11:45:01 +0530
Subject: [PATCH 095/109] CHANGE_help_desk_tickets  - VADIVEL J 2025-11-01
 11:44

---
 app/Views/layout/header.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php
index a1ab5d11..ffaba0a3 100755
--- a/app/Views/layout/header.php
+++ b/app/Views/layout/header.php
@@ -355,7 +355,7 @@
 
         .content-page {
             padding: 80px 15px 65px 15px !important;
-            height: 100vh;
+            min-height: 1000px ;
         }
 
         /* Media query for small screens */

From af9e68bf217742e3325d5aacdea7ff86872bcf9d Mon Sep 17 00:00:00 2001
From: vadivelJ96 
Date: Tue, 4 Nov 2025 12:32:34 +0530
Subject: [PATCH 096/109] CHANGE_help_desk_tickets  - VADIVEL J 2025-11-04
 12:32

---
 app/Views/mail_template.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Views/mail_template.php b/app/Views/mail_template.php
index f2b322bd..a314977d 100644
--- a/app/Views/mail_template.php
+++ b/app/Views/mail_template.php
@@ -58,8 +58,8 @@ p{
       
    
         
         
    
         
    		
         
    
         
    
 

From c44a3f05afc1db4d031c5bac5dc50e82cc367a4f Mon Sep 17 00:00:00 2001
From: vadivelJ96 
Date: Tue, 4 Nov 2025 12:47:34 +0530
Subject: [PATCH 098/109] CHANGE_help_desk_tickets  - VADIVEL J 2025-11-04
 12:47

---
 app/Views/mail_template.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Views/mail_template.php b/app/Views/mail_template.php
index c51ac87b..f111bd54 100644
--- a/app/Views/mail_template.php
+++ b/app/Views/mail_template.php
@@ -56,7 +56,7 @@ p{
   
    
     
-        
+                                    
diff --git a/app/Views/bds_report_Insurer_wise_Data.php b/app/Views/bds_report_Insurer_wise_Data.php
index cbc717a2..835f48d6 100644
--- a/app/Views/bds_report_Insurer_wise_Data.php
+++ b/app/Views/bds_report_Insurer_wise_Data.php
@@ -19,6 +19,10 @@ table.dataTable tbody td {
 .right-align-input {
     text-align: right;
 }
+
+#scroll-horizontal-datatable tfoot .right-align-input {
+    text-align: right !important;
+}
 
    
@@ -84,6 +88,7 @@ table.dataTable tbody td {
                                         text: '  CSV ',
                                         className: 'app-btn-primary ',
                                         title: 'Insurer-Wise-Report-List',
+                                        footer: true
                                     },
                                     {
                                         extend: 'excel',
@@ -93,6 +98,7 @@ table.dataTable tbody td {
                                             orthogonal: 'sort'
                                         },
                                         className: 'app-btn-primary ',
+                                        footer: true
                                     }
                         ]
                     }
diff --git a/app/Views/bds_report_bap_wise_data.php b/app/Views/bds_report_bap_wise_data.php
index 12c6e8a2..3b2175db 100644
--- a/app/Views/bds_report_bap_wise_data.php
+++ b/app/Views/bds_report_bap_wise_data.php
@@ -19,6 +19,12 @@ table.dataTable tbody td {
 .right-align-input {
     text-align: right;
 }
+
+#scroll-horizontal-datatable tfoot .right-align-input {
+    text-align: right !important;
+}
+
+
 
 
 
    
@@ -84,6 +90,7 @@ table.dataTable tbody td {
                                         text: '  CSV ',
                                         className: 'app-btn-primary ',
                                         title: 'Bap-Wise-Report-List',
+                                        footer: true
                                     },
                                     {
                                         extend: 'excel',
@@ -93,6 +100,7 @@ table.dataTable tbody td {
                                         },
                                         className: 'app-btn-primary ',
                                         title: 'Bap-Wise-Report-List',
+                                        footer: true
                                     }
                         ]
                     }
diff --git a/app/Views/irba_report.php b/app/Views/irba_report.php
index 56f41f07..ee134535 100644
--- a/app/Views/irba_report.php
+++ b/app/Views/irba_report.php
@@ -64,6 +64,7 @@
         
    
 
     
    
+    
    
 
@@ -131,19 +132,26 @@
         var toDate = $('#endDate').val();
         var category = $('#category').val();
         var report_type = $('#report_type').val();
+
+        if(category == false || report_type == false){
+            alert("Please Fill the Mandatory Fields Category and Report Type to Proceed ..!! ");
+            return ;
+        }
+
         var requestData = {
             fromDate: fromDate,
             toDate: toDate,
             category: category,
             report_type: report_type
         };
-        console.log(typeof fromDate);
+        
         var url = '';
         $('.loader').fadeIn();
         $('.loader-mask').fadeIn();
         sendAjaxRequestForGlobal(url, 'POST', requestData, function(response) {
             if (response.status == true) {
                 $('#report').html(response.html);
+               // $('#view_name').html(response.view_name);
                 $('.loader').fadeOut();
                 $('.loader-mask').delay(350).fadeOut('slow');
 
diff --git a/app/Views/irda_bap_client_report_list.php b/app/Views/irda_bap_client_report_list.php
index 20d18f17..3e9dc0fe 100644
--- a/app/Views/irda_bap_client_report_list.php
+++ b/app/Views/irda_bap_client_report_list.php
@@ -31,6 +31,10 @@ table.dataTable tbody td {
     background-color: #ffffff; /* White shade */
 }
 
+#scroll-horizontal-datatable tfoot .right-align-input {
+    text-align: right !important;
+}
+
 
    
@@ -216,6 +220,7 @@ $(document).ready(function() {
                                         text: '  CSV ',
                                         className: 'app-btn-primary ',
                                         title: 'IRDA-BAP-CLIENT-List',
+                                        footer:true
                                     },
                                     {
                                         extend: 'excel',
@@ -225,6 +230,7 @@ $(document).ready(function() {
                                             orthogonal: 'sort'
                                         },
                                         className: 'app-btn-primary ',
+                                        footer:true
                                     }
                         ]
                     }
diff --git a/app/Views/irda_bap_insurer_report_list.php b/app/Views/irda_bap_insurer_report_list.php
index 6d213238..0ed8d492 100644
--- a/app/Views/irda_bap_insurer_report_list.php
+++ b/app/Views/irda_bap_insurer_report_list.php
@@ -20,6 +20,10 @@ table.dataTable tbody td {
 .right-align-input {
     text-align: right;
 }
+
+#scroll-horizontal-datatable tfoot .right-align-input {
+    text-align: right !important;
+}
 
 
 
    
@@ -167,7 +171,7 @@ table.dataTable tbody td {
                         
                     
    
 
-                    
+                    
@@ -299,12 +303,14 @@ $(document).ready(function() {
                         buttons: [
                                     {
                                         extend: 'csv',
+                                        footer:true,
                                         text: '  CSV ',
                                         className: 'app-btn-primary ',
                                          title: 'IRDA-BAP-INSURER-List',
                                     },
                                     {
                                         extend: 'excel',
+                                        footer:true,
                                         text: '  EXCEL ',
                                         className: 'app-btn-primary ',
                                          title: 'IRDA-BAP-INSURER-List',
diff --git a/app/Views/notification.php b/app/Views/notification.php
index eb7c0336..99be6c3d 100755
--- a/app/Views/notification.php
+++ b/app/Views/notification.php
@@ -1523,6 +1523,8 @@
                 submitButton.innerText = 'Submit';
             }
         });
+  
+  
     }
 
     function removeAttachment(id) {
diff --git a/app/Views/outstanding_report_list.php b/app/Views/outstanding_report_list.php
index 0242fbf4..0dc70504 100644
--- a/app/Views/outstanding_report_list.php
+++ b/app/Views/outstanding_report_list.php
@@ -40,24 +40,10 @@
                             
    
                                 
    
 
-                                    
-
                                     
    
-                                        
-                                        
                                             
                                             
                                                 
@@ -68,65 +54,13 @@
                                     
    
 
                                     
    
-                                        
-                                        
                                             
-                                            
-                                                
-                                                    
-                                                
-                                            
                                         
                                     
    
 
-                                    
-
-                                    
-
-                                    
-
-                                    
-
                                     
    
                                         
                                         
    
@@ -294,6 +228,7 @@
         getURLParams()
         $('#client_id').select2();
         $('#insurer_id').select2();
+        $('#insurer_branch_id').select2();
         $('#policy_type_id').select2();
     })
 
@@ -304,10 +239,17 @@
         var end_date = $('#endDate').val();
         var client_id = $('#client_id').val();
         var insurer_id = $('#insurer_id').val();
+        var insurer_branch_id = $('#insurer_branch_id').val();
         var policy_type_id = $('#policy_type_id').val();
         var date_type = $('#date_type').val();
         var issuer = $('#issuer').val();
 
+        if(insurer_id == false || insurer_branch_id == false){
+            alert("Please Choose Insurer and its branch to Proceed .. !!");
+            return;
+        }
+
+
         console.log(start_date + '-' + end_date);
 
         var queryParams = {
@@ -315,6 +257,7 @@
             end_date: end_date,
             client_id: client_id,
             insurer_id: insurer_id,
+            insurer_branch_id : insurer_branch_id,
             policy_type_id: policy_type_id,
             date_type: date_type,
             issuer: issuer,
@@ -338,6 +281,7 @@
         const endDate = params.get('end_date') || 0; // Default to 0 if not found
         const client_id = params.get('client_id') || 0; // Default to 0 if not found
         const insurer_id = params.get('insurer_id') || 0; // Default to 0 if not found
+        const insurer_branch_id = params.get('insurer_branch_id') || 0 ; // Default to 0 if not found
         const policy_type_id = params.get('policy_type_id') || 0; // Default to 0 if not found
         const date_type = params.get('date_type') || 0; // Default to 0 if not found
         const issuer = params.get('issuer') || 0; // Default to 0 if not found
@@ -348,6 +292,7 @@
         console.log('endDate', endDate)
         console.log('client_id', client_id)
         console.log('insurer_id', insurer_id)
+        console.log('insurer_branch_id',insurer_branch_id)
         console.log('policy_type_id', policy_type_id)
         console.log('date_type', date_type)
         console.log('issuer', issuer)
@@ -361,7 +306,8 @@
                 $('#start_date').val(startDate)
                 $('#end_date').val(endDate)
                 $('#client_id').val(client_id).change()
-                $('#insurer_id').val(insurer_id).change()
+                $('#insurer_id').val(insurer_id)
+                $('#insurer_branch_id').val(insurer_branch_id).change()
                 $('#policy_type_id').val(policy_type_id).change()
                 $('#date_type').val(date_type)
                 $('#issuer').val(issuer)
@@ -415,6 +361,7 @@
             // Reset all select dropdowns to the first option
             $('#client_id').val('0').change();
             $('#insurer_id').val('0').change();
+            $('#insurer_branch_id').val('0').change();
             $('#policy_type_id').val('0').change();
             $('#date_type').val('0');
             $('#issuer').val('0');
@@ -457,4 +404,68 @@
         console.log(apiURL);
         window.location.href = apiURL;
     }
+
+    function getInsurerBranch(){
+
+        let insurer_id = $('#insurer_id').val();
+
+        if(insurer_id == 0){
+            return;
+        }
+
+        $('.loader').fadeIn();
+        $('.loader-mask').fadeIn('slow');
+
+        $.ajax({
+            url: '', 
+            type: 'POST',
+            data: {insurer_id},
+            success: function(response) {
+
+                console.log(response)
+                $('.loader').fadeOut();
+                $('.loader-mask').delay(350).fadeOut('slow');
+
+                if (response.data && response.data != []) {
+                    
+                    let options ="";
+                    let insurer_branch_list = response.data;
+
+                    insurer_branch_list.forEach(element => {
+                       options += ``;
+                    });
+
+                    $('#insurer_branch_id').html('' + options);
+
+                } 
+            },
+            error: function(xhr, status, error) {
+                $('.loader').fadeOut();
+                $('.loader-mask').delay(350).fadeOut('slow');
+                // Handle error
+                console.error('Upload error occurred:');
+                console.error('Status: ', status); // Status of the request
+                console.error('Error: ', error); // Specific error message
+                console.error('XHR Object: ', xhr); // Full XHR object with response details
+
+                // Optionally log server response, if available
+                if (xhr.responseText) {
+                    console.error('Response Text: ', xhr.responseText);
+                }
+
+                toastr.warning('Error uploading file', 'WARNING');
+                console.error('Upload error:', error);
+            },
+            complete: function() {
+                $('.loader').fadeOut();
+                $('.loader-mask').delay(350).fadeOut('slow');
+                console.log("Ajax call completed successfully");
+            }
+        });
+  
+
+
+    }
+
+
 
\ No newline at end of file
diff --git a/app/Views/variance_report_list.php b/app/Views/variance_report_list.php
index 476a0439..48de74e7 100644
--- a/app/Views/variance_report_list.php
+++ b/app/Views/variance_report_list.php
@@ -231,12 +231,12 @@
                     buttons: [{
                             extend: 'csv',
                             text: '  CSV ',
-                            title: 'Policy-Tranction-BDS-List',
+                            title: 'Variance-Report-List',
                         },
                         {
                             extend: 'excel',
                             text: '  EXCEL ',
-                            title: 'Policy-Tranction-BDS-List',
+                             title: 'Variance-Report-List',
                             customize: function(xlsx) {
                                 var sheet = xlsx.xl.worksheets['sheet1.xml'];
                                 var total = 0;

From 2455e1bf9cdcd6154b26767325e5c4a2fda64fc5 Mon Sep 17 00:00:00 2001
From: vadivelJ96 
Date: Tue, 4 Nov 2025 18:30:40 +0530
Subject: [PATCH 100/109] CHANGE_help_desk_tickets  - VADIVEL J 2025-11-04
 18:30

---
 app/Views/report_bds_new.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Views/report_bds_new.php b/app/Views/report_bds_new.php
index 474f92f1..92bca589 100644
--- a/app/Views/report_bds_new.php
+++ b/app/Views/report_bds_new.php
@@ -208,7 +208,7 @@
                                                 echo base_url('policy_tranction/endorsement/list') . '?pt_id=' . $row['id'] ;
                                             }
                                     ?>" class="mdi mdi-pencil" > 
-                                
    
+                                

From 8f71e5a7e2637e59a65afbdc78c4d249491d6ad5 Mon Sep 17 00:00:00 2001
From: "venkatesh.r" 
Date: Tue, 4 Nov 2025 18:42:48 +0530
Subject: [PATCH 101/109] 
 FIX_PRE_POLICY_COUNT_GET_FUNCTION_ISSUE_AND_GET_EMPLOYEE_POLICY_ONLY_ACTIVE_STATUS

---
 app/Controllers/EmployeeRestController.php    | 53 ++++++++++++++-----
 app/Controllers/EmployeeServiceController.php |  6 +--
 app/Models/EmployeePolicyModel.php            |  1 +
 3 files changed, 43 insertions(+), 17 deletions(-)

diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php
index 3e44328e..91086329 100755
--- a/app/Controllers/EmployeeRestController.php
+++ b/app/Controllers/EmployeeRestController.php
@@ -2831,7 +2831,7 @@ class EmployeeRestController extends AdminController
                                                     ->where('client_policy.client_branch_id', $this->request->getGet('client_branch_id') )
                                                     ->where('client_policy.is_active', 1 )
                                                     ->where('client_policy.policy_status', $policy_status)
-                                                    ->where('client_policy.enrolment_visibility', 1 )
+                                                    ->where('client_policy.enrolment_visibility', 1)
                                                     ->orderby('client_policy.id' , 'ASC')
                                                     ->findAll();
 
@@ -2840,16 +2840,25 @@ class EmployeeRestController extends AdminController
                                             ->where('client_id',$this->request->getGet('client_id'))
                                             ->where('client_branch_id',$this->request->getGet('client_branch_id'))
                                             ->where('is_active', 1 )->findAll();
-        $employeeName = $this->employeeModel->where('emp_code',$this->request->getGet('emp_code'))
+                                            
+        $employeeSelfData = $this->employeeModel->where('emp_code',$this->request->getGet('emp_code'))
                                             ->where('client_id',$this->request->getGet('client_id'))
                                             ->where('client_branch_id',$this->request->getGet('client_branch_id'))
                                             ->where('family_floater_key','self')->where('is_active', 1 )
-                                            ->get()->getRow()->name;
+                                            ->get()->getRow();
 
+        $employeeName =  $employeeSelfData->name ?? "";
+
+       
         //for get the pre enrollment policy count
         $empMobileNo = $this->request->getGet('mobile_no');
         $clientId = $this->request->getGet('client_id');
-        $prePolicyCount = $this->getPreEmployeePolicyCount($empMobileNo, $clientId);
+
+        if(!empty($employeeSelfData) && isset($employeeSelfData->email_corporate)){
+            $prePolicyCount = $this->getPreEmployeePolicyCount($empMobileNo, $clientId, $employeeSelfData->email_corporate);
+        }else{
+            $prePolicyCount = $this->getPreEmployeePolicyCount($empMobileNo, $clientId);
+        }
         
         $whereArrayForId = [];
         foreach ( $employeeData as $key => $value) { array_push($whereArrayForId, $value['id']); }
@@ -2972,7 +2981,11 @@ class EmployeeRestController extends AdminController
 
 
     function policyTermsFiter($terms , $type)
-    {
+    {   
+        if(empty($terms)){
+            return [];
+        }
+
         $gpa = [
             "sumInsured2" => "Sum Insured",
             "totalSumInsured" => "Total Sum Assured",
@@ -4082,18 +4095,19 @@ class EmployeeRestController extends AdminController
     //     }
     // }
 
-    public function getPreEmployeePolicyCount($mobile_no, $clientId = null)
-    {
-        log_message('error', 'STEP 1: getPreEmployeePolicyCount called with params: ' . json_encode(['mobile_no' => $mobile_no, 'client_id' => $clientId]));
+    public function getPreEmployeePolicyCount($mobile_no, $clientId = null, $email = null)
+    {   
+        log_message('error', 'STEP 1: getPreEmployeePolicyCount called with params: ' . json_encode(['mobile_no' => $mobile_no, 'client_id' => $clientId, 'email' => $email]));
 
-        if (empty($mobile_no)) {
-            log_message('error', 'STEP 2: Mobile number is empty or null. Returning 0.');
+        if (empty($mobile_no) && empty($email)) {
+            log_message('error', 'STEP 2: Mobile number and Email is empty or null. Returning 0.');
             return 0;
         }
 
         $client_short_name = null;
 
         if (!empty($clientId)) {
+
             log_message('error', 'STEP 3: Fetching client short name for client ID: ' . $clientId);
             $client_data = $this->clientModel->where('is_active', 1)->where('id', $clientId)->first();
 
@@ -4103,14 +4117,25 @@ class EmployeeRestController extends AdminController
             } else {
                 log_message('error', 'STEP 4: No client found for ID: ' . $clientId);
             }
+
         } else {
             log_message('error', 'STEP 3: No clientId provided. Skipping client lookup.');
         }
 
-        $post_data = [
-            'mobile_number'     => $mobile_no,
-            'client_short_name' => $client_short_name
-        ];
+        if(!empty($email)){
+            $post_data = [
+                'email_id'     => $email,
+                'client_short_name' => $client_short_name
+            ];
+        }else{
+            $post_data = [
+                'mobile_number'     => $mobile_no,
+                'client_short_name' => $client_short_name
+            ];
+
+        }
+
+       
 
         log_message('error', 'STEP 5: Calling third-party API with payload: ' . json_encode($post_data));
 
diff --git a/app/Controllers/EmployeeServiceController.php b/app/Controllers/EmployeeServiceController.php
index 95940c90..4b71694c 100755
--- a/app/Controllers/EmployeeServiceController.php
+++ b/app/Controllers/EmployeeServiceController.php
@@ -1514,9 +1514,9 @@ class EmployeeServiceController extends AdminController
                         ->where('employees.client_id',$file['client_id'])
                         ->where('employees.client_branch_id',$file['client_branch_id'])
                         ->where('employee_polices.client_policy_id',$file['policy_id'])
-                        ->where('employees.emp_status !=','truncated')
+                        ->where('employees.emp_status','active')
                         ->where('employees.is_active', 1)
-                        ->where('employee_polices.status !=','truncated')
+                        ->where('employee_polices.status','active')
                         ->where('employee_polices.is_active', 1)
                         ->first();
 
@@ -1550,7 +1550,7 @@ class EmployeeServiceController extends AdminController
                                     $employee_policy = $this->employeePolicyModel
                                                             ->where('employee_id',$employee['id'])
                                                             ->where('client_policy_id',$file['policy_id'])
-                                                            ->where('status !=','truncated')
+                                                            ->where('status','active')
                                                             ->where('is_active', 1)
                                                             ->first();
 
diff --git a/app/Models/EmployeePolicyModel.php b/app/Models/EmployeePolicyModel.php
index 4a730206..1d0dc8bf 100755
--- a/app/Models/EmployeePolicyModel.php
+++ b/app/Models/EmployeePolicyModel.php
@@ -382,6 +382,7 @@ class EmployeePolicyModel extends Model
    {
          return $this->where('employee_id',$arr['employee_id'])
                        ->where('client_policy_id',$arr['client_policy_id'])
+                       ->where('status', 'active')
                        ->where('is_active',1)
                        ->find();
    }

From 581ee4a07c55e95dd71c37bc2791ea8af32a8332 Mon Sep 17 00:00:00 2001
From: "venkatesh.r" 
Date: Tue, 4 Nov 2025 18:43:50 +0530
Subject: [PATCH 102/109] CHANGE_ROUTE

---
 app/Config/Routes.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index 0bc4cbf5..73608db8 100755
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -500,12 +500,16 @@ $routes->cli('cli/sendMailWithAutoQuery','TicketController::sendMailWithAutoQuer
 //Employee login api's
 $routes->post("/employeeRest/verifyEmployeeNumber", "RestAuthenticationController::verifyEmployeeWithMobileNumber");
 $routes->post("/employeeRest/getVerifiedUserData", "RestAuthenticationController::getVerifiedUserData");
-$routes->post("/employeeRest/verifyMpin", "RestAuthenticationController::verifyMpin");
-$routes->post("/employeeRest/checkMpin", "RestAuthenticationController::checkMpin");
 $routes->post("/employeeRest/verifyEmployeeEmailId", "RestAuthenticationController::verifyEmployeeWithEmailId");
 $routes->post("/employeeRest/updateEmpOTP", "RestAuthenticationController::updateEmpOTP");
+
+$routes->post("employeeRest/saveMpin", "RestAuthenticationController::saveMpin");
+$routes->post("employeeRest/updateMpin", "RestAuthenticationController::updateMpin");
+$routes->post("/employeeRest/verifyMpin", "RestAuthenticationController::verifyMpin");
+$routes->post("/employeeRest/checkMpin", "RestAuthenticationController::checkMpin");
 $routes->post("/employeeRest/updateEmpMPIN", "RestAuthenticationController::updateEmpMPIN");
 $routes->post("employeeRest/forgotMPIN", "RestAuthenticationController::forgotMPIN");
+$routes->post("employeeRest/updateMobileNumber", "RestAuthenticationController::updateMobileNumber");
 // $routes->post("/employeeRest/saveMpin", "RestAuthenticationController::saveMpin");
 
 
@@ -529,8 +533,6 @@ $routes->group("/api", ["filter" => "authJWT"], function ($routes) {
     $routes->post("getId", "RestAuthenticationController::getUserIdFromToken");
 });
 
-$routes->post("employeeRest/saveMpin", "RestAuthenticationController::saveMpin");
-$routes->post("employeeRest/updateMpin", "RestAuthenticationController::updateMpin");
 $routes->post("employeeRest/getPostEmployeeDataForAuth", "RestAuthenticationController::getPostEmployeeDataForAuth");
 // $routes->post("logHrActivity", "RestAuthenticationController::logHrActivity");
 

From 2dee0dc63e4028ad7407f6234811e6c7f951551a Mon Sep 17 00:00:00 2001
From: velz 
Date: Wed, 5 Nov 2025 09:35:26 +0530
Subject: [PATCH 103/109] FIX_LEAD_LIST_500_ERROR

---
 app/Controllers/LeadsController.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/Controllers/LeadsController.php b/app/Controllers/LeadsController.php
index 3ead1911..92fa8a52 100644
--- a/app/Controllers/LeadsController.php
+++ b/app/Controllers/LeadsController.php
@@ -344,10 +344,15 @@ class LeadsController extends BaseController
                 $where = [];
                 foreach ($search_data as $search_objects => $key) {
                     if ($key != null && $key != '' && $key != 0 && $search_objects != 'is_dashboard') {
-                        $where[$search_objects] = $key;
+                        if($search_objects == 'status')
+                        {
+                           $where[('leads.'.$search_objects)] = $key;
+                        }else{
+                           $where[$search_objects] = $key;
+                        }
                     }
                 }
-
+                // !dd($where);
                 $data['lead_data_list'] = $this->leadsModel->getLeadDataForLising($where);
 
                 $html = view('leads_list', $data);

From 0c828239feffa085310dde7f1d9b3eb96da85cd2 Mon Sep 17 00:00:00 2001
From: vadivelJ96 
Date: Wed, 5 Nov 2025 09:53:46 +0530
Subject: [PATCH 104/109] CHANGE_help_desk_tickets  - VADIVEL J 2025-11-05
 09:53

---
 app/Controllers/MasterController.php | 12 ++++++------
 app/Views/mail_template.php          | 15 +++++++++++++--
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/app/Controllers/MasterController.php b/app/Controllers/MasterController.php
index 6f747c67..6191007c 100755
--- a/app/Controllers/MasterController.php
+++ b/app/Controllers/MasterController.php
@@ -354,14 +354,14 @@ class MasterController extends AdminController
         exit();
     }
 
-        public function getInsurerBranchList()
-        {
-            $id = $this->request->getPost('insurer_id');
+    public function getInsurerBranchList()
+    {
+        $id = $this->request->getPost('insurer_id');
 
-            $insurer_branch_list = $this->insurerBranchModel->where(['insurer_id' => $id, 'is_active' => 1])->findAll()??[];
+        $insurer_branch_list = $this->insurerBranchModel->where(['insurer_id' => $id, 'is_active' => 1])->findAll()??[];
 
-            return $this->response->setJSON([ 'data' => $insurer_branch_list ])->setStatusCode(200);
-        }
+        return $this->response->setJSON([ 'data' => $insurer_branch_list ])->setStatusCode(200);
+    }
 
     public function editInsurerGeneralInfo()
     {
diff --git a/app/Views/mail_template.php b/app/Views/mail_template.php
index f111bd54..450f5e68 100644
--- a/app/Views/mail_template.php
+++ b/app/Views/mail_template.php
@@ -45,6 +45,17 @@ p{
   }
 }
 
+@media screen and (max-width: 600px){
+
+  .header-div{
+    width: 100% !important;
+  }
+
+  .footer-div{
+    width : 100% !important ;
+  }
+}
+
   
 
 
@@ -53,7 +64,7 @@ p{
 
 
     
-  
    
+  
    
     
    
       
    
+        
         
    
+        
    		
           Default Logo

From e6911a06ab8a68b0e1fd002fbfcfbed7caa02fc6 Mon Sep 17 00:00:00 2001
From: vadivelJ96 
Date: Tue, 4 Nov 2025 17:50:19 +0530
Subject: [PATCH 099/109] CHANGE_help_desk_tickets  - VADIVEL J 2025-11-04
 17:50

---
 app/Config/Routes.php                      |   1 +
 app/Controllers/BDSReportController.php    |  24 +++-
 app/Controllers/MasterController.php       |   9 ++
 app/Views/bds_multi_report.php             |   2 +-
 app/Views/bds_report_Insurer_wise_Data.php |   6 +
 app/Views/bds_report_bap_wise_data.php     |   8 ++
 app/Views/irba_report.php                  |  10 +-
 app/Views/irda_bap_client_report_list.php  |   6 +
 app/Views/irda_bap_insurer_report_list.php |   8 +-
 app/Views/notification.php                 |   2 +
 app/Views/outstanding_report_list.php      | 157 +++++++++++----------
 app/Views/variance_report_list.php         |   4 +-
 12 files changed, 152 insertions(+), 85 deletions(-)

diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index 0bc4cbf5..c1cf6375 100755
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -213,6 +213,7 @@ $routes->group("/master", ["filter" => "authMVC"], function ($routes) {
             $routes->post("edit", "MasterController::editInsurerBranch");
             $routes->get("editget/(:any)", "MasterController::editInsurerGet/$1");
             $routes->get("list/(:any)", "MasterController::insurerBranchList/$1");
+            $routes->post("getList",  "MasterController::getInsurerBranchList");
             $routes->get("remove/(:any)", "MasterController::removeInsurerBranch/$1");
         });
     });
diff --git a/app/Controllers/BDSReportController.php b/app/Controllers/BDSReportController.php
index 38c5ecd4..9ba0dca9 100644
--- a/app/Controllers/BDSReportController.php
+++ b/app/Controllers/BDSReportController.php
@@ -181,7 +181,7 @@ class BDSReportController extends AdminController
                 'Client'    => 'client'
             ];
 
-            $data['page_name'] = "IRBA Report";
+            $data['page_name'] = "IRDA Report";
 
             return $this->loadLayout('irba_report', $data);
         } else {
@@ -202,9 +202,11 @@ class BDSReportController extends AdminController
                     $viewData = [];
                 }
 
+                $view_name = "bds_report_Insurer_wise_Data" ;
+
 
                 $html = view('bds_report_Insurer_wise_Data', $viewData);
-                return $this->respond(['status' => true, 'html' => $html], 200);
+                return $this->respond(['status' => true, 'html' => $html , 'view_name' => $view_name], 200);
             } else if ($report_type == 'bap') {
 
                 $life = $category == 'life' ? 1 : 0;
@@ -217,33 +219,40 @@ class BDSReportController extends AdminController
                     $viewData = [];
                 }
 
+                $view_name = "bds_report_bap_wise_data";
 
                 $html = view('bds_report_bap_wise_data', $viewData);
-                return $this->respond(['status' => true, 'html' => $html], 200);
+                return $this->respond(['status' => true, 'html' => $html , 'view_name' => $view_name], 200);
             } else if ($report_type == 'bapInsurer') {
 
                 //Condition for BAP Insurer wise date
                 $category = $category == 'life' ? 1 : 0;
                 $viewData['data'] = $this->getBAPInsurerData($category, $fromDate, $toDate);
+                                
+                $view_name =  "irda_bap_insurer_report_list";
 
                 $html = view('irda_bap_insurer_report_list', $viewData);
-                return $this->respond(['status' => true, 'html' => $html], 200);
+                return $this->respond(['status' => true, 'html' => $html , 'view_name' => $view_name], 200);
             } else if ($report_type == 'bapClient') {
 
                 //Condition for BAP Client wise date
                 $category = $category == 'life' ? 1 : 0;
                 $viewData['data'] = $this->getBAPClientData($category, $fromDate, $toDate);
+                
+                $view_name =  "irda_bap_client_report_list";
 
                 $html = view('irda_bap_client_report_list', $viewData);
-                return $this->respond(['status' => true, 'html' => $html], 200);
+                return $this->respond(['status' => true, 'html' => $html , 'view_name' => $view_name], 200);
             } else if ($report_type == 'client') {
 
                 //Condition for Client wise date
                 $category = $category == 'life' ? 1 : 0;
                 $viewData['data'] = $this->getClientData($category, $fromDate, $toDate);
 
+                $view_name =  "irda_client_report_list";
+
                 $html = view('irda_client_report_list', $viewData);
-                return $this->respond(['status' => true, 'html' => $html], 200);
+                return $this->respond(['status' => true, 'html' => $html , 'view_name' => $view_name], 200);
             }
         }
     }
@@ -932,8 +941,9 @@ class BDSReportController extends AdminController
             $data['client_type'] = [1 => 'Group', 2 => 'Individual'];
             $data['renewal_data'] = $this->policyTransactionModel->getRenewalReportData($fromDate, $toDate, $client_type, $client_id, $issuer);
             // print_r($data); die;
+            $view_name = "bds_renewal_report_list";
             $html = view('bds_renewal_report_list', $data);
-            return $this->respond(['status' => true, 'html' => $html], 200);
+            return $this->respond(['status' => true, 'html' => $html , 'view_name' => $view_name], 200);
         }
     }
 
diff --git a/app/Controllers/MasterController.php b/app/Controllers/MasterController.php
index 58618abf..6f747c67 100755
--- a/app/Controllers/MasterController.php
+++ b/app/Controllers/MasterController.php
@@ -354,6 +354,15 @@ class MasterController extends AdminController
         exit();
     }
 
+        public function getInsurerBranchList()
+        {
+            $id = $this->request->getPost('insurer_id');
+
+            $insurer_branch_list = $this->insurerBranchModel->where(['insurer_id' => $id, 'is_active' => 1])->findAll()??[];
+
+            return $this->response->setJSON([ 'data' => $insurer_branch_list ])->setStatusCode(200);
+        }
+
     public function editInsurerGeneralInfo()
     {
         $this->myLogger->logme('error','edit Insurer general info function called');
diff --git a/app/Views/bds_multi_report.php b/app/Views/bds_multi_report.php
index fac8a2e0..b2cbb84f 100644
--- a/app/Views/bds_multi_report.php
+++ b/app/Views/bds_multi_report.php
@@ -39,7 +39,7 @@
                                 // Get headers dynamically
                                 $headers = array_keys($data[0]);
                                 foreach ($headers as $header): ?>
-                                    
                                 
                                 TOTAL
                             
    
 
 
     
 
 
     
                         
    
                             
                             Grand Total
                                 
                                 
                                 
    
       
    
         
@@ -86,7 +97,7 @@ p{
 
 
   
-  
    
+  
    
     
    
     
    
         

From 7ab14804371f6e021935f5c331fdf9c1ea072447 Mon Sep 17 00:00:00 2001
From: vadivelJ96 
Date: Wed, 5 Nov 2025 10:20:13 +0530
Subject: [PATCH 105/109] CHANGE_help_desk_tickets  - VADIVEL J 2025-11-05
 10:20

---
 app/Views/outstanding_report_list.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Views/outstanding_report_list.php b/app/Views/outstanding_report_list.php
index 0dc70504..203c4151 100644
--- a/app/Views/outstanding_report_list.php
+++ b/app/Views/outstanding_report_list.php
@@ -176,12 +176,12 @@
                     buttons: [{
                             extend: 'csv',
                             text: '  CSV ',
-                            title: 'Policy-Tranction-BDS-List',
+                            title: 'Outstanding Report',
                         },
                         {
                             extend: 'excel',
                             text: '  EXCEL ',
-                            title: 'Policy-Tranction-BDS-List',
+                            title: 'Outstanding Report',
                             customize: function(xlsx) {
                                 var sheet = xlsx.xl.worksheets['sheet1.xml'];
                                 var total = 0;

From c8f070a5a79f0b3700a6c6cb3d963571f84cfe6b Mon Sep 17 00:00:00 2001
From: vadivelJ96 
Date: Wed, 5 Nov 2025 11:12:24 +0530
Subject: [PATCH 106/109] CHANGE_help_desk_tickets  - VADIVEL J 2025-11-05
 11:12

---
 app/Views/mail_template.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Views/mail_template.php b/app/Views/mail_template.php
index 450f5e68..4d62f3f1 100644
--- a/app/Views/mail_template.php
+++ b/app/Views/mail_template.php
@@ -67,7 +67,7 @@ p{
   
    
     
-        
    
       
    
+        
         
    
+        
    		
           Default Logo

From e055f5cdeab3362069b017dcd65aa0c3e4a3af2c Mon Sep 17 00:00:00 2001
From: vadivelJ96 
Date: Wed, 5 Nov 2025 11:19:22 +0530
Subject: [PATCH 107/109] CHANGE_help_desk_tickets  - VADIVEL J 2025-11-05
 11:19

---
 app/Views/mail_template.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/Views/mail_template.php b/app/Views/mail_template.php
index 4d62f3f1..b83e1f40 100644
--- a/app/Views/mail_template.php
+++ b/app/Views/mail_template.php
@@ -56,7 +56,11 @@ p{
   }
 }
 
-  
+.client_logo,
+.nhance_logo
+{
+  vertical-align: bottom !important;
+}
 
 
 
@@ -67,7 +71,7 @@ p{
   
    
     
-        
    
       
    
+