FIX_ISSUE
This commit is contained in:
parent
c58a242099
commit
b1c3cbcb89
@ -317,7 +317,7 @@ class EmployeeRestController extends AdminController
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (\Exception $e) {
|
} catch (\Exception $e) {
|
||||||
return $this->respond(['status' => 'failed','code' => 500,'data' => $e->getMessage(),'message' => "Action failed."], 500);
|
return $this->respond(['status' => 'failed','code' => 500,'data' => $e->getMessage() . $e->getLine(),'message' => "Action failed."], 500);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -412,14 +412,14 @@ class EmployeeRestController extends AdminController
|
|||||||
$data['payable_employee']= $payable_employee;
|
$data['payable_employee']= $payable_employee;
|
||||||
$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);
|
||||||
$data['enrollment_open_date'] = $enrollment_dates['enrollment_open_date'];
|
|
||||||
$data['enrollment_close_date'] = $enrollment_dates['enrollment_close_date'];
|
|
||||||
|
|
||||||
|
if(!empty($other_employee_policy_data)){
|
||||||
// if(!empty($other_employee_policy_data)){
|
$data['enrollment_open_date']= $other_employee_policy_data['enrollment_open_date'] ?? null;
|
||||||
// $data['enrollment_open_date']= $other_employee_policy_data['enrollment_open_date'] ?? null;
|
$data['enrollment_close_date']= $other_employee_policy_data['enrollment_close_date'] ?? null;
|
||||||
// $data['enrollment_close_date']= $other_employee_policy_data['enrollment_close_date'] ?? null;
|
}else{
|
||||||
// }
|
$data['enrollment_open_date'] = $enrollment_dates['enrollment_open_date'] ?? null;
|
||||||
|
$data['enrollment_close_date'] = $enrollment_dates['enrollment_close_date'] ?? null;
|
||||||
|
}
|
||||||
|
|
||||||
// dd($data);
|
// dd($data);
|
||||||
$this->employeePolicyModel->insert($data);
|
$this->employeePolicyModel->insert($data);
|
||||||
@ -639,8 +639,8 @@ class EmployeeRestController extends AdminController
|
|||||||
$data['client_policy_id']= $value->client_policy_id;
|
$data['client_policy_id']= $value->client_policy_id;
|
||||||
$data['basic_cover_si']= $value->basic_cover_si;
|
$data['basic_cover_si']= $value->basic_cover_si;
|
||||||
$data['status'] = 'draft';
|
$data['status'] = 'draft';
|
||||||
$data['enrollment_open_date'] = $enrollment_dates['enrollment_open_date'];
|
$data['enrollment_open_date'] = $enrollment_dates['enrollment_open_date'] ?? null;
|
||||||
$data['enrollment_close_date'] = $enrollment_dates['enrollment_close_date'];
|
$data['enrollment_close_date'] = $enrollment_dates['enrollment_close_date'] ?? null;
|
||||||
|
|
||||||
$this->employeePolicyModel->insert($data);
|
$this->employeePolicyModel->insert($data);
|
||||||
}
|
}
|
||||||
@ -4406,7 +4406,7 @@ class EmployeeRestController extends AdminController
|
|||||||
->where('is_active', 1)
|
->where('is_active', 1)
|
||||||
->first();
|
->first();
|
||||||
|
|
||||||
if(in_array($clientPolicyData['policy_type_id'], [3,4,5])){
|
if(in_array($clientPolicyData['policy_type_id'] ?? null, [3,4,5])){
|
||||||
|
|
||||||
$policy = $this->employeePolicyModel
|
$policy = $this->employeePolicyModel
|
||||||
->select('employee_polices.enrollment_open_date, employee_polices.enrollment_close_date')
|
->select('employee_polices.enrollment_open_date, employee_polices.enrollment_close_date')
|
||||||
@ -4417,19 +4417,18 @@ class EmployeeRestController extends AdminController
|
|||||||
->where('employee_polices.enrollment_close_date >= CURDATE()', null, false)
|
->where('employee_polices.enrollment_close_date >= CURDATE()', null, false)
|
||||||
->where('employee_polices.enrollment_open_date is not null')
|
->where('employee_polices.enrollment_open_date is not null')
|
||||||
->where('employee_polices.enrollment_close_date is not null')
|
->where('employee_polices.enrollment_close_date is not null')
|
||||||
->where('employees.family_floater_key', 'self')
|
|
||||||
->where('employees.is_active', 1)
|
->where('employees.is_active', 1)
|
||||||
->where('employee_polices.is_active', 1)
|
->where('employee_polices.is_active', 1)
|
||||||
->whereIn('employee_polices.status', ['draft', 'enrolled'])
|
->whereIn('employee_polices.status', ['draft', 'enrolled'])
|
||||||
->whereIn('employees.emp_status', ['draft', 'enrolled'])
|
->whereIn('employees.emp_status', ['draft', 'enrolled'])
|
||||||
->first();
|
->first();
|
||||||
|
|
||||||
$enrollment_open_date = $policy['enrollment_open_date'];
|
$enrollment_open_date = $policy['enrollment_open_date'] ?? null;
|
||||||
$enrollment_open_date = $policy['enrollment_close_date'];
|
$enrollment_open_date = $policy['enrollment_close_date'] ?? null;
|
||||||
}
|
}
|
||||||
|
|
||||||
return [
|
return [
|
||||||
'$nrollment_open_date' => $enrollment_open_date,
|
'enrollment_open_date' => $enrollment_open_date,
|
||||||
'enrollment_close_date' => $enrollment_close_date,
|
'enrollment_close_date' => $enrollment_close_date,
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user