FIX_HR_CLAIMSTATUS
This commit is contained in:
parent
e3552768e3
commit
64579c72e3
@ -2474,7 +2474,13 @@ class EmployeeRestController extends AdminController
|
|||||||
$builder->select([
|
$builder->select([
|
||||||
'tm.id',
|
'tm.id',
|
||||||
'tm.ticket_type_id',
|
'tm.ticket_type_id',
|
||||||
'tcs.claim_status AS status',
|
'tcs.claim_status AS original_status',
|
||||||
|
"CASE
|
||||||
|
WHEN tcs.display_name IS NULL OR tcs.display_name = ''
|
||||||
|
THEN claims_status
|
||||||
|
ELSE UPPER(tcs.display_name)
|
||||||
|
END AS status
|
||||||
|
",
|
||||||
'tm.claim_number AS claim_no',
|
'tm.claim_number AS claim_no',
|
||||||
'tm.claim_status_id',
|
'tm.claim_status_id',
|
||||||
'tm.is_head_approved',
|
'tm.is_head_approved',
|
||||||
@ -2590,6 +2596,7 @@ class EmployeeRestController extends AdminController
|
|||||||
if ($history['old_status_value'] === $status) {
|
if ($history['old_status_value'] === $status) {
|
||||||
// Attach modified_by and created_at
|
// Attach modified_by and created_at
|
||||||
// $fields['modified_by'] = $history['modified_by'];
|
// $fields['modified_by'] = $history['modified_by'];
|
||||||
|
$fields['modified_by'] = "";
|
||||||
$fields['modified_at'] = date('d-m-Y h:i A', strtotime($history['created_at']));
|
$fields['modified_at'] = date('d-m-Y h:i A', strtotime($history['created_at']));
|
||||||
// Break after first match (assuming latest entry is enough)
|
// Break after first match (assuming latest entry is enough)
|
||||||
break;
|
break;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user