Merge branch 'dev' of bitbucket.org:jubilian/nhance into dev
This commit is contained in:
commit
b8b0651b32
@ -6562,7 +6562,12 @@ class EmployeeRestController extends AdminController
|
||||
$dependentName = (string) ($dependentData['dependent_name'] ?? '');
|
||||
$relationship = (string) ($dependentData['relationship'] ?? '');
|
||||
$dependentDob = ! empty($dependentData['dob']) ? date('d/m/Y', strtotime((string) $dependentData['dob'])) : '-';
|
||||
$effectiveDate = ! empty($dependentData['dependent_effective_date']) ? date('d/m/Y', strtotime((string) $dependentData['dependent_effective_date'])) : '-';
|
||||
// $effectiveDate = ! empty($dependentData['dependent_effective_date']) ? date('d/m/Y', strtotime((string) $dependentData['dependent_effective_date'])) : '-';
|
||||
$effectiveRaw = (string) ($dependentData['dependent_effective_date'] ?? '');
|
||||
$effectiveYmd = $effectiveRaw !== '' ? $this->convertDateFormatYMD($effectiveRaw) : null;
|
||||
$effectiveDate = (! empty($effectiveYmd) && strtotime($effectiveYmd) !== false)
|
||||
? date('d/m/Y', strtotime($effectiveYmd))
|
||||
: '-';
|
||||
$createdByType = (string) ($dependentData['created_by_type'] ?? 'USER');
|
||||
$employeeCode = (string) ($dependentData['emp_code'] ?? '');
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user