From db09b6d975559dd2adb41cf4b49ba6ca09d703c7 Mon Sep 17 00:00:00 2001 From: velz Date: Sat, 27 Apr 2024 11:46:20 +0530 Subject: [PATCH 1/5] CHNAGE_GRIDTYPE9_PREMIUM_CALC --- app/Helpers/excel_util_helper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Helpers/excel_util_helper.php b/app/Helpers/excel_util_helper.php index 25a70785..a0c7f2c6 100644 --- a/app/Helpers/excel_util_helper.php +++ b/app/Helpers/excel_util_helper.php @@ -860,7 +860,7 @@ if (!function_exists('premium_calculation_manager')) foreach ($slab_details['slab_rates'] as $skey => $slab_value) { - if($slab_value['grade'] == $employee_received_band && $slab_value['si'] == $employee_received_si && (($slab_value['premium_type'] == 1 && strtolower($emp_data['relationship']) == 'self') || ($slab_value['premium_type'] == 2 || $slab_value['premium_type'] == null) )) + if($slab_value['si'] == $employee_received_si && (($slab_value['premium_type'] == 1 && strtolower($emp_data['relationship']) == 'self') || ($slab_value['premium_type'] == 2 || $slab_value['premium_type'] == null) )) { $emp_data['policy_details']['basic_cover_si'] = $slab_value['si']; $emp_data['policy_details']['date_coverage'] = (isset($emp_data['policy_details']['date_coverage']) ? $emp_data['policy_details']['date_coverage'] : $policy_terms['policy_start_date']); From dc8e9d1e74c58d161593d6180fd757520498bd55 Mon Sep 17 00:00:00 2001 From: bitbucket Date: Sat, 27 Apr 2024 14:40:32 +0530 Subject: [PATCH 2/5] CHANGE_ in getEmployeeProfile API : GWM --- app/Controllers/EmployeeRestController.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php index f53e2808..50672f49 100644 --- a/app/Controllers/EmployeeRestController.php +++ b/app/Controllers/EmployeeRestController.php @@ -69,9 +69,11 @@ class EmployeeRestController extends AdminController { try { $emp_code = $this->request->getGet('emp_code'); + $client_id = $this->request->getGet('client_id'); if ($emp_code) { $relationship = 'self'; $employee = $this->employeeModel->where('emp_code', $emp_code) + ->where('client_id', $client_id) ->where('is_active', 1 ) ->where('relationship', $relationship) ->first(); From 23be63e50e537650edfe435ede7f6f1a389dd69b Mon Sep 17 00:00:00 2001 From: bitbucket Date: Sat, 27 Apr 2024 14:50:33 +0530 Subject: [PATCH 3/5] CHANGE_ in addEmployeeAndDependence API : GWM --- app/Controllers/EmployeeRestController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php index 50672f49..cc062a75 100644 --- a/app/Controllers/EmployeeRestController.php +++ b/app/Controllers/EmployeeRestController.php @@ -213,7 +213,7 @@ class EmployeeRestController extends AdminController { $this->createEmployeePolicyData($employee , $data[0]->emp_code , $data[0]->client_id , $data[0]->client_policy_id); }else{ - $this->createEmployeePolicyData($employee , $data[0]->emp_code , $data[0]->client_id , $data[0]->client_policy_id , $data[0]->basic_cover_si); + $this->createEmployeePolicyData($data[0]->id , $data[0]->emp_code , $data[0]->client_id , $data[0]->client_policy_id , $data[0]->basic_cover_si); } From 386fe7fa8a4369603d5e0c23eb7876586e1284fb Mon Sep 17 00:00:00 2001 From: velz Date: Sat, 27 Apr 2024 14:59:00 +0530 Subject: [PATCH 4/5] FIX_ADDON_SI_AMT_FOR_DEPTS --- app/Helpers/excel_util_helper.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Helpers/excel_util_helper.php b/app/Helpers/excel_util_helper.php index a0c7f2c6..1e98e9fb 100644 --- a/app/Helpers/excel_util_helper.php +++ b/app/Helpers/excel_util_helper.php @@ -571,7 +571,8 @@ if (!function_exists('calculate_premimum')) $transformed_familiy_member_data['temp']['band'] = $emp_details_with_empband_max_age_max_count[ $transformed_familiy_member_data['emp_code'] ]['band']; $transformed_familiy_member_data['temp']['maxage'] = $emp_details_with_empband_max_age_max_count[ $transformed_familiy_member_data['emp_code'] ]['maxage']; $transformed_familiy_member_data['temp']['maxcount'] = $emp_details_with_empband_max_age_max_count[ $transformed_familiy_member_data['emp_code'] ]['maxcount']; - $transformed_familiy_member_data['policy_details']['basic_cover_si'] = $emp_details_with_empband_max_age_max_count[ $transformed_familiy_member_data['emp_code'] ]['si']; + + $transformed_familiy_member_data['policy_details']['basic_cover_si'] = isset($emp_details_with_empband_max_age_max_count[ $transformed_familiy_member_data['emp_code'] ]['si']) ? $emp_details_with_empband_max_age_max_count[ $transformed_familiy_member_data['emp_code'] ]['si'] : $transformed_familiy_member_data['policy_details']['basic_cover_si']; if( $fileArr['id'] == null || (in_array($grid_type,[10,11]) || $transformed_familiy_member_data['temp']['source'] == 'excel'))//if file id is null then data coming from enrollment (from DB) otherwise data coming from xcel, so calculate only data from excel (new entry) note: even data coming from excel for event dependet additon we fetch other dependts from db and calculate premium for whole family { From b7ddb87b4692c179c152321a26f64fefbbcb830d Mon Sep 17 00:00:00 2001 From: bitbucket Date: Sat, 27 Apr 2024 15:01:45 +0530 Subject: [PATCH 5/5] CHANGE_ in iAgreeForAddOn API : GWM --- app/Controllers/EmployeeRestController.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php index cc062a75..1a66028d 100644 --- a/app/Controllers/EmployeeRestController.php +++ b/app/Controllers/EmployeeRestController.php @@ -1448,11 +1448,14 @@ public function getAddOnPolicy() public function iAgreeForAddOn() { - $emp_code = $this->request->getPost('emp_code'); + $postData = json_decode($this->request->getBody(), true); $client_policy_id = $postData['client_policy_id']; + $emp_code = $postData['emp_code']; + $client_id = $postData['client_id']; $this->employeeModel->where('emp_code', $emp_code ) + ->where('client_id', $client_id ) ->where('is_active', 1 ) ->set(array('emp_status'=>'enrolled')) ->update();