From a789f156c952e0df3b46601fcdda65d3922ad0dc Mon Sep 17 00:00:00 2001 From: Srinivas-Saravanan Date: Fri, 18 Apr 2025 15:23:08 +0530 Subject: [PATCH 1/4] FIX_MAIL_SRI --- app/Views/notification.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/Views/notification.php b/app/Views/notification.php index 460b054..6d5908c 100755 --- a/app/Views/notification.php +++ b/app/Views/notification.php @@ -264,7 +264,7 @@
-
+
@@ -360,7 +360,7 @@
-
+
@@ -441,7 +441,7 @@
-
+
@@ -544,7 +544,7 @@
-
+
@@ -619,7 +619,7 @@
-
+
@@ -705,7 +705,7 @@
-
+
From a5a5b6f9fc958c2e030ed86e5afcaa967631948c Mon Sep 17 00:00:00 2001 From: Srinivas-Saravanan Date: Sat, 19 Apr 2025 17:16:11 +0530 Subject: [PATCH 2/4] DEBUG_EMPLOYEEREST_API --- app/Controllers/EmployeeRestController.php | 35 +++++++++++++++++----- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php index 1316a13..23c3017 100755 --- a/app/Controllers/EmployeeRestController.php +++ b/app/Controllers/EmployeeRestController.php @@ -227,6 +227,8 @@ class EmployeeRestController extends AdminController try { $data = $this->request->getJSON(); + // dd($data); + $openForEnrollment = $this->findThePolicyIsOpenForEnrollment($data[0]->client_policy_id); if($openForEnrollment == false){ return $this->respond(['status' => 'failed','code' => 404,'data' => 'Enrollment closed'], 404); } @@ -252,7 +254,7 @@ class EmployeeRestController extends AdminController $item->gender = $this->GenderMap($item->relationship , $item->emp_code); $item->dob = $this->convertDateFormatYMD($item->dob); $item->emp_status = 'draft'; - + // dd($item); $employee = $this->employeeModel->insert($item); if ($employee) { @@ -348,6 +350,7 @@ class EmployeeRestController extends AdminController $data['status']= 'draft'; $data['date_coverage'] = $this->getEmployeeCoverageDate($emp_code, $client_policy_id); + dd($data); $this->employeePolicyModel->insert($data); } @@ -513,6 +516,9 @@ class EmployeeRestController extends AdminController $requestData = $this->request->getJSON(); + // print_r($requestData); + // dd($requestData); + $openForEnrollment = $this->findThePolicyIsOpenForEnrollment($requestData[0]->client_policy_id); if($openForEnrollment == false){ return $this->respond(['status' => 'failed','code' => 404,'data' => 'Enrollment closed'], 404); } @@ -524,7 +530,7 @@ class EmployeeRestController extends AdminController ->where('is_active', 1 ) ->findAll(); - + // dd($checkIfExist); if ($checkIfExist) { $empPolicy = $this->employeePolicyModel->updateSiAndPremium($value->client_policy_id, $value->employee_id, $value->basic_cover_si); @@ -2254,7 +2260,7 @@ class EmployeeRestController extends AdminController // print_r($slab_details);die(); $existing_famility_details = $this->employeeModel->getEmpFamilybyEmpCode(client_id: $client_id,client_policy_id: $client_policy_id,emp_code: $emp_code,emp_status:['draft','enrolled'],policy_status:['draft','enrolled']); - // kint::dump($existing_famility_details); + // kint::dump($existing_famility_decalculatePremiumtails); //get the Auto SI amount $auto_si_data = update_si_with_auto_si($client_id, $client_policy_id, $emp_code, $client_branch_id, $existing_famility_details); @@ -2274,8 +2280,8 @@ class EmployeeRestController extends AdminController { //get basepolicy id then pull emplist from base policy if only current policy is DA addon policy and emplist is zero // echo 'inside'; - $client_policy_id = $base_policy; - $existing_famility_details = $this->employeeModel->getEmpFamilybyEmpCode(client_id: $client_id,client_policy_id: $client_policy_id,emp_code: $emp_code,emp_status:['draft','enrolled'],policy_status:['draft','enrolled']); + // $client_policy_id = $base_policy; + $existing_famility_details = $this->employeeModel->getEmpFamilybyEmpCode(client_id: $client_id,client_policy_id: $base_policy,emp_code: $emp_code,emp_status:['draft','enrolled'],policy_status:['draft','enrolled']); } $file = ['id' => null,'client_id' => $client_id,'policy_id' => $client_policy_id,'action' => 'inception']; @@ -2292,10 +2298,25 @@ class EmployeeRestController extends AdminController $transformed_famility_details = transform_db_data_to_excel($family); $data = calculate_premium_new(family_data: $transformed_famility_details,policy_terms:$policy_terms,slab_details:$slab_details,fileArr: $file,existing_units: $existing_units,default_si : $default_si); - + // print_r($data); $employee_data_group_by_family[$emp_id] = $data; + + foreach ($data as $value) { + $newData = []; + $newData['employee_id'] = $value['temp']['emp_id']; + $newData['client_policy_id'] = $value['policy_details']['client_policy_id']; + $newData['status'] = "draft"; + $newData['basic_cover_si'] = $value['policy_details']['basic_cover_si']; + $newData['date_coverage'] = $value['policy_details']['date_coverage']; + $newData['policy_end_date'] = $value['policy_details']['policy_end_date']; + $newData['days'] = $value['policy_details']['days']; + + $this->employeePolicyModel->insert($newData); + } - + + } + // die(); if($clientPolicyId != null && $empCode != null) { // dd ($employee_data_group_by_family); return $employee_data_group_by_family; From ef3283b933bf5d7563041a9c34495761d2cf693e Mon Sep 17 00:00:00 2001 From: Srinivas-Saravanan Date: Mon, 21 Apr 2025 12:23:14 +0530 Subject: [PATCH 3/4] FIX_CAL_PREMIUM --- app/Controllers/EmployeeRestController.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php index 23c3017..b044747 100755 --- a/app/Controllers/EmployeeRestController.php +++ b/app/Controllers/EmployeeRestController.php @@ -350,7 +350,7 @@ class EmployeeRestController extends AdminController $data['status']= 'draft'; $data['date_coverage'] = $this->getEmployeeCoverageDate($emp_code, $client_policy_id); - dd($data); + // dd($data); $this->employeePolicyModel->insert($data); } @@ -2310,8 +2310,15 @@ class EmployeeRestController extends AdminController $newData['date_coverage'] = $value['policy_details']['date_coverage']; $newData['policy_end_date'] = $value['policy_details']['policy_end_date']; $newData['days'] = $value['policy_details']['days']; - - $this->employeePolicyModel->insert($newData); + + + $isExistingEmpAndPolicy = $this->employeePolicyModel->where('employee_id',$value['temp']['emp_id'])->where('client_policy_id',$value['policy_details']['client_policy_id'])->where('is_active', 1)->get()->getRow(); + if($isExistingEmpAndPolicy) + { + $this->employeePolicyModel->where('employee_id',$value['temp']['emp_id'])->where('client_policy_id',$value['policy_details']['client_policy_id'])->where('is_active', 1)->set($newData)->update(); + }else{ + $this->employeePolicyModel->insert($newData); + } } From 1860d57d3e1760d54225d40f2a73d0300978011b Mon Sep 17 00:00:00 2001 From: Srinivas-Saravanan Date: Tue, 22 Apr 2025 15:48:11 +0530 Subject: [PATCH 4/4] FIX_EXCEL_EXTRA_SPACE --- app/Config/Routes.php | 3 ++- app/Controllers/EmployeeServiceController.php | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 3ec65d7..20a170e 100755 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -445,7 +445,8 @@ $routes->group("/api", ["filter" => "authJWT"], function ($routes) { $routes->post("employeeRest/saveMpin", "RestAuthenticationController::saveMpin"); $routes->post("employeeRest/updateMpin", "RestAuthenticationController::updateMpin"); - +// $routes->post("employeeRest/createOrUpdateEmployeePolicySiAmount", "EmployeeRestController::createOrUpdateEmployeePolicySiAmount"); +// $routes->post("employeeRest/calculatePremium", "EmployeeRestController::calculatePremium"); $routes->group("employeeRest", ["filter" => "authJWT"], function ($routes) { diff --git a/app/Controllers/EmployeeServiceController.php b/app/Controllers/EmployeeServiceController.php index 132488f..a6c146f 100755 --- a/app/Controllers/EmployeeServiceController.php +++ b/app/Controllers/EmployeeServiceController.php @@ -28,6 +28,9 @@ use App\Controllers\JobWorker ; use PhpOffice\PhpSpreadsheet\Spreadsheet; use Kint\Kint; +use App\Helpers\ExcelSanitizeHelper; + + class EmployeeServiceController extends AdminController { @@ -1656,6 +1659,8 @@ class EmployeeServiceController extends AdminController // $this->myLogger->logme('error',('Insert - ' . $value['emp_code'] .' - '. $value['name'])); // echo 'update emp'; } + $value = ExcelSanitizeHelper::sanitizeArrayData($value); + $this->employeeModel->save($value); if (isset($value['id'])) { $emp_id = $value['id']; @@ -2077,6 +2082,7 @@ public function getFileMetaDataByFileId($file_id, $status = 'success'){ $value['created_by'] = $file['created_by']; $log_message = 'Enrollment Insert Employee- '.$value['name'] .'('.$value['emp_code'] .') with PK '; } + $value = ExcelSanitizeHelper::sanitizeArrayData($value); $this->employeeModel->save($value); if (isset($value['id']))