Merge branch 'dev' of bitbucket.org:jubilian/nhance into dev
This commit is contained in:
commit
985871aee2
@ -1640,6 +1640,7 @@ class EmployeeServiceController extends AdminController
|
|||||||
$value['updated_by'] = $file['created_by'];
|
$value['updated_by'] = $file['created_by'];
|
||||||
$value['id'] = $employee[0]['id'];
|
$value['id'] = $employee[0]['id'];
|
||||||
$value['emp_status'] = 'active';
|
$value['emp_status'] = 'active';
|
||||||
|
$value['family_floater_key'] = generate_family_floater_key($value['relationship']);
|
||||||
$value['client_branch_id'] = $file['client_branch_id'];
|
$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'] ;
|
$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'];
|
$log_message = 'Update Employee - '.$employee[0]['name'].'('.$employee[0]['emp_code'].') with PK '.$employee[0]['id'];
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user