From b8e9e64cfdce9ebe1f565edc33fc58383da07538 Mon Sep 17 00:00:00 2001 From: vadivelJ96 Date: Wed, 11 Jun 2025 10:44:10 +0530 Subject: [PATCH] latest commit 11-06-2025 --- app/Controllers/EmployeeRestController.php | 9 ++++++--- app/Helpers/EmployeeHelper.php | 14 +++++++------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php index e2c5b23..e6db9c0 100755 --- a/app/Controllers/EmployeeRestController.php +++ b/app/Controllers/EmployeeRestController.php @@ -232,12 +232,15 @@ class EmployeeRestController extends AdminController // dd($data); - $validationFailed = $this->employeeHelper->validation_addEmployeeAndDependence($data); + if ( ! isset($data[0]->id) ) { + $validationFailed = $this->employeeHelper->validation_addEmployeeAndDependence($data); - if($validationFailed){ - return $this->respond(['status' => 'failed','code' => 404,'data' => "validation_addEmployeeAndDependence failed ..!!"], 404); + if($validationFailed){ + return $this->respond(['status' => 'failed','code' => 404,'data' => "validation_addEmployeeAndDependence failed ..!!"], 404); + } } + $openForEnrollment = $this->findThePolicyIsOpenForEnrollment($data[0]->client_policy_id); if($openForEnrollment == false){ return $this->respond(['status' => 'failed','code' => 404,'data' => 'Enrollment closed'], 404); } diff --git a/app/Helpers/EmployeeHelper.php b/app/Helpers/EmployeeHelper.php index cc9038c..6feadc8 100644 --- a/app/Helpers/EmployeeHelper.php +++ b/app/Helpers/EmployeeHelper.php @@ -30,12 +30,12 @@ class EmployeeHelper public function validation_addEmployeeAndDependence($data){ - $employeeData = $this->employeeModel->where('emp_code',$data[0]->emp_code) - ->where('client_id',$data[0]->client_id) - ->where('client_branch_id',$data[0]->client_branch_id) - ->where('is_active', 1 ) - ->where('is_addon_value',0) - ->findAll(); + $employeeData = $this->employeeModel->where('emp_code',$data[0]->emp_code) + ->where('client_id',$data[0]->client_id) + ->where('client_branch_id',$data[0]->client_branch_id) + ->where('is_active', 1 ) + ->where('is_addon_value',0) + ->findAll(); $arr [] = $data; @@ -81,7 +81,7 @@ class EmployeeHelper if(isset($employee_policy->payable_employee) && $employee_policy->payable_employee == 1) { if(isset($employee_policy->rata_premimum)){ $dependent_and_si_premium_value = $dependent_and_si_premium_value + $employee_policy->rata_premimum;} - if(isset($employee_policy->gst)){ $dependent_and_si_gst_value = $dependent_and_si_gst_value + $employee_policy->gst;} + if(isset($employee_policy->gst)){ $dependent_and_si_gst_value = $dependent_and_si_gst_value + $employee_policy->gst;} } $temp['is_value_exist'] = true;