Merge pull request 'ternary issue solved for mail status column on request approval Get API method' (#592 ) from ranjith-dev into master

Reviewed-on: #592
ternary issue solved for mail status column on request approval Get API method
2026-05-12 08:44:16 +00:00 · 2026-05-12 14:13:57 +05:30
1 changed files with 2 additions and 2 deletions
--- a/app/Http/Controllers/CharacteristicsController.php
+++ b/app/Http/Controllers/CharacteristicsController.php
@@ -5160,7 +5160,7 @@ 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' : '-',
+                        'mail_status' => ($row->mail_status == 'Sent') ? 'Sent-M1' : (($row->mail_status == 'Sent-Mail2') ? 'Sent-M2' : (($row->mail_status == 'Sent-Mail3') ? 'Sent-M3' : '-')),
                        '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') : '',
@@ -5193,7 +5193,7 @@ 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' : '-',
+                        'mail_status' => ($row->mail_status == 'Sent') ? 'Sent-M1' : (($row->mail_status == 'Sent-Mail2') ? 'Sent-M2' : (($row->mail_status == 'Sent-Mail3') ? 'Sent-M3' : '-')),
                        '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') : '',
Author	SHA1	Message	Date
jothi	f9d870073f	Merge pull request 'ternary issue solved for mail status column on request approval Get API method' (#592 ) from ranjith-dev into master Some checks failed Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Has been cancelled Details Reviewed-on: #592	2026-05-12 08:44:16 +00:00
dhanabalan	4699de9a77	ternary issue solved for mail status column on request approval Get API method Some checks failed Gemini PR Review / Gemini PR Review (pull_request) Waiting to run Details Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (pull_request) Waiting to run Details Laravel Larastan / larastan (pull_request) Waiting to run Details Laravel Pint / pint (pull_request) Waiting to run Details Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Has been cancelled Details	2026-05-12 14:13:57 +05:30