Nhances/nhance-enrollment
Nhances/nhance-enrollment
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MERGE_CODE_MERGE : RV

Browse Source
This commit is contained in:
VENKATESHWARAN 2025-04-23 10:36:33 +05:30
commit 8b333ea1d5
4 changed files with 49 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Config/Routes.php
View File

@ -446,7 +446,8 @@ $routes->post("employeeRest/saveMpin", "RestAuthenticationController::saveMpin")
$routes->post("employeeRest/updateMpin", "RestAuthenticationController::updateMpin"); $routes->post("employeeRest/updateMpin", "RestAuthenticationController::updateMpin");
$routes->post("calculatePremium", "EmployeeRestController::calculatePremium"); $routes->post("calculatePremium", "EmployeeRestController::calculatePremium");
// $routes->post("employeeRest/createOrUpdateEmployeePolicySiAmount", "EmployeeRestController::createOrUpdateEmployeePolicySiAmount");
// $routes->post("employeeRest/calculatePremium", "EmployeeRestController::calculatePremium");
$routes->group("employeeRest", ["filter" => "authJWT"], function ($routes) { $routes->group("employeeRest", ["filter" => "authJWT"], function ($routes) {

41
app/Controllers/EmployeeRestController.php
View File

@ -227,6 +227,8 @@ class EmployeeRestController extends AdminController
try { try {
$data = $this->request->getJSON(); $data = $this->request->getJSON();
// dd($data);
$openForEnrollment = $this->findThePolicyIsOpenForEnrollment($data[0]->client_policy_id); $openForEnrollment = $this->findThePolicyIsOpenForEnrollment($data[0]->client_policy_id);
if($openForEnrollment == false){ return $this->respond(['status' => 'failed','code' => 404,'data' => 'Enrollment closed'], 404); } 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->gender = $this->GenderMap($item->relationship , $item->emp_code);
$item->dob = $this->convertDateFormatYMD($item->dob); $item->dob = $this->convertDateFormatYMD($item->dob);
$item->emp_status = 'draft'; $item->emp_status = 'draft';
// dd($item);
$employee = $this->employeeModel->insert($item); $employee = $this->employeeModel->insert($item);
if ($employee) { if ($employee) {
@ -348,6 +350,7 @@ class EmployeeRestController extends AdminController
$data['status']= 'draft'; $data['status']= 'draft';
$data['date_coverage'] = $this->getEmployeeCoverageDate($emp_code, $client_policy_id); $data['date_coverage'] = $this->getEmployeeCoverageDate($emp_code, $client_policy_id);
// dd($data);
$this->employeePolicyModel->insert($data); $this->employeePolicyModel->insert($data);
} }
@ -513,6 +516,9 @@ class EmployeeRestController extends AdminController
$requestData = $this->request->getJSON(); $requestData = $this->request->getJSON();
// print_r($requestData);
// dd($requestData);
$openForEnrollment = $this->findThePolicyIsOpenForEnrollment($requestData[0]->client_policy_id); $openForEnrollment = $this->findThePolicyIsOpenForEnrollment($requestData[0]->client_policy_id);
if($openForEnrollment == false){ return $this->respond(['status' => 'failed','code' => 404,'data' => 'Enrollment closed'], 404); } 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 ) ->where('is_active', 1 )
->findAll(); ->findAll();
// dd($checkIfExist);
if ($checkIfExist) { if ($checkIfExist) {
$empPolicy = $this->employeePolicyModel->updateSiAndPremium($value->client_policy_id, $value->employee_id, $value->basic_cover_si); $empPolicy = $this->employeePolicyModel->updateSiAndPremium($value->client_policy_id, $value->employee_id, $value->basic_cover_si);
@ -2256,7 +2262,7 @@ class EmployeeRestController extends AdminController
// print_r($slab_details);die(); // 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']); $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 //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); $auto_si_data = update_si_with_auto_si($client_id, $client_policy_id, $emp_code, $client_branch_id, $existing_famility_details);
@ -2276,8 +2282,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 //get basepolicy id then pull emplist from base policy if only current policy is DA addon policy and emplist is zero
// echo 'inside'; // echo 'inside';
$client_policy_id = $base_policy; // $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']); $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']; $file = ['id' => null,'client_id' => $client_id,'policy_id' => $client_policy_id,'action' => 'inception'];
@ -2294,8 +2300,28 @@ class EmployeeRestController extends AdminController
$transformed_famility_details = transform_db_data_to_excel($family); $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); $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; $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'];
$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);
}
} }
if($this->request){ if($this->request){
@ -2334,6 +2360,9 @@ class EmployeeRestController extends AdminController
} }
} }
}
// die();
if($clientPolicyId != null && $empCode != null) if($clientPolicyId != null && $empCode != null)
{ // dd ($employee_data_group_by_family); { // dd ($employee_data_group_by_family);
return $employee_data_group_by_family; return $employee_data_group_by_family;

6
app/Controllers/EmployeeServiceController.php
View File

@ -28,6 +28,9 @@ use App\Controllers\JobWorker ;
use PhpOffice\PhpSpreadsheet\Spreadsheet; use PhpOffice\PhpSpreadsheet\Spreadsheet;
use Kint\Kint; use Kint\Kint;
use App\Helpers\ExcelSanitizeHelper;
class EmployeeServiceController extends AdminController class EmployeeServiceController extends AdminController
{ {
@ -1656,6 +1659,8 @@ class EmployeeServiceController extends AdminController
// $this->myLogger->logme('error',('Insert - ' . $value['emp_code'] .' - '. $value['name'])); // $this->myLogger->logme('error',('Insert - ' . $value['emp_code'] .' - '. $value['name']));
// echo 'update emp'; // echo 'update emp';
} }
$value = ExcelSanitizeHelper::sanitizeArrayData($value);
$this->employeeModel->save($value); $this->employeeModel->save($value);
if (isset($value['id'])) { if (isset($value['id'])) {
$emp_id = $value['id']; $emp_id = $value['id'];
@ -2077,6 +2082,7 @@ public function getFileMetaDataByFileId($file_id, $status = 'success'){
$value['created_by'] = $file['created_by']; $value['created_by'] = $file['created_by'];
$log_message = 'Enrollment Insert Employee- '.$value['name'] .'('.$value['emp_code'] .') with PK '; $log_message = 'Enrollment Insert Employee- '.$value['name'] .'('.$value['emp_code'] .') with PK ';
} }
$value = ExcelSanitizeHelper::sanitizeArrayData($value);
$this->employeeModel->save($value); $this->employeeModel->save($value);
if (isset($value['id'])) if (isset($value['id']))

12
app/Views/notification.php
View File

@ -264,7 +264,7 @@
<!-- Unlayer editor --> <!-- Unlayer editor -->
<div class="form-row" id="rac_rate_dropdown"> <div class="form-row" id="rac_rate_dropdown">
<div class="form-group col-md-12"> <div class="form-group col-md-12">
<div id="member_welcome_mail_editor_container" style="height: 600px;width:max-content"></div> <div id="member_welcome_mail_editor_container" style="height: 600px"></div>
</div> </div>
</div> </div>
@ -360,7 +360,7 @@
<!-- Unlayer editor --> <!-- Unlayer editor -->
<div class="form-row" id="rac_rate_dropdown"> <div class="form-row" id="rac_rate_dropdown">
<div class="form-group col-md-12"> <div class="form-group col-md-12">
<div id="member_reminder_mail_editor_container" style="height: 600px;width:max-content"></div> <div id="member_reminder_mail_editor_container" style="height: 600px"></div>
</div> </div>
</div> </div>
@ -441,7 +441,7 @@
<!-- Unlayer editor --> <!-- Unlayer editor -->
<div class="form-row" id="rac_rate_dropdown"> <div class="form-row" id="rac_rate_dropdown">
<div class="form-group col-md-12"> <div class="form-group col-md-12">
<div id="member_ecard_mail_editor_container" style="height: 600px;width:max-content"></div> <div id="member_ecard_mail_editor_container" style="height: 600px"></div>
</div> </div>
</div> </div>
@ -544,7 +544,7 @@
<!-- Unlayer editor --> <!-- Unlayer editor -->
<div class="form-row" id="rac_rate_dropdown"> <div class="form-row" id="rac_rate_dropdown">
<div class="form-group col-md-12"> <div class="form-group col-md-12">
<div id="member_review_and_summary_mail_editor_container" style="height: 600px;width:max-content"></div> <div id="member_review_and_summary_mail_editor_container" style="height: 600px"></div>
</div> </div>
</div> </div>
@ -619,7 +619,7 @@
<!-- Unlayer editor --> <!-- Unlayer editor -->
<!-- <div class="form-row" id="rac_rate_dropdown"> --> <!-- <div class="form-row" id="rac_rate_dropdown"> -->
<div class="form-group col-md-12"> <div class="form-group col-md-12">
<div id="account_maneger_summary_mail_editor_container" style="height: 600px;width:max-content"></div> <div id="account_maneger_summary_mail_editor_container" style="height: 600px"></div>
</div> </div>
<!-- </div> --> <!-- </div> -->
<div class="form-group text-right m-b-0"> <div class="form-group text-right m-b-0">
@ -705,7 +705,7 @@
<!-- Unlayer editor --> <!-- Unlayer editor -->
<div class="form-row" id="rac_rate_dropdown"> <div class="form-row" id="rac_rate_dropdown">
<div class="form-group col-md-12"> <div class="form-group col-md-12">
<div id="client_hr_summary_mail_editor_container" style="height: 600px;width:max-content"></div> <div id="client_hr_summary_mail_editor_container" style="height: 600px"></div>
</div> </div>
</div> </div>