diff --git a/routes/web.php b/routes/web.php index 6f4d12e7..1143c48c 100644 --- a/routes/web.php +++ b/routes/web.php @@ -901,7 +901,7 @@ Route::get('/show-white-form-transactions-in-date-range/{from_date}/{to_date}', echo ''; echo '' . $approvedTransaction->owner->marking . ''; echo '' . round($approvedTransaction->amount, 2) . ''; - echo '' . $approvedTransaction->created_at . ''; + echo '' . $approvedTransaction->created_at->format('d-m-Y h:i A') . ''; echo '' . ApprovalStatus::APPROVAL_STATUS_ID[$approvedTransaction->status] . ''; echo ''; } @@ -937,12 +937,13 @@ Route::get('/show-white-form-transactions-in-date-range/{from_date}/{to_date}', $payment = $bill->owner; $po = $payment->owner->transactions()->where('type', TransactionType::PURCHASE_ORDER)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED])->first(); echo '' . $payment->owner->marking . ''; - echo '' . $payment->created_at . ''; - echo '' . $bill->created_at . ''; + echo '' . round($payment->amount, 2) . ''; + echo '' . $payment->created_at->format('d-m-Y h:i A') . ''; + echo '' . $bill->created_at->format('d-m-Y h:i A') . ''; echo '' . $bill->issuerCompany->name . ''; - echo '' . $bill->status === ApprovalStatus::APPROVED ? $bill->updated_at : 'Pending Upload' . ''; - echo '' . ($po ? $po->updated_at : 'Pending Submission') . ''; - echo '' . ($po ? ($po->status === ApprovalStatus::APPROVED ? $po->updated_at : '' ) : '' ). ''; + echo '' . ($bill->status === ApprovalStatus::APPROVED ? $bill->updated_at->format('d-m-Y h:i A') : 'Pending Upload') . ''; + echo '' . ($po ? $po->updated_at->format('d-m-Y h:i A') : 'Pending Submission') . ''; + echo '' . ($po ? ($po->status === ApprovalStatus::APPROVED ? $po->updated_at->format('d-m-Y h:i A') : '' ) : '' ). ''; echo ''; }