From 1520addb588ecaba34f9a1a9826b925b3e75c85d Mon Sep 17 00:00:00 2001 From: bitbucket Date: Sat, 6 Apr 2024 16:49:53 +0530 Subject: [PATCH 1/2] GWM:GMCDependentInsert-EntryOnEmpPolictTable --- app/Controllers/EmployeeRestController.php | 39 +++++++++++++++++++--- app/Models/EmployeePolicyModel.php | 2 +- 2 files changed, 36 insertions(+), 5 deletions(-) diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php index 7a74c23b..a5909186 100644 --- a/app/Controllers/EmployeeRestController.php +++ b/app/Controllers/EmployeeRestController.php @@ -189,7 +189,12 @@ class EmployeeRestController extends AdminController $item->family_floater_key = $this->RelationshipMap($item->relationship); $item->dob = $this->convertDateFormatYMD($item->dob); $employee = $this->employeeModel->insert($item); + if ($employee) { + if(!isset($item->is_addon_value)) + { + $this->createEmployeePolicyData($employee,$item->emp_code,$item->client_id,$item->client_policy_id); + } $Count++; } @@ -211,6 +216,34 @@ class EmployeeRestController extends AdminController } + public function createEmployeePolicyData($employee_id,$emp_code,$client_id,$client_policy_id) + { + + + + $client_policy = $this->clientPolicyModel->where('id', $client_policy_id)->where('client_id', $client_id)->first(); + $policy_terms = json_decode($client_policy['policy_terms']); + $basic_cover_si = $policy_terms->sum_insured; + + $getSlabAndGridData = $this->policesModel->getPolicySlabRatesForEmpOnboard($client_policy_id,$client_id); + $SlabRatesArray = $getSlabAndGridData['slab_rates']; + $premium = $this->findPremiumAmount($SlabRatesArray, $basic_cover_si); + + + + $data['employee_id']= $employee_id; + $data['client_policy_id']= $client_policy_id; + $data['basic_cover_si']= $basic_cover_si; + $data['premium']= $premium; + + $this->employeePolicyModel->insert($data); + + + return true; + + + } + public function RelationshipMap($value){ if ($value === 'Mother' || $value === 'Father') { @@ -274,10 +307,8 @@ class EmployeeRestController extends AdminController public function getEmployeeAndDependenceByClientId() { try { - $empData = $this->employeePolicyModel->getEmployeePolicy( $this->request->getGet('client_id'), $this->request->getGet('client_policy_id')); - // $empData = $this->employeeModel->where('client_id', $this->request->getGet('client_id')) - // ->where('relationship !=', null) - + $empData = $this->employeePolicyModel->getEmployeePolicy( client_id:$this->request->getGet('client_id'),policy_id: $this->request->getGet('client_policy_id'),status:0); + if ($empData) { return $this->respond(['status' => 'success', 'code' => 200, 'data' => $empData], 200); } else { diff --git a/app/Models/EmployeePolicyModel.php b/app/Models/EmployeePolicyModel.php index 8340dbf5..3cdd2177 100644 --- a/app/Models/EmployeePolicyModel.php +++ b/app/Models/EmployeePolicyModel.php @@ -69,7 +69,7 @@ class EmployeePolicyModel extends Model // ----------------------------------------------------------------------------------------------------- public function getEmployeePolicy($client_id,$policy_id,$status) { - $result = $this->select(['employee_polices.*','pm.name as policy_name','im.short_name as insurer_short_name','ib.branch_name as insurer_branch_name','ib.branch_code as insurer_branch_code','tpam.name as tpa_name','tpam.short_name as tpa_short_name','tpab.branch_code as tpa_branch_code','cm.client_name','cm.short_name as client_short_name','emp.relationship','emp.relationship_code','emp.change_event','emp.emp_code','emp.name','emp.email_corporate','emp.dob','emp.gender','emp.emp_status','emp.is_active as emp_is_active']) + $result = $this->select(['employee_polices.*','pm.name as policy_name','im.short_name as insurer_short_name','ib.branch_name as insurer_branch_name','ib.branch_code as insurer_branch_code','tpam.name as tpa_name','tpam.short_name as tpa_short_name','tpab.branch_code as tpa_branch_code','cm.client_name','cm.short_name as client_short_name','emp.relationship','emp.relationship_code','emp.change_event','emp.emp_code','emp.name','emp.email_corporate','emp.dob','emp.gender','emp.emp_status','emp.is_active as emp_is_active','emp.mobile as mobile']) ->join('employees emp', 'employee_polices.employee_id = emp.id') ->join('client_policy cp', 'employee_polices.client_policy_id = cp.id') //cp - client policy ->join('policies pm', 'cp.policy_id = pm.id') //pm - policy master From 47a1141f1fa9776cbba8a47ba3dc57836defe7dd Mon Sep 17 00:00:00 2001 From: velz Date: Mon, 8 Apr 2024 17:12:03 +0530 Subject: [PATCH 2/2] FIX_FILE_STATUS_NOT_UPDATE_AND_JOBWORKER_HANDLE_ADDED --- app/Controllers/EmployeeServiceController.php | 14 +++++++++++++- app/Controllers/JobWorker.php | 2 +- app/Helpers/excel_util_helper.php | 10 +++++----- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/app/Controllers/EmployeeServiceController.php b/app/Controllers/EmployeeServiceController.php index d3428448..9ee925a8 100644 --- a/app/Controllers/EmployeeServiceController.php +++ b/app/Controllers/EmployeeServiceController.php @@ -530,8 +530,13 @@ class EmployeeServiceController extends AdminController $data = calculate_premimum($family,$policy_terms,$slab_details,$file); // dd($data); $employee_data_group_by_family[$emp_id] = $data; - //$this->employeesOnboardProcess(['familiy_data' => $data,'file' => $file]); + $this->employeesOnboardProcess(['familiy_data' => $data,'file' => $file]); } + + $this->fileModel->where('id', $file_id)->set(['status' => 'success','reason' => ''])->update(); + $this->myLogger->logme("error",'{file_id} uploaded success',['file_id' => $file_id]); + + } else if(isset($params['client_policy_id']))//handle data from enrollment to inception { @@ -663,6 +668,9 @@ class EmployeeServiceController extends AdminController // print_r($endorsement_data); } + + $this->fileModel->where('id', $file_id)->set(['status' => 'success','reason' => ''])->update(); + $this->myLogger->logme("error",'{file_id} uploaded success',['file_id' => $file_id]); return $endorsement_data; } @@ -721,6 +729,8 @@ class EmployeeServiceController extends AdminController } + $this->fileModel->where('id', $file_id)->set(['status' => 'success','reason' => ''])->update(); + $this->myLogger->logme("error",'{file_id} uploaded success',['file_id' => $file_id]); return true; } @@ -789,6 +799,8 @@ class EmployeeServiceController extends AdminController } + $this->fileModel->where('id', $file_id)->set(['status' => 'success','reason' => ''])->update(); + $this->myLogger->logme("error",'{file_id} uploaded success',['file_id' => $file_id]); return true; } diff --git a/app/Controllers/JobWorker.php b/app/Controllers/JobWorker.php index 6977a94b..00b060ae 100644 --- a/app/Controllers/JobWorker.php +++ b/app/Controllers/JobWorker.php @@ -14,7 +14,7 @@ class JobWorker extends AdminController * Constructs the class */ - private static $event_class_mapping = ['add' => ['type' => 'HC','handler' => 'App\\Helpers\\HttpRequestHelper'], 'sub' => ['type' => 'CC','handler' => 'App\\Controllers\\Jobs\SubJob'],'fancy_date_time_format' => [ 'type' => 'HF','handler' => 'fancy_date_time_format'],'addNumber' => ['type' => 'HC','handler' => 'App\\Model\\HttpRequestHelper'],'excelFileFormatValidation' => ['type' => 'CC','handler' => 'App\\Controllers\\EmployeeServiceController'],'excelFileDataValidation' => ['type' => 'CC','handler' => 'App\\Controllers\\EmployeeServiceController'],'employeeOnboard' => ['type' => 'CC','handler' => 'App\\Controllers\\EmployeeServiceController'],'send_email' => ['type' => 'HC','handler' => 'App\\Helpers\\MailHelper'],'bulk_mail' => ['type' => 'HC','handler' => 'App\\Helpers\\MailHelper']]; + private static $event_class_mapping = ['add' => ['type' => 'HC','handler' => 'App\\Helpers\\HttpRequestHelper'], 'sub' => ['type' => 'CC','handler' => 'App\\Controllers\\Jobs\SubJob'],'fancy_date_time_format' => [ 'type' => 'HF','handler' => 'fancy_date_time_format'],'addNumber' => ['type' => 'HC','handler' => 'App\\Model\\HttpRequestHelper'],'excelFileFormatValidation' => ['type' => 'CC','handler' => 'App\\Controllers\\EmployeeServiceController'],'excelFileDataValidation' => ['type' => 'CC','handler' => 'App\\Controllers\\EmployeeServiceController'],'employeesOnboardPreprocess' => ['type' => 'CC','handler' => 'App\\Controllers\\EmployeeServiceController'],'employeeDisembark' => ['type' => 'CC','handler' => 'App\\Controllers\\EmployeeServiceController'],'employeesSIEnhanceProcess' => ['type' => 'CC','handler' => 'App\\Controllers\\EmployeeServiceController'],'employeesCorrectionProcess' => ['type' => 'CC','handler' => 'App\\Controllers\\EmployeeServiceController'],'send_email' => ['type' => 'HC','handler' => 'App\\Helpers\\MailHelper'],'bulk_mail' => ['type' => 'HC','handler' => 'App\\Helpers\\MailHelper']]; public function __construct() { // echo 'HiC';//die(); diff --git a/app/Helpers/excel_util_helper.php b/app/Helpers/excel_util_helper.php index 46ccf8ee..534c4b61 100644 --- a/app/Helpers/excel_util_helper.php +++ b/app/Helpers/excel_util_helper.php @@ -793,7 +793,7 @@ if (!function_exists('premium_calculation_manager')) if($slab_value['si'] == $employee_received_si && ($slab_value['age_from'] <= $max_age && $slab_value['age_to'] >= $max_age)) { - + $emp_data['policy_details']['basic_cover_si'] = (strtolower($emp_data['relationship']) == 'self' ? $employee_received_si : null); $emp_data['policy_details']['date_coverage'] = (strtolower($emp_data['relationship']) == 'self' ? (isset($emp_data['policy_details']['date_coverage']) ? $emp_data['policy_details']['date_coverage'] : $policy_terms['policy_start_date']) : ""); $emp_data['policy_details']['policy_end_date'] = (strtolower($emp_data['relationship']) == 'self' ? $policy_terms['policy_end_date'] : ""); $emp_data['policy_details']['days'] = (strtolower($emp_data['relationship']) == 'self' ? calculate_days_bw_dates($policy_terms['policy_start_date'],$policy_terms['policy_end_date'])->days : 0); @@ -807,7 +807,7 @@ if (!function_exists('premium_calculation_manager')) break; case "11": //GMC - Maximum count per Family - $max_count = $emp_data['temp']['maxage']; + $max_count = $emp_data['temp']['maxcount']; $employee_received_band = $emp_data['temp']['band']; $employee_received_si = $emp_data['policy_details']['basic_cover_si']; $emp_data['policy_details']['basic_cover_si'] = null; @@ -817,10 +817,10 @@ if (!function_exists('premium_calculation_manager')) if($slab_value['si'] == $employee_received_si && ($slab_value['grade'] == $employee_received_band)) { //calculate premium based on count - $famility_si_covered = $employee_received_si * $max_count; - $famility_si_covered = ($famility_si_covered >= $slab_value['max_si'] ? $slab_value['max_si'] : $famility_si_covered); + $familiy_si_covered = $employee_received_si * $max_count; + $familiy_si_covered = ($familiy_si_covered >= $slab_value['max_si'] ? $slab_value['max_si'] : $familiy_si_covered); - $emp_data['policy_details']['basic_cover_si'] = (strtolower($emp_data['relationship']) == 'self' ? $famility_si_covered : 0); + $emp_data['policy_details']['basic_cover_si'] = (strtolower($emp_data['relationship']) == 'self' ? $familiy_si_covered : null); $emp_data['policy_details']['date_coverage'] = (strtolower($emp_data['relationship']) == 'self' ? (isset($emp_data['policy_details']['date_coverage']) ? $emp_data['policy_details']['date_coverage'] : $policy_terms['policy_start_date']) : ""); $emp_data['policy_details']['policy_end_date'] = (strtolower($emp_data['relationship']) == 'self' ? $policy_terms['policy_end_date'] : ""); $emp_data['policy_details']['days'] = (strtolower($emp_data['relationship']) == 'self' ? calculate_days_bw_dates($policy_terms['policy_start_date'],$policy_terms['policy_end_date'])->days : 0);