diff --git a/app/Controllers/DashboardController.php b/app/Controllers/DashboardController.php index 7c0ef32b..4df9136a 100755 --- a/app/Controllers/DashboardController.php +++ b/app/Controllers/DashboardController.php @@ -459,7 +459,7 @@ class DashboardController extends AdminController $mail_result = sendMailNotification::sendMailNotification('member_reminder_mail', $params); // dd($mail_result); // $this->myLogger->logme('error', 'Mail sent result: ' . json_encode($mail_result)); - $reminder_whole_mail[] = $mail_result[0]; + $reminder_whole_mail[] = $mail_result; } } @@ -550,7 +550,7 @@ class DashboardController extends AdminController // Send the mail notification $mail_result = sendMailNotification::sendMailNotification('member_reminder_mail', $params); // $this->myLogger->logme('error', 'Mail sent result: ' . json_encode($mail_result)); - $reminder_whole_mail[] = $mail_result[0]; + $reminder_whole_mail[] = $mail_result; } } diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php index 46d46589..42e8d530 100755 --- a/app/Controllers/EmployeeRestController.php +++ b/app/Controllers/EmployeeRestController.php @@ -745,6 +745,7 @@ class EmployeeRestController extends AdminController //make an entry in DB $file_id = $this->fileModel->insert(['file_name' => $filename, 'client_id' => $client_id, 'policy_id' => $policy_id, 'created_by' => $employee_id, 'status' => 'inprogress', 'action' => 'enrollment', 'client_branch_id' => $client_branch_id]); //here field policy_id have client_policy_id and not policy id from policy master + $this->myLogger->logme("error", '{file_id} - client uploaded success', ['file_id' => $file_id]); $empServiceController = new EmployeeServiceController(); @@ -965,6 +966,7 @@ class EmployeeRestController extends AdminController } } } + $employee_policy = $this->employeePolicyModel->checkExistingEmpPolicy(['employee_id' => $emp_id,'client_policy_id' => $policy_id]); $emp_policy_data =[ 'employee_id'=>$emp_id, @@ -972,10 +974,10 @@ class EmployeeRestController extends AdminController 'status'=> 'draft', 'date_coverage' => $date_coverage, 'payable_employee' => check_pay_by_employee_or_company($client_policy['policy_terms'], $dataToInsert[$a]['relationship']), - 'basic_cover_si'=>isset($basic_cover_si[$a]) ? $basic_cover_si[$a] : null + 'basic_cover_si'=>isset($basic_cover_si[$a]) ? $basic_cover_si[$a] : null, + 'file_id' => isset($employee_policy['file_id']) && $employee_policy['file_id'] != '' ? $employee_policy['file_id'] : $file_id, ]; - $employee_policy = $this->employeePolicyModel->checkExistingEmpPolicy(['employee_id' => $emp_id,'client_policy_id' => $policy_id]); // print_r($employee_policy); die; if ($employee_policy) { foreach ($employee_policy as $existing_policy) { diff --git a/app/Controllers/EmployeeServiceController.php b/app/Controllers/EmployeeServiceController.php index a924dd87..7eafb908 100755 --- a/app/Controllers/EmployeeServiceController.php +++ b/app/Controllers/EmployeeServiceController.php @@ -1638,6 +1638,7 @@ class EmployeeServiceController extends AdminController $value['id'] = $employee[0]['id']; $value['emp_status'] = 'active'; $value['client_branch_id'] = $file['client_branch_id']; + $value['file_id'] = isset($employee[0]['file_id']) && $employee[0]['file_id'] != '' ? $employee[0]['file_id'] : $file['id'] ; $log_message = 'Update Employee - '.$employee[0]['name'].'('.$employee[0]['emp_code'].') with PK '.$employee[0]['id']; // $this->myLogger->logme('error',('Update - ' . $employee[0]['id'].' - '. $employee[0]['emp_code'] .' - '.$employee[0]['name'])); // echo 'insert emp'; @@ -1648,6 +1649,7 @@ class EmployeeServiceController extends AdminController $value['created_by'] = $file['created_by']; $value['client_branch_id'] = $file['client_branch_id']; $value['family_floater_key'] = generate_family_floater_key($value['relationship']); + $value['file_id'] = isset($employee[0]['file_id']) && $employee[0]['file_id'] != '' ? $employee[0]['file_id'] : $file['id'] ; $log_message = 'Insert Employee- '.$value['name'] .'('.$value['emp_code'] .') with PK '; // $this->myLogger->logme('error',('Insert - ' . $value['emp_code'] .' - '. $value['name'])); // echo 'update emp'; @@ -1675,7 +1677,7 @@ class EmployeeServiceController extends AdminController $policy_data['id'] = $employee_policy[0]['id']; $policy_data['status'] = 'active'; $policy_data['payable_employee'] = check_pay_by_employee_or_company($policy_details['policy_terms'], $value['relationship']); - + $policy_data['file_id'] = isset($employee_policy[0]['file_id']) && $employee_policy[0]['file_id'] != '' ? $employee_policy[0]['file_id'] : $file['id'] ; $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'; } @@ -1686,12 +1688,14 @@ class EmployeeServiceController extends AdminController $policy_data['created_by'] = $file['created_by']; $policy_data['status'] = 'active'; $policy_data['payable_employee'] = check_pay_by_employee_or_company($policy_details['policy_terms'], $value['relationship']); - + $policy_data['file_id'] = $file['id']; $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); + // log_message('error',json_encode($policy_data)); + // dd($this->employeePolicyModel->save($policy_data)); + $res = $this->employeePolicyModel->save($policy_data); + // if($res){log_message('error','ths the resul'.$res);} if(isset($policy_data['id'])) { $emp_policy_id = $policy_data['id']; @@ -2093,7 +2097,7 @@ public function getFileMetaDataByFileId($file_id, $status = 'success'){ $policy_data['id'] = $employee_policy[0]['id']; $policy_data['status'] = 'draft'; $policy_data['payable_employee'] = check_pay_by_employee_or_company($policy_details['policy_terms'], $value['relationship']); - + $policy_data['file_id'] = isset($employee_policy[0]['file_id']) && $employee_policy[0]['file_id'] != '' ? $employee_policy[0]['file_id'] : $file_id ; $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'; } @@ -2104,11 +2108,13 @@ public function getFileMetaDataByFileId($file_id, $status = 'success'){ $policy_data['created_by'] = $file['created_by']; $policy_data['status'] = 'draft'; $policy_data['payable_employee'] = check_pay_by_employee_or_company($policy_details['policy_terms'], $value['relationship']); - + $policy_data['file_id'] = $file_id; $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'; } + log_message('error',json_encode($policy_data)); + // dd($policy_data); $this->employeePolicyModel->save($policy_data); $emp_policy_id = $this->employeePolicyModel->getInsertID(); $this->myLogger->logme('error',$log_message); diff --git a/app/Models/EmployeePolicyModel.php b/app/Models/EmployeePolicyModel.php index 8c98dc21..f536cb37 100755 --- a/app/Models/EmployeePolicyModel.php +++ b/app/Models/EmployeePolicyModel.php @@ -35,6 +35,7 @@ class EmployeePolicyModel extends Model "claim_status", 'ecard_sent_status', 'payable_employee', + 'file_id' ]; // Callbacks diff --git a/app/Views/file_list.php b/app/Views/file_list.php index 6c6c36d8..cf7b4d6a 100755 --- a/app/Views/file_list.php +++ b/app/Views/file_list.php @@ -7,32 +7,7 @@ .reload:hover { cursor: pointer; } -.custom-dropdown-menu { - display: none; - position: absolute; - background-color: #ffffff !important; - border: 1px solid rgba(0, 0, 0, 0.15); - border-radius: 0.25rem; - padding: 0.5rem 0; - min-width: 10rem; - z-index: 9999; - box-shadow: 0 0 10px rgba(0, 0, 0, 0.1); -} -.custom-dropdown-menu .dropdown-item { - display: block !important; - width: 100% !important; - padding: 0.5rem 1rem !important; - color: #212529 !important; - text-decoration: none !important; - background-color: transparent !important; -} - -.custom-dropdown-menu .dropdown-item:hover { - background-color: #f8f9fa !important; - color: #16181b !important; - cursor: pointer !important; -}