diff --git a/app/Http/Controllers/CharacteristicsController.php b/app/Http/Controllers/CharacteristicsController.php index 0e1a40d..81f4acb 100644 --- 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') : '',