From a36cb3501f6b821588c2515d0a717e8e3620f1a0 Mon Sep 17 00:00:00 2001 From: bitbucket Date: Tue, 10 Sep 2024 14:12:13 +0530 Subject: [PATCH] employee file upload related changes : GWM --- app/Controllers/EmployeeRestController.php | 30 +++++++++++++--------- app/Helpers/excel_util_helper.php | 2 +- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php index 39e1f7af..ce19ba1e 100644 --- a/app/Controllers/EmployeeRestController.php +++ b/app/Controllers/EmployeeRestController.php @@ -326,21 +326,27 @@ class EmployeeRestController extends AdminController foreach ($response[$emp_code] as $key => $value) { - - $checkIfExist = $this->employeePolicyModel->where('employee_id', $value['temp']['emp_id']) + + if(isset($value['temp'])) + { + $checkIfExist = $this->employeePolicyModel->where('employee_id', $value['temp']['emp_id']) ->where('client_policy_id', $value['policy_details']['client_policy_id']) ->where('is_active', 1 ) ->findAll(); - if($checkIfExist) - { - $this->employeePolicyModel - ->where('client_policy_id',$value['policy_details']['client_policy_id'] ) - ->where('employee_id' , $value['temp']['emp_id'] ) - ->where('is_active', 1 ) - ->set(array('premium'=> $value['policy_details']['premium'] , 'rata_premimum'=> $value['policy_details']['rata_premimum'] , 'gst'=> $value['policy_details']['gst'] )) - ->update(); - + if($checkIfExist) + { + $this->employeePolicyModel + ->where('client_policy_id',$value['policy_details']['client_policy_id'] ) + ->where('employee_id' , $value['temp']['emp_id'] ) + ->where('is_active', 1 ) + ->set(array('premium'=> $value['policy_details']['premium'] , 'rata_premimum'=> $value['policy_details']['rata_premimum'] , 'gst'=> $value['policy_details']['gst'] )) + ->update(); + + } + } + + } } } @@ -834,7 +840,7 @@ class EmployeeRestController extends AdminController $emp_id =0; $data_after_gpa_or_gmc =[]; - if ($policy['policy_type_id'] == 1) { + if ($client_policy['policy_type_id'] == 1) { if (strtolower($dataToInsert[$a]['relationship']) == 'self') { $data_after_gpa_or_gmc = $dataToInsert[$a]; } diff --git a/app/Helpers/excel_util_helper.php b/app/Helpers/excel_util_helper.php index 3f07ed82..62b17cea 100644 --- a/app/Helpers/excel_util_helper.php +++ b/app/Helpers/excel_util_helper.php @@ -234,7 +234,7 @@ if(!function_exists('check_si')) $is_si_found = false; $is_age_slab_found = false; - if($policy_details['policy_type_id'] == 1 && $slab_details[0]['policy_grid_id'] == 1 && $slab_details[0]['si_or_bp'] == 2) // GPA && grid type 1 for GPA && sub type is basic pay + if($policy_details['policy_type_id'] == 1 && $slab_details['slab_rates'][0]['policy_grid_id'] == 1 && $slab_details['slab_rates'][0]['si_or_bp'] == 2) // GPA && grid type 1 for GPA && sub type is basic pay { $is_si_found = true; $is_age_slab_found = true;