From 0b1fe9f4d714bf706b621b0e2f35b427655f2808 Mon Sep 17 00:00:00 2001 From: "venkatesh.r" Date: Mon, 19 Jan 2026 09:48:49 +0530 Subject: [PATCH 1/8] FIX_ISSUE --- app/Controllers/EmployeeRestController.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php index e810120..696eed5 100755 --- a/app/Controllers/EmployeeRestController.php +++ b/app/Controllers/EmployeeRestController.php @@ -1631,8 +1631,8 @@ class EmployeeRestController extends AdminController } if(!empty($result) && $this->request->getGet('policy') == 'GMC'){ - // return $this->respond(['status' => 'success','code' => 200,'data' => $result], 200); - echo json_encode(['status' => 'success','code' => 200,'data' => $result], JSON_PRETTY_PRINT | JSON_PRESERVE_ZERO_FRACTION); + return $this->respond(['status' => 'success','code' => 200,'data' => $result], 200); + // echo json_encode(['status' => 'success','code' => 200,'data' => $result], JSON_PRETTY_PRINT | JSON_PRESERVE_ZERO_FRACTION); }else{ return $this->respond(['status' => 'success','code' => 200,'data' => []], 200); } @@ -2540,8 +2540,8 @@ class EmployeeRestController extends AdminController if($this->request->getGet('policy') == 'GMC-DEPENDENT-ADDON'){ - // return $this->respond(['status' => 'success','code' => 200,'data' => ['gmc_dependent_addon'=>$responce]], 200); - echo json_encode(['status' => 'success','code' => 200,'data' => ['gmc_dependent_addon'=>$responce]], JSON_PRETTY_PRINT | JSON_PRESERVE_ZERO_FRACTION); + return $this->respond(['status' => 'success','code' => 200,'data' => ['gmc_dependent_addon'=>$responce]], 200); + // echo json_encode(['status' => 'success','code' => 200,'data' => ['gmc_dependent_addon'=>$responce]], JSON_PRETTY_PRINT | JSON_PRESERVE_ZERO_FRACTION); } //array_push($PolicyData, $responce); From c58a242099e9db953e25d124223034bf3a9fd01b Mon Sep 17 00:00:00 2001 From: "venkatesh.r" Date: Mon, 19 Jan 2026 13:25:43 +0530 Subject: [PATCH 2/8] FIX_OPEN_FOR_ENROLLMENT_WHILE ADD_DEPENDENT_AND_SI --- app/Controllers/EmployeeRestController.php | 78 ++++++++++++++++++++-- 1 file changed, 72 insertions(+), 6 deletions(-) diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php index cbc14ce..d6c281e 100755 --- a/app/Controllers/EmployeeRestController.php +++ b/app/Controllers/EmployeeRestController.php @@ -235,8 +235,17 @@ class EmployeeRestController extends AdminController try { $data = $this->request->getJSON(); + $clientPolicyData = $this->clientPolicyModel->where('id',$data[0]->client_policy_id) + ->where('is_active', 1) + ->first(); + + if(in_array($clientPolicyData['policy_type_id'], [3,4,5])){ + $openForEnrollment = $this->findThePolicyIsOpenForEnrollment($clientPolicyData['base_policy'], $data[0]->emp_code); + }else{ + $openForEnrollment = $this->findThePolicyIsOpenForEnrollment($data[0]->client_policy_id, $data[0]->emp_code); + } + //enrolment check - $openForEnrollment = $this->findThePolicyIsOpenForEnrollment($data[0]->client_policy_id, $data[0]->emp_code); if($openForEnrollment == false){ return $this->respond(['status' => 'failed','code' => 404,'data' => [],'message' => 'Enrollment closed.'], 200); } @@ -395,17 +404,22 @@ class EmployeeRestController extends AdminController }else{ + $enrollment_dates = $this->getEnrollmentDates($client_policy_id, $emp_code); + $data['employee_id']= $employee_id; $data['client_policy_id']= $client_policy_id; $data['basic_cover_si']= $basic_cover_si; $data['payable_employee']= $payable_employee; $data['status']= 'draft'; $data['date_coverage'] = $this->getEmployeeCoverageDate($emp_code, $client_policy_id); + $data['enrollment_open_date'] = $enrollment_dates['enrollment_open_date']; + $data['enrollment_close_date'] = $enrollment_dates['enrollment_close_date']; - if(!empty($other_employee_policy_data)){ - $data['enrollment_open_date']= $other_employee_policy_data['enrollment_open_date'] ?? null; - $data['enrollment_close_date']= $other_employee_policy_data['enrollment_close_date'] ?? null; - } + + // if(!empty($other_employee_policy_data)){ + // $data['enrollment_open_date']= $other_employee_policy_data['enrollment_open_date'] ?? null; + // $data['enrollment_close_date']= $other_employee_policy_data['enrollment_close_date'] ?? null; + // } // dd($data); $this->employeePolicyModel->insert($data); @@ -590,7 +604,17 @@ class EmployeeRestController extends AdminController // print_r($requestData); // dd($requestData); - $openForEnrollment = $this->findThePolicyIsOpenForEnrollment($requestData[0]->client_policy_id, $requestData[0]->emp_code); + + $clientPolicyData = $this->clientPolicyModel->where('id',$requestData[0]->client_policy_id) + ->where('is_active', 1) + ->first(); + + if(in_array($clientPolicyData['policy_type_id'], [3,4,5])){ + $openForEnrollment = $this->findThePolicyIsOpenForEnrollment($clientPolicyData['base_policy'], $requestData[0]->emp_code); + }else{ + $openForEnrollment = $this->findThePolicyIsOpenForEnrollment($requestData[0]->client_policy_id, $requestData[0]->emp_code); + } + if($openForEnrollment == false){ return $this->respond(['status' => 'failed','code' => 404,'data' => 'Enrollment closed'], 404); } foreach ($requestData as $key => $value) @@ -600,6 +624,7 @@ class EmployeeRestController extends AdminController ->where('client_policy_id', $value->client_policy_id) ->where('is_active', 1 ) ->findAll(); + // dd($checkIfExist); if ($checkIfExist) { @@ -608,10 +633,14 @@ class EmployeeRestController extends AdminController }else{ + $enrollment_dates = $this->getEnrollmentDates($value->client_policy_id, $requestData[0]->emp_code); + $data['employee_id']= $value->employee_id; $data['client_policy_id']= $value->client_policy_id; $data['basic_cover_si']= $value->basic_cover_si; $data['status'] = 'draft'; + $data['enrollment_open_date'] = $enrollment_dates['enrollment_open_date']; + $data['enrollment_close_date'] = $enrollment_dates['enrollment_close_date']; $this->employeePolicyModel->insert($data); } @@ -4368,4 +4397,41 @@ class EmployeeRestController extends AdminController } } + public function getEnrollmentDates($client_policy_id, $emp_code) + { + $enrollment_open_date = null; + $enrollment_close_date = null; + + $clientPolicyData = $this->clientPolicyModel->where('id', $client_policy_id) + ->where('is_active', 1) + ->first(); + + if(in_array($clientPolicyData['policy_type_id'], [3,4,5])){ + + $policy = $this->employeePolicyModel + ->select('employee_polices.enrollment_open_date, employee_polices.enrollment_close_date') + ->join('employees', 'employee_polices.employee_id = employees.id') + ->where('employees.emp_code',$emp_code) + ->where('employee_polices.client_policy_id', $client_policy_id) + ->where('employee_polices.enrollment_open_date <= CURDATE()', null, false) + ->where('employee_polices.enrollment_close_date >= CURDATE()', null, false) + ->where('employee_polices.enrollment_open_date is not null') + ->where('employee_polices.enrollment_close_date is not null') + ->where('employees.family_floater_key', 'self') + ->where('employees.is_active', 1) + ->where('employee_polices.is_active', 1) + ->whereIn('employee_polices.status', ['draft', 'enrolled']) + ->whereIn('employees.emp_status', ['draft', 'enrolled']) + ->first(); + + $enrollment_open_date = $policy['enrollment_open_date']; + $enrollment_open_date = $policy['enrollment_close_date']; + } + + return [ + '$nrollment_open_date' => $enrollment_open_date, + 'enrollment_close_date' => $enrollment_close_date, + ]; + } + } \ No newline at end of file From b1c3cbcb8983b93c2d34ec50d8dca2be946fad3d Mon Sep 17 00:00:00 2001 From: "venkatesh.r" Date: Mon, 19 Jan 2026 13:44:58 +0530 Subject: [PATCH 3/8] FIX_ISSUE --- app/Controllers/EmployeeRestController.php | 29 +++++++++++----------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php index d6c281e..b4d1dd1 100755 --- a/app/Controllers/EmployeeRestController.php +++ b/app/Controllers/EmployeeRestController.php @@ -317,7 +317,7 @@ class EmployeeRestController extends AdminController } } } catch (\Exception $e) { - return $this->respond(['status' => 'failed','code' => 500,'data' => $e->getMessage(),'message' => "Action failed."], 500); + return $this->respond(['status' => 'failed','code' => 500,'data' => $e->getMessage() . $e->getLine(),'message' => "Action failed."], 500); } } @@ -412,14 +412,14 @@ class EmployeeRestController extends AdminController $data['payable_employee']= $payable_employee; $data['status']= 'draft'; $data['date_coverage'] = $this->getEmployeeCoverageDate($emp_code, $client_policy_id); - $data['enrollment_open_date'] = $enrollment_dates['enrollment_open_date']; - $data['enrollment_close_date'] = $enrollment_dates['enrollment_close_date']; - - // if(!empty($other_employee_policy_data)){ - // $data['enrollment_open_date']= $other_employee_policy_data['enrollment_open_date'] ?? null; - // $data['enrollment_close_date']= $other_employee_policy_data['enrollment_close_date'] ?? null; - // } + if(!empty($other_employee_policy_data)){ + $data['enrollment_open_date']= $other_employee_policy_data['enrollment_open_date'] ?? null; + $data['enrollment_close_date']= $other_employee_policy_data['enrollment_close_date'] ?? null; + }else{ + $data['enrollment_open_date'] = $enrollment_dates['enrollment_open_date'] ?? null; + $data['enrollment_close_date'] = $enrollment_dates['enrollment_close_date'] ?? null; + } // dd($data); $this->employeePolicyModel->insert($data); @@ -639,8 +639,8 @@ class EmployeeRestController extends AdminController $data['client_policy_id']= $value->client_policy_id; $data['basic_cover_si']= $value->basic_cover_si; $data['status'] = 'draft'; - $data['enrollment_open_date'] = $enrollment_dates['enrollment_open_date']; - $data['enrollment_close_date'] = $enrollment_dates['enrollment_close_date']; + $data['enrollment_open_date'] = $enrollment_dates['enrollment_open_date'] ?? null; + $data['enrollment_close_date'] = $enrollment_dates['enrollment_close_date'] ?? null; $this->employeePolicyModel->insert($data); } @@ -4406,7 +4406,7 @@ class EmployeeRestController extends AdminController ->where('is_active', 1) ->first(); - if(in_array($clientPolicyData['policy_type_id'], [3,4,5])){ + if(in_array($clientPolicyData['policy_type_id'] ?? null, [3,4,5])){ $policy = $this->employeePolicyModel ->select('employee_polices.enrollment_open_date, employee_polices.enrollment_close_date') @@ -4417,19 +4417,18 @@ class EmployeeRestController extends AdminController ->where('employee_polices.enrollment_close_date >= CURDATE()', null, false) ->where('employee_polices.enrollment_open_date is not null') ->where('employee_polices.enrollment_close_date is not null') - ->where('employees.family_floater_key', 'self') ->where('employees.is_active', 1) ->where('employee_polices.is_active', 1) ->whereIn('employee_polices.status', ['draft', 'enrolled']) ->whereIn('employees.emp_status', ['draft', 'enrolled']) ->first(); - $enrollment_open_date = $policy['enrollment_open_date']; - $enrollment_open_date = $policy['enrollment_close_date']; + $enrollment_open_date = $policy['enrollment_open_date'] ?? null; + $enrollment_open_date = $policy['enrollment_close_date'] ?? null; } return [ - '$nrollment_open_date' => $enrollment_open_date, + 'enrollment_open_date' => $enrollment_open_date, 'enrollment_close_date' => $enrollment_close_date, ]; } From 9a3ebe43a47b528489da8a9999f4ec0c1f023e93 Mon Sep 17 00:00:00 2001 From: "venkatesh.r" Date: Mon, 19 Jan 2026 14:37:11 +0530 Subject: [PATCH 4/8] FIX_ISSUE --- app/Controllers/EmployeeRestController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php index b4d1dd1..c6bec41 100755 --- a/app/Controllers/EmployeeRestController.php +++ b/app/Controllers/EmployeeRestController.php @@ -4412,7 +4412,7 @@ class EmployeeRestController extends AdminController ->select('employee_polices.enrollment_open_date, employee_polices.enrollment_close_date') ->join('employees', 'employee_polices.employee_id = employees.id') ->where('employees.emp_code',$emp_code) - ->where('employee_polices.client_policy_id', $client_policy_id) + ->where('employee_polices.client_policy_id', $clientPolicyData['base_policy']) ->where('employee_polices.enrollment_open_date <= CURDATE()', null, false) ->where('employee_polices.enrollment_close_date >= CURDATE()', null, false) ->where('employee_polices.enrollment_open_date is not null') @@ -4424,7 +4424,7 @@ class EmployeeRestController extends AdminController ->first(); $enrollment_open_date = $policy['enrollment_open_date'] ?? null; - $enrollment_open_date = $policy['enrollment_close_date'] ?? null; + $$enrollment_close_date = $policy['enrollment_close_date'] ?? null; } return [ From 74b5aec2712c095ab3853dbe618c1e1eb80d8044 Mon Sep 17 00:00:00 2001 From: "venkatesh.r" Date: Tue, 20 Jan 2026 09:23:07 +0530 Subject: [PATCH 5/8] FIX_ISSUE --- 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 c6bec41..0507f77 100755 --- a/app/Controllers/EmployeeRestController.php +++ b/app/Controllers/EmployeeRestController.php @@ -4424,7 +4424,7 @@ class EmployeeRestController extends AdminController ->first(); $enrollment_open_date = $policy['enrollment_open_date'] ?? null; - $$enrollment_close_date = $policy['enrollment_close_date'] ?? null; + $enrollment_close_date = $policy['enrollment_close_date'] ?? null; } return [ From 23865986e76d32203a738285eae71dcf0455c55b Mon Sep 17 00:00:00 2001 From: "venkatesh.r" Date: Tue, 20 Jan 2026 15:53:09 +0530 Subject: [PATCH 6/8] FIX_IAGREE_ADDON__NOT_ENROLLED_ISSUE --- app/Controllers/EmployeeRestController.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php index 0507f77..69297b9 100755 --- a/app/Controllers/EmployeeRestController.php +++ b/app/Controllers/EmployeeRestController.php @@ -2749,7 +2749,13 @@ class EmployeeRestController extends AdminController ->where('id',$value) ->where('is_active', 1) ->first(); - $policy = $this->findThePolicyIsOpenForEnrollment($clientPolicyData['base_policy'], $emp_code); + + if(in_array($clientPolicyData['policy_type_id'], [3,4,5])){ + $policy = $this->findThePolicyIsOpenForEnrollment($clientPolicyData['base_policy'], $emp_code); + }else{ + $policy = $this->findThePolicyIsOpenForEnrollment($value, $emp_code); + } + if($policy) { $this->myLogger->logme("error", 'client policy id = '.$value.' is open for enrollment'); @@ -2792,7 +2798,6 @@ class EmployeeRestController extends AdminController } }else { $this->myLogger->logme("error", 'client policy id = '.$value.' is not open for enrollment');} - } From b2ddd54d9e486ba85b518169a880d0eaccbe808f Mon Sep 17 00:00:00 2001 From: "venkatesh.r" Date: Wed, 21 Jan 2026 10:48:25 +0530 Subject: [PATCH 7/8] FIX_CRONE_ROUTE --- app/Config/Routes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 4c02e4f..cccdc3d 100755 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -551,7 +551,7 @@ $routes->get("getBackToEnrolledDetails", "EmployeeRestController::getBackToEnrol //crone job $routes->cli('cli/enrollOpendAndClose', 'DashboardController::updatePolicyEnrollmentStatus'); $routes->cli("cli/sendCroneRemainderMail", "DashboardController::sendCroneRemainderMail"); - +$routes->cli('cli/update-emp-policy-status', 'ClientController::updateEmpAndPolicyStatus'); $routes->get('enrollOpendAndClose', 'DashboardController::updatePolicyEnrollmentStatus'); $routes->get("sendCroneRemainderMail", "DashboardController::sendCroneRemainderMail"); // $routes->get("getEmployeePolicy", "EmployeeRestController::getEmployeePolicy"); From 1bebfcab0ffce4a16a9faf512f45b6ae718f3949 Mon Sep 17 00:00:00 2001 From: "venkatesh.r" Date: Thu, 22 Jan 2026 17:35:01 +0530 Subject: [PATCH 8/8] FIX_DELETE_EMP_DEPENDENT_API --- app/Controllers/EmployeeRestController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php index 69297b9..c7884b1 100755 --- a/app/Controllers/EmployeeRestController.php +++ b/app/Controllers/EmployeeRestController.php @@ -564,7 +564,7 @@ class EmployeeRestController extends AdminController $this->employeeModel->where('id', $this->request->getGet('id') ) ->where('is_active', 1 ) - ->set(array('is_active'=> 0 )) + ->set(['emp_status' => 'truncated', 'is_active' => 0]) ->update(); } @@ -578,7 +578,7 @@ class EmployeeRestController extends AdminController $query->where('client_policy_id', $clientPolicyId); } - $query->set(['is_active' => 0])->update(); + $query->set(['status' => 'truncated', 'is_active' => 0])->update(); return $this->respond(['status' => 'success','code' => 200,'data' =>[] ], 200);