poc/pds
1
0
Fork 1
Code Issues Pull Requests 12 Actions 14 Packages Projects Releases Wiki Activity

Merge pull request 'Added mail status and triggered at column to request approval on Get API method' (#591) from ranjith-dev into master
Some checks failed
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Has been cancelled
Details

Browse Source 
Reviewed-on: #591
This commit was merged in pull request #591.
This commit is contained in:
jothi
2026-05-12 07:43:41 +00:00
parent 1a31fb6f4e 196117f07f
commit 81ee36f956
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/CharacteristicsController.php
View File

@@ -5160,6 +5160,8 @@ class CharacteristicsController extends Controller
'approver_status_3' => $row->approver_status3 ?? '',
'approver_remark_3' => $row->approver_remark3 ?? '',
'approved_at_3' => $row->approved3_at ?? '', // ? $row->approved3_at->format('d-m-Y H:i:s') : '',
'mail_status' => ($row->mail_status == 'Sent') ? 'Sent-M1' : ($row->mail_status == 'Sent-Mail2') ? 'Sent-M2' : ($row->mail_status == 'Sent-Mail3') ? 'Sent-M2' : '-',
'triggered_at' => $row->trigger_at ?? '',
'requested_by' => ($row->created_by == 'Admin') ? 'jothi' : $row->created_by ?? '',
'requested_at' => $row->created_at ? $row->created_at->format('Y-m-d H:i:s') : '',
];
@@ -5191,6 +5193,8 @@ class CharacteristicsController extends Controller
'approver_status_3' => $row->approver_status3 ?? '',
'approver_remark_3' => $row->approver_remark3 ?? '',
'approved_at_3' => $row->approved3_at ?? '', // ? $row->approved3_at->format('d-m-Y H:i:s') : '',
'mail_status' => ($row->mail_status == 'Sent') ? 'Sent-M1' : ($row->mail_status == 'Sent-Mail2') ? 'Sent-M2' : ($row->mail_status == 'Sent-Mail3') ? 'Sent-M2' : '-',
'triggered_at' => $row->trigger_at ?? '',
'requested_by' => ($row->created_by == 'Admin') ? 'jothi' : $row->created_by ?? '',
'requested_at' => $row->created_at ? $row->created_at->format('Y-m-d H:i:s') : '',
];