From 04526853fdc2946858808b2782a27df61cd24c29 Mon Sep 17 00:00:00 2001 From: velz Date: Wed, 4 Dec 2024 19:55:57 +0530 Subject: [PATCH 1/2] FIX_ENROLMENT_IS_ADD_ON_KEY&DOC_FORMAT&SELF_NOT_AVAIL_ISSUE&GET_VERIFIED_USER_API --- app/Controllers/EmployeeServiceController.php | 463 +++++++----------- .../RestAuthenticationController.php | 8 +- public/sample_excel/enrollment.xlsx | Bin 7762 -> 7777 bytes 3 files changed, 190 insertions(+), 281 deletions(-) diff --git a/app/Controllers/EmployeeServiceController.php b/app/Controllers/EmployeeServiceController.php index 0d2cc5f9..7297c26c 100755 --- a/app/Controllers/EmployeeServiceController.php +++ b/app/Controllers/EmployeeServiceController.php @@ -1036,7 +1036,7 @@ class EmployeeServiceController extends AdminController } } - if(($file['action'] == 'inception' || $file['action'] == 'missed_inception' || $file['action'] == 'addition' || $file['action'] == 'enrollment') || ($policy_details['policy_type_id'] == 3 && $is_self_available_in_policy_terms) && ($policy_details['base_policy'] == null || $policy_details['base_policy'] == 0)) // 3 is GMC parents dep addon) + if((($file['action'] == 'inception' || $file['action'] == 'missed_inception' || $file['action'] == 'addition' || $file['action'] == 'enrollment') || ($policy_details['policy_type_id'] == 3 && $is_self_available_in_policy_terms)) && ($policy_details['base_policy'] == null || $policy_details['base_policy'] == 0)) // 3 is GMC parents dep addon) { $res = check_self_available_in_family($family,$file['action']); if(!$res['is_self_found']) @@ -1049,7 +1049,7 @@ class EmployeeServiceController extends AdminController //check self avaialbe either same policy DB level(i.e.) gMC parents if($file['action'] == 'dependent_addition' || ($policy_details['policy_type_id'] == 3 && !$is_self_available_in_policy_terms)) // 3 is GMC parents as base policy not as dep addon) { - $self_details = $this->employeeModel->getEmpFamilybyEmpCode(emp_code: trim($emp_id),client_id: $file['client_id'],emp_status: ['active'],policy_status:['active'],client_branch_id:[ $file['client_branch_id'] ],relationship:['self']); + $self_details = $this->employeeModel->getEmpFamilybyEmpCode(emp_code: trim($emp_id),client_id: $file['client_id'],emp_status: ['active','draft','enrolled'],policy_status:['active','draft','enrolled'],client_branch_id:[ $file['client_branch_id'] ],relationship:['self']); // dd($self_details); if(!count($self_details)) { @@ -1928,297 +1928,200 @@ public function getFileMetaDataByFileId($file_id, $status = 'success'){ } + public function employeesEnrollmentInsert($params) + { -public function employeesEnrollmentInsert($params) -{ - - helper('excel_util_helper'); - //get file name - $file_id = $params['file_id']; - $file = $this->fileModel->find($file_id); - // dd($file); - $return = []; - if (!isset($file)) { - //file not found in DB - return array('status' => false, 'msg' => 'file not found in DB'); - } - $file_name_with_path = WRITEPATH . "/uploads/excel/" . $file['file_name']; - - //check physical file - if (!file_exists($file_name_with_path)) { - //file not found update status and reason - $message = "Physical file not found"; - // echo $message; - $this->myLogger->logme('error', ($message . ' for file id ' . $file_id)); - $this->fileModel->where('id', $file_id)->set(['status' => 'failed', 'reason' => json_encode(['error_summary' => array_count_values([5]), 'error_data' => $message])])->update(); - return array('error_summary' => [5], 'error_data' => $message); - } - - //get excel data - $spreadsheet = \PhpOffice\PhpSpreadsheet\IOFactory::load($file_name_with_path); - $sheet = $spreadsheet->getActiveSheet(); - - $highestRowAndColumn = $sheet->getHighestRowAndColumn(); - $result = ['error_type' => 2, 'error_summary' => [], 'error_data' => []]; - $columns_to_check = $this->enrollment_excel_columns; - $keys = array_keys($columns_to_check); - $allowedHighestColumn = end($columns_to_check); - $excel_data = $sheet->rangeToArray('A1:' . $allowedHighestColumn['col_cell_name'] . $highestRowAndColumn['row']); - // print_r($keys);die(); - //get existing units in the current branch - $existing_units = $this->clientBranchModel->getExisitingUnits(client_id: $file['client_id'], client_branch_id: $file['client_branch_id']); - //remove header - unset($excel_data[0]); - // dd($excel_data); - $emp_emails = []; - - //check is welcome notification enabled - $notification = $this->notificationModel->where('client_id', $file['client_id'])->where('template_name', 'member_welcome_mail')->first(); - // dd($notification); - $client_details = $this->clientModel->where('id', $file['client_id'])->first(); - -// dd($excel_data); - $emp_emails = []; // Initialize an empty array to store employee email. - - foreach ($excel_data as $key => $row) { - $is_row_empty = check_row_is_empty_or_null($row); - if (!$is_row_empty) { - $value = []; - $policy_data = []; - $temp_unit = ''; - if (empty($row[12])) { - $temp_unit = $existing_units[0]; + helper('excel_util_helper'); + //get file name + $file_id = $params['file_id']; + $file = $this->fileModel->find($file_id); + // dd($file); + $return = []; + if(!isset($file)) + { + //file not found in DB + return array('status' => false, 'msg' => 'file not found in DB'); + } + $file_name_with_path = WRITEPATH."/uploads/excel/".$file['file_name']; + + //check physical file + if(!file_exists($file_name_with_path)) + { + //file not found update status and reason + $message = "Physical file not found"; + // echo $message; + $this->myLogger->logme('error',($message . ' for file id ' . $file_id)); + $this->fileModel->where('id', $file_id)->set(['status' => 'failed','reason' => json_encode(['error_summary' => array_count_values([5]),'error_data' => $message])])->update(); + return array('error_summary' => [5], 'error_data' => $message); } - $value['emp_code'] = $row[1]; - $value['name'] = $row[2]; - $value['doj'] = (!empty($row[3]) ? convert_string_to_date($row[3], 'Y-m-d') : null); - $value['gender'] = $row[4]; - $value['relationship'] = ucfirst(trim($row[5])); - $value['dob'] = convert_string_to_date($row[6], 'Y-m-d'); - $value['email_corporate'] = $row[7]; - $value['mobile'] = $row[8]; - $value['band'] = $row[10]; - $value['basic_pay'] = $row[11]; - $value['unit'] = $temp_unit; - $value['family_floater_key'] = null; - $value['client_id'] = $file['client_id']; - $value['client_branch_id'] = $file['client_branch_id']; - $value['file_id'] = $file_id; + //get excel data + $spreadsheet = \PhpOffice\PhpSpreadsheet\IOFactory::load($file_name_with_path); + $sheet = $spreadsheet->getActiveSheet(); + + $highestRowAndColumn = $sheet->getHighestRowAndColumn(); + $result = ['error_type' => 2,'error_summary' => [], 'error_data' => [] ]; + $columns_to_check = $this->enrollment_excel_columns; + $keys = array_keys($columns_to_check); + $allowedHighestColumn = end($columns_to_check); + $excel_data = $sheet->rangeToArray('A1:' . $allowedHighestColumn['col_cell_name'] . $highestRowAndColumn['row']); + // print_r($keys);die(); + //get existing units in the current branch + $existing_units = $this->clientBranchModel->getExisitingUnits(client_id: $file['client_id'],client_branch_id: $file['client_branch_id']); + //remove header + unset($excel_data[0]); + // dd($excel_data); + $emp_emails = []; + //check is welcome notification enabled + $notification = $this->notificationModel->where('client_id',$file['client_id'])->where('template_name','member_welcome_mail')->first(); + // dd($notification); + $client_details = $this->clientModel->where('id', $file['client_id'])->first(); + $policy_details = $this->clientPolicyModel->where('id', $file['policy_id'])->first(); - $value['temp']['emp_id'] = null; // dummy value for using exisitng funciton in model - if (strtolower(trim($value['relationship'])) === 'mother' || strtolower(trim($value['relationship'])) === 'father') { - $relation = 'parent'; - } else if (strtolower(trim($value['relationship'])) === 'son' || strtolower(trim($value['relationship'])) === 'daughter') { - $relation = 'child'; - } else if (strtolower(trim($value['relationship'])) === 'father in law' || strtolower(trim($value['relationship'])) === 'mother in law') { - $relation = 'parent_in_law'; - } else if (strtolower(trim($value['relationship'])) === 'spouse') { - $relation = 'spouse'; - } else { - $relation = 'self'; - } - $value['family_floater_key'] = $relation; + // dd($policy_details); - $policy_data['basic_cover_si'] = $row[9]; - $policy_data['date_coverage'] = $row[13]; - $policy_data['client_policy_id'] = $file['policy_id']; + foreach ($excel_data as $key => $row) + { + $is_row_empty = check_row_is_empty_or_null($row); + if(!$is_row_empty) + { - $employee = $this->employeeModel->checkExistingEmployee($value, $file['client_branch_id']); - unset($value['temp']); - //save employee table - // dd($employee['id']); - if ($employee !== null) { - $value['updated_by'] = $file['created_by']; - $value['id'] = $employee['id']; - $value['emp_status'] = 'draft'; - - $log_message = 'Enrollment Update Employee - ' . $employee['name'] . '(' . $employee['emp_code'] . ') with PK ' . $employee['id']; - } else { - $value['emp_status'] = 'draft'; - $value['created_by'] = $file['created_by']; - $log_message = 'Enrollment Insert Employee- ' . $value['name'] . '(' . $value['emp_code'] . ') with PK '; - } - - $this->employeeModel->save($value); - if (isset($value['id'])) { - $emp_id = $value['id']; - } else { - $emp_id = $this->employeeModel->getInsertID(); - $log_message .= $emp_id; - } - - // $emp_id = $this->employeeModel->getInsertID(); - // if($emp_id != 0){ $log_message .= $emp_id; } - // else{ $emp_id = $employee['id']; } - - $this->myLogger->logme('error', $log_message); - - //save policy table - $employee_policy = $this->employeePolicyModel->checkExistingEmpPolicy(['employee_id' => $emp_id, 'client_policy_id' => $file['policy_id']]); - if (count($employee_policy)) { - $policy_data['updated_by'] = $file['created_by']; - $policy_data['id'] = $employee_policy[0]['id']; - $policy_data['status'] = 'draft'; - - $log_message = 'Update Employee Policy for ' . $value['name'] . '(' . $value['emp_code'] . ') with PK- ' . $employee_policy[0]['id'] . ' client policy ID ' . $employee_policy[0]['client_policy_id'] . ' with SI ' . $policy_data['basic_cover_si']; - // echo 'insert policy'; - } else { - $policy_data['employee_id'] = $emp_id; - $policy_data['client_policy_id'] = $file['policy_id']; - $policy_data['created_by'] = $file['created_by']; - $policy_data['status'] = 'draft'; - $log_message = 'Insert Employee Policy for ' . $value['name'] . '(' . $value['emp_code'] . ') - client policy id -' . $file['policy_id'] . ' - with SI ' . $policy_data['basic_cover_si']; - // echo 'update policy'; - } - - $this->employeePolicyModel->save($policy_data); - // $emp_policy_id = $this->employeePolicyModel->getInsertID(); - $emp_policy_id = isset($policy_data['id']) ? $policy_data['id'] : $this->employeePolicyModel->getInsertID(); - $this->myLogger->logme('error', $log_message); - - //save email of self for send mail later - if (isset($notification) && $notification['enabled'] == 1 && $notification['mail_content'] != '') { - if (strtolower($value['relationship']) == 'self' && $value['email_corporate'] != "") { - $params['dataToInsert'] = $value; //holds employee master data - $params['notification'] = $notification; - $params['client_data'] = $client_details; - $params['common'] = [ - 'client_id' => $file['client_id'], - 'client_branch_id' => $file['client_branch_id'], - 'client_policy_id' => $file['policy_id'], - 'employee_policy_id' => $emp_policy_id ?? null, - 'employee_id' => $emp_id, - 'mail_type' => 'member_welcome_mail', - ]; - - //store email and mail content via helper to send notification - $emp_emails[] = sendMailNotification::sendMailNotification('member_welcome_mail', $params); - // Kint::dump($emp_emails); - // Kint::dump($key.'-'.count($excel_data)); - // if mail count is 20 send bulk mail and reset emp_emails variable - // if (count($emp_emails) == 20 || $key == count($excel_data) ) { - // $job_details = new Jobs(); - // $r = Jobs::addJob(['job_name' => 'bulk_mail','payload' => $emp_emails]); - // // echo 'Mail triggered'; - // $emp_emails = []; - // } - - } - $value['family_floater_key'] = $relation; - - $policy_data['basic_cover_si'] = $row[9]; - $policy_data['date_coverage'] = $row[13]; - $policy_data['client_policy_id'] = $file['policy_id']; - - $employee = $this->employeeModel->checkExistingEmployee($value, $file['client_branch_id']); - unset($value['temp']); - //save employee table - // dd($employee['id']); - if ($employee !== null) { - $value['updated_by'] = $file['created_by']; - $value['id'] = $employee['id']; - $value['emp_status'] = 'draft'; - - $log_message = 'Enrollment Update Employee - ' . $employee['name'] . '(' . $employee['emp_code'] . ') with PK ' . $employee['id']; - } else { - $value['emp_status'] = 'draft'; - $value['created_by'] = $file['created_by']; - $log_message = 'Enrollment Insert Employee- ' . $value['name'] . '(' . $value['emp_code'] . ') with PK '; - } - - $this->employeeModel->save($value); - if (isset($value['id'])) { - $emp_id = $value['id']; - } else { - $emp_id = $this->employeeModel->getInsertID(); - $log_message .= $emp_id; - } - - // $emp_id = $this->employeeModel->getInsertID(); - // if($emp_id != 0){ $log_message .= $emp_id; } - // else{ $emp_id = $employee['id']; } - - $this->myLogger->logme('error', $log_message); - - //save policy table - $employee_policy = $this->employeePolicyModel->checkExistingEmpPolicy(['employee_id' => $emp_id, 'client_policy_id' => $file['policy_id']]); - if (count($employee_policy)) { - $policy_data['updated_by'] = $file['created_by']; - $policy_data['id'] = $employee_policy[0]['id']; - $policy_data['status'] = 'draft'; - - $log_message = 'Update Employee Policy for ' . $value['name'] . '(' . $value['emp_code'] . ') with PK- ' . $employee_policy[0]['id'] . ' client policy ID ' . $employee_policy[0]['client_policy_id'] . ' with SI ' . $policy_data['basic_cover_si']; - // echo 'insert policy'; - } else { - $policy_data['employee_id'] = $emp_id; - $policy_data['client_policy_id'] = $file['policy_id']; - $policy_data['created_by'] = $file['created_by']; - $policy_data['status'] = 'draft'; - $log_message = 'Insert Employee Policy for ' . $value['name'] . '(' . $value['emp_code'] . ') - client policy id -' . $file['policy_id'] . ' - with SI ' . $policy_data['basic_cover_si']; - // echo 'update policy'; - } - - $this->employeePolicyModel->save($policy_data); - $emp_policy_id = $this->employeePolicyModel->getInsertID(); - $this->myLogger->logme('error', $log_message); - - //save email of self for send mail later - if (isset($notification) && $notification['enabled'] == 1 && $notification['mail_content'] != '') { - if (strtolower($value['relationship']) == 'self' && $value['email_corporate'] != "") { - $params['dataToInsert'] = $value; //holds employee master data - $params['notification'] = $notification; - $params['client_data'] = $client_details; - $params['common'] = [ - 'client_id' => $file['client_id'], - 'client_branch_id' => $file['client_branch_id'], - 'client_policy_id' => $file['policy_id'], - 'employee_policy_id' => $emp_policy_id ?? null, - 'employee_id' => $emp_id, - 'mail_type' => 'member_welcome_mail', - ]; - - //store email and mail content via helper to send notification - $emp_emails[] = sendMailNotification::sendMailNotification('member_welcome_mail', $params); - // Kint::dump($emp_emails); - // Kint::dump($key.'-'.count($excel_data)); - // if mail count is 20 send bulk mail and reset emp_emails variable - // if (count($emp_emails) == 20 || $key == count($excel_data)) { - // $job_details = new Jobs(); - // $r = Jobs::addJob(['job_name' => 'bulk_mail', 'payload' => $emp_emails]); - // // echo 'Mail triggered'; - // $emp_emails = []; - // } + $value = []; + $policy_data = []; + $temp_unit = ''; + if(empty($row[12])) + { + $temp_unit = $existing_units[0]; } + + $value['emp_code'] = $row[1]; + $value['name'] = $row[2]; + $value['doj'] = (!empty($row[3]) ? convert_string_to_date($row[3],'Y-m-d'): null); + $value['gender'] = $row[4]; + $value['relationship'] = ucfirst(trim($row[5])); + $value['dob'] = convert_string_to_date($row[6],'Y-m-d'); + $value['email_corporate'] = $row[7]; + $value['mobile'] = $row[8]; + $value['band'] = $row[10]; + $value['basic_pay'] = $row[11]; + $value['unit'] = $temp_unit; + $value['family_floater_key'] = null; + $value['client_id'] = $file['client_id']; + $value['client_branch_id'] = $file['client_branch_id']; + $value['file_id'] = $file_id; + $value['is_addon_value'] = $policy_details['policy_type_id'] == 3 ? 1 : 0; + + $value['temp']['emp_id'] = null; // dummy value for using exisitng funciton in model + if (strtolower(trim($value['relationship'])) === 'mother' || strtolower(trim($value['relationship'])) === 'father') { + $relation = 'parent'; + } else if(strtolower(trim($value['relationship'])) === 'son' || strtolower(trim($value['relationship'])) === 'daughter'){ + $relation = 'child'; + }else if(strtolower(trim($value['relationship'])) === 'father in law' || strtolower(trim($value['relationship'])) === 'mother in law'){ + $relation = 'parent_in_law'; + }else if(strtolower(trim($value['relationship'])) === 'spouse'){ + $relation = 'spouse'; + }else{ + $relation = 'self'; + } + $value['family_floater_key'] = $relation; + + $policy_data['basic_cover_si'] = $row[9]; + $policy_data['date_coverage'] = $row[13] != "" && $row[13] != null ? change_date_format($row[13],'d-M-Y','Y-m-d') : null; + $policy_data['client_policy_id'] = $file['policy_id']; + + $employee = $this->employeeModel->checkExistingEmployee($value,$file['client_branch_id']); + unset($value['temp']); + //save employee table + // dd($employee['id']); + if($employee !== null) + { + $value['updated_by'] = $file['created_by']; + $value['id'] = $employee['id']; + $value['emp_status'] = 'draft'; + + $log_message = 'Enrollment Update Employee - '.$employee['name'].'('.$employee['emp_code'].') with PK '.$employee['id']; + } + else + { + $value['emp_status'] = 'draft'; + $value['created_by'] = $file['created_by']; + $log_message = 'Enrollment Insert Employee- '.$value['name'] .'('.$value['emp_code'] .') with PK '; + } + + $this->employeeModel->save($value); + if (isset($value['id'])) + { $emp_id = $value['id']; } + else { $emp_id = $this->employeeModel->getInsertID(); + $log_message .= $emp_id; + } + + // $emp_id = $this->employeeModel->getInsertID(); + // if($emp_id != 0){ $log_message .= $emp_id; } + // else{ $emp_id = $employee['id']; } + + $this->myLogger->logme('error',$log_message); + + //save policy table + $employee_policy = $this->employeePolicyModel->checkExistingEmpPolicy(['employee_id' => $emp_id,'client_policy_id' => $file['policy_id']]); + if(count($employee_policy)) + { + $policy_data['updated_by'] = $file['created_by']; + $policy_data['id'] = $employee_policy[0]['id']; + $policy_data['status'] = 'draft'; + + $log_message = 'Update Employee Policy for '. $value['name'].'('. $value['emp_code'].') with PK- ' . $employee_policy[0]['id'] .' client policy ID '.$employee_policy[0]['client_policy_id'].' with SI '.$policy_data['basic_cover_si']; + // echo 'insert policy'; + } + else + { + $policy_data['employee_id'] = $emp_id; + $policy_data['client_policy_id'] = $file['policy_id']; + $policy_data['created_by'] = $file['created_by']; + $policy_data['status'] = 'draft'; + $log_message = 'Insert Employee Policy for '. $value['name'].'('. $value['emp_code'].') - client policy id -'. $file['policy_id'].' - with SI '.$policy_data['basic_cover_si']; + // echo 'update policy'; + } + + $this->employeePolicyModel->save($policy_data); + $emp_policy_id = $this->employeePolicyModel->getInsertID(); + $this->myLogger->logme('error',$log_message); + + //save email of self for send mail later + if (isset($notification) && $notification['enabled'] == 1 && $notification['mail_content'] != '') + { + if(strtolower($value['relationship']) == 'self' && $value['email_corporate'] != "") + { + $params['dataToInsert'] = $value; //holds employee master data + $params['notification'] = $notification; + $params['client_data'] = $client_details; + + //store email and mail content via helper to send notification + $emp_emails[] = sendMailNotification::sendMailNotification('member_welcome_mail', $params); + } + } + }// endof if row is empty check + } //end of for loop + + + // for bulk mail queue job push + if (!empty($emp_emails) && count($emp_emails) > 0) { + + $emp_emails = array_chunk($emp_emails, 20); + + foreach ($emp_emails as $key => $value) { + $job_details = new Jobs(); + $r = Jobs::addJob(['job_name' => 'bulk_mail', 'payload' => $value]); } - } // endof if row is empty check - } //end of for loop - - // dd($emp_emails); - - // for bulk mail queue job push - if (!empty($emp_emails) && count($emp_emails) > 0) { - - $emp_emails = array_chunk($emp_emails, 20); - - foreach ($emp_emails as $key => $value) { - $job_details = new Jobs(); - $r = Jobs::addJob(['job_name' => 'bulk_mail', 'payload' => $value]); } - } - $this->fileModel->where('id', $file_id)->set(['status' => 'success', 'reason' => ''])->update(); - $this->myLogger->logme("error", '{file_id} uploaded success', ['file_id' => $file_id]); + $this->fileModel->where('id', $file_id)->set(['status' => 'success','reason' => ''])->update(); + $this->myLogger->logme("error",'{file_id} uploaded success',['file_id' => $file_id]); - $this->setPullNotification($this->getFileMetaDataByFileId($file_id, 'success')); + $this->setPullNotification($this->getFileMetaDataByFileId($file_id,'success')); - return true; - - - } - -} + return true; + }//end of employeesEnrollmentInsert } \ No newline at end of file diff --git a/app/Controllers/RestAuthenticationController.php b/app/Controllers/RestAuthenticationController.php index 14b61d7d..a7b77c09 100755 --- a/app/Controllers/RestAuthenticationController.php +++ b/app/Controllers/RestAuthenticationController.php @@ -102,7 +102,13 @@ class RestAuthenticationController extends AdminController { $employeeData = $this->employeeModel->where('id', $this->request->getJSON()->employee_id)->where('relationship', 'self')->first(); }else{ - $employeeData = $this->employeeModel->where('mobile', $mobile_number)->where('relationship', 'self')->first(); + //$employeeData = $this->employeeModel->where('mobile', $mobile_number)->where('relationship', 'self')->first(); + $employeeData = $this->employeeModel->where('mobile', $mobile_number) + ->where('relationship', 'self') + ->where('emp_status !=', 'truncated') + ->where('is_active', 1) + ->first(); + } diff --git a/public/sample_excel/enrollment.xlsx b/public/sample_excel/enrollment.xlsx index 568e3b5e8e6c534f0f3fbb277383bb8cf3bfb1d6..b23bb77d685b223cb8f2c38ac154cab19f580aee 100755 GIT binary patch delta 3529 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 delta 3503 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 Date: Wed, 4 Dec 2024 19:57:08 +0530 Subject: [PATCH 2/2] FIX_DOC_FORMAT_HANDLED_IN_HR_UPLOAD --- 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 abb15d65..8a1eed85 100755 --- a/app/Controllers/EmployeeRestController.php +++ b/app/Controllers/EmployeeRestController.php @@ -845,7 +845,7 @@ class EmployeeRestController extends AdminController 'basic_pay'=> $extra['11'][$index], 'unit'=> isset($extra['12'][$index]) ? $extra['12'][$index] : null, 'client_branch_id' => $client_branch_id, - 'date_coverage' => $extra['13'][$index] + 'date_coverage' => $extra['13'][$index] != "" && $extra['13'][$index] != null ? change_date_format($extra['13'][$index],'d-M-Y','Y-m-d') : null ]; $basic_cover_si_value = null;