Nhances/nhance
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of bitbucket.org:jubilian/nhance into dev

Browse Source
This commit is contained in:
Srinivas-Saravanan 2025-06-06 17:50:22 +05:30
commit 73f26203fb
3 changed files with 44 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/Controllers/ClientController.php
View File

@ -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);
@ -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();

35
app/Controllers/EmpDataServiceController.php
View File

@ -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

14
app/Models/EmployeePolicyModel.php
View File

@ -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,