From 31385906501960e25559ba38a8fec41c1dde5d14 Mon Sep 17 00:00:00 2001 From: "venkatesh.r" Date: Thu, 5 Jun 2025 15:08:24 +0530 Subject: [PATCH 1/3] FIX_BRANCH_UNITS : RV --- app/Controllers/ClientController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Controllers/ClientController.php b/app/Controllers/ClientController.php index 540be64e..eb070c3b 100755 --- a/app/Controllers/ClientController.php +++ b/app/Controllers/ClientController.php @@ -4054,13 +4054,13 @@ class ClientController extends AdminController // Additional logic for non-individual clients (client_type != 2) if ($client_type != 2) { - $unit = $postData['short_name'] . '-' . $postData['branch_code']; + $unit[] = $postData['short_name'] . '-' . $postData['branch_code']; $branch_data = [ 'client_id' => $client_insert, 'branch_name' => $postData['branch_name'], 'branch_code' => $postData['branch_code'], 'gst' => $postData['gst'], - 'units' => $unit, + 'units' => json_encode($unit) ?? null, ]; $branch_insert = $this->clientBranchModel->insert($branch_data); From 2816cfad0c35a807b77869c03c1a500cd5a719c7 Mon Sep 17 00:00:00 2001 From: "venkatesh.r" Date: Thu, 5 Jun 2025 17:21:55 +0530 Subject: [PATCH 2/3] FIX_SI_ENHANCEMENT_INPROGRESS_ISSUE : RV --- app/Controllers/EmpDataServiceController.php | 35 +++++++++++--------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/app/Controllers/EmpDataServiceController.php b/app/Controllers/EmpDataServiceController.php index 1eb7895f..84a2b01c 100755 --- a/app/Controllers/EmpDataServiceController.php +++ b/app/Controllers/EmpDataServiceController.php @@ -3046,25 +3046,28 @@ class EmpDataServiceController extends BaseController // dd($emp_policy_ids, $emp_details, $endorsement_details); - $this->employeePolicyModel->updateBatch($emp_policy_ids, 'id'); + if ($file['insurer_or_tpa'] == 'insurer') { - // $this->employeePolicyModel->insertBatch($emp_details); - // $insertedIds = []; - // $startId = $db->insertID(); // Get the first inserted ID - - // for ($i = 0; $i < count($emp_details); $i++) { - // $insertedIds[] = $startId + $i; - // } + $this->employeePolicyModel->updateBatch($emp_policy_ids, 'id'); - $insertedIds = []; - foreach ($emp_details as $emp) { - $insertedIds[] = $this->employeePolicyModel->insert($emp); + // $this->employeePolicyModel->insertBatch($emp_details); + // $insertedIds = []; + // $startId = $db->insertID(); // Get the first inserted ID + + // for ($i = 0; $i < count($emp_details); $i++) { + // $insertedIds[] = $startId + $i; + // } + + $insertedIds = []; + foreach ($emp_details as $emp) { + $insertedIds[] = $this->employeePolicyModel->insert($emp); + } + + // dd($insertedIds); + + $this->employeePolicyModel->bulkUpdateForEndorsement($endorsement_details); + $this->storeEndorsementNumber($file_id, $endorsement_id, $enrollment_file_id); } - - // dd($insertedIds); - - $this->employeePolicyModel->bulkUpdateForEndorsement($endorsement_details); - $this->storeEndorsementNumber($file_id, $endorsement_id, $enrollment_file_id); // Update batch file status and amount From fe0d96d1469550417e564dafe9cc2c435ab6951b Mon Sep 17 00:00:00 2001 From: "venkatesh.r" Date: Fri, 6 Jun 2025 17:39:22 +0530 Subject: [PATCH 3/3] FIX_DELETION_PREMIUM_MIS_MATCH_ISSUE : RV --- app/Controllers/ClientController.php | 21 +++++++++++++++------ app/Models/EmployeePolicyModel.php | 14 ++++++++------ 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/app/Controllers/ClientController.php b/app/Controllers/ClientController.php index eb070c3b..ec3c13d6 100755 --- a/app/Controllers/ClientController.php +++ b/app/Controllers/ClientController.php @@ -4825,12 +4825,20 @@ class ClientController extends AdminController // ----------EMP DATA SERVICE CONTROLLER-------------------------------------------------------------------------------- - // $batch_data = [ - // 'client_id' => 17, - // 'client_policy_id' => 30, - // 'client_branch_id' => 18, - // 'event_type' => "inception", - // ]; + $batch_data = [ + 'client_id' => 13, + 'client_policy_id' => 17, + 'client_branch_id' => 15, + 'insurer_or_tpa' => "insurer", + 'event_type' => "deletion", + ]; + + $batch_data = [ + 'client_id' => 29, + 'client_policy_id' => 78, + 'client_branch_id' => 46, + 'insurer_or_tpa' => "insurer", + ]; // $batch_data['insurer_or_tpa'] = 'insurer'; // $batch_data['insurer_or_tpa'] = 'tpa'; @@ -4851,6 +4859,7 @@ class ClientController extends AdminController // $EmpDataServiceController->importInceptionUpdateTPAandUHID(['file_id' => 214]); //for live // $result = $this->employeePolicyModel->getDeletionEmployeeDataForExportExcel($batch_data); + // $result = $this->employeePolicyModel->getSIEnhancementEmployeesDataForExportExcel($batch_data); // print_rr($result); die; // $empServiceController = new EmployeeServiceController(); diff --git a/app/Models/EmployeePolicyModel.php b/app/Models/EmployeePolicyModel.php index 9d33f75c..8cf0fa18 100755 --- a/app/Models/EmployeePolicyModel.php +++ b/app/Models/EmployeePolicyModel.php @@ -632,7 +632,8 @@ class EmployeePolicyModel extends Model employee_polices.pre_existing_alignments, employee_polices.policy_end_date, employee_polices.basic_cover_si as old_basic_cover_si, - employee_polices.rata_premimum as old_si_premium, + employee_polices.premium as old_si_premium, + employee_polices.rata_premimum as old_rata_premium, employee_polices.age_band, batch_data.emp_policy_id, @@ -977,7 +978,8 @@ class EmployeePolicyModel extends Model employee_polices.basic_cover_si, employee_polices.uhid as uhid, - employee_polices.rata_premimum as premium, + employee_polices.rata_premimum, + employee_polices.premium, employee_polices.claim_status, employee_polices.age_band, employee_polices.tpa_id, @@ -1003,22 +1005,22 @@ class EmployeePolicyModel extends Model CASE WHEN deletiondata.claimstatus = 0 OR deletiondata.claimstatus IS NULL THEN - ROUND((employee_polices.rata_premimum * (DATEDIFF(employee_polices.policy_end_date, deletiondata.dateofexit) + $add_one_day)) / 365, 2) + ROUND((employee_polices.premium * (DATEDIFF(employee_polices.policy_end_date, deletiondata.dateofexit) + $add_one_day)) / 365, 2) ELSE 0 END AS pro_rata_premium, CASE WHEN deletiondata.claimstatus = 0 OR deletiondata.claimstatus IS NULL THEN - ROUND(((employee_polices.rata_premimum * (DATEDIFF(employee_polices.policy_end_date, deletiondata.dateofexit) + $add_one_day)) / 365) * 0.18, 2) + ROUND(((employee_polices.premium * (DATEDIFF(employee_polices.policy_end_date, deletiondata.dateofexit) + $add_one_day)) / 365) * 0.18, 2) ELSE 0 END AS gst, CASE WHEN deletiondata.claimstatus = 0 OR deletiondata.claimstatus IS NULL THEN - ROUND(((employee_polices.rata_premimum * (DATEDIFF(employee_polices.policy_end_date, deletiondata.dateofexit) + $add_one_day)) / 365) + - (((employee_polices.rata_premimum * (DATEDIFF(employee_polices.policy_end_date, deletiondata.dateofexit) + $add_one_day)) / 365) * 0.18), 2) + ROUND(((employee_polices.premium * (DATEDIFF(employee_polices.policy_end_date, deletiondata.dateofexit) + $add_one_day)) / 365) + + (((employee_polices.premium * (DATEDIFF(employee_polices.policy_end_date, deletiondata.dateofexit) + $add_one_day)) / 365) * 0.18), 2) ELSE 0 END AS total,