cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-19 04:23:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

tidy up whiteform report

Browse Source
This commit is contained in:
Omair Saleh
2024-03-27 10:11:02 +08:00
parent b9765fbcf7
commit bb1cb6d44e
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
routes/web.php
+7 -6
View File
@@ -901,7 +901,7 @@ Route::get('/show-white-form-transactions-in-date-range/{from_date}/{to_date}',
echo '<tr>'; echo '<tr>';
echo '<td style="border: 1px solid black;"><a href="' . \route('booking.details', $approvedTransaction->owner->marking) . '" target="_blank">' . $approvedTransaction->owner->marking . '</a></td>'; echo '<td style="border: 1px solid black;"><a href="' . \route('booking.details', $approvedTransaction->owner->marking) . '" target="_blank">' . $approvedTransaction->owner->marking . '</a></td>';
echo '<td style="border: 1px solid black;">' . round($approvedTransaction->amount, 2) . '</td>'; echo '<td style="border: 1px solid black;">' . round($approvedTransaction->amount, 2) . '</td>';
echo '<td style="border: 1px solid black;">' . $approvedTransaction->created_at . '</td>'; echo '<td style="border: 1px solid black;">' . $approvedTransaction->created_at->format('d-m-Y h:i A') . '</td>';
echo '<td style="border: 1px solid black;">' . ApprovalStatus::APPROVAL_STATUS_ID[$approvedTransaction->status] . '</td>'; echo '<td style="border: 1px solid black;">' . ApprovalStatus::APPROVAL_STATUS_ID[$approvedTransaction->status] . '</td>';
echo '</tr>'; echo '</tr>';
} }
@@ -937,12 +937,13 @@ Route::get('/show-white-form-transactions-in-date-range/{from_date}/{to_date}',
$payment = $bill->owner; $payment = $bill->owner;
$po = $payment->owner->transactions()->where('type', TransactionType::PURCHASE_ORDER)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED])->first(); $po = $payment->owner->transactions()->where('type', TransactionType::PURCHASE_ORDER)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED])->first();
echo '<td style="border: 1px solid black;"><a href="' . \route('booking.details', $bill->owner->owner->marking) . '" target="_blank">' . $payment->owner->marking . '</a></td>'; echo '<td style="border: 1px solid black;"><a href="' . \route('booking.details', $bill->owner->owner->marking) . '" target="_blank">' . $payment->owner->marking . '</a></td>';
echo '<td style="border: 1px solid black;">' . $payment->created_at . '</td>'; echo '<td style="border: 1px solid black;">' . round($payment->amount, 2) . '</td>';
echo '<td style="border: 1px solid black;">' . $bill->created_at . '</td>'; echo '<td style="border: 1px solid black;">' . $payment->created_at->format('d-m-Y h:i A') . '</td>';
echo '<td style="border: 1px solid black;">' . $bill->created_at->format('d-m-Y h:i A') . '</td>';
echo '<td style="border: 1px solid black;">' . $bill->issuerCompany->name . '</td>'; echo '<td style="border: 1px solid black;">' . $bill->issuerCompany->name . '</td>';
echo '<td style="border: 1px solid black;">' . $bill->status === ApprovalStatus::APPROVED ? $bill->updated_at : 'Pending Upload' . '</td>'; echo '<td style="border: 1px solid black; color: '.($bill->status === ApprovalStatus::APPROVED ? "green" : "red").';">' . ($bill->status === ApprovalStatus::APPROVED ? $bill->updated_at->format('d-m-Y h:i A') : 'Pending Upload') . '</td>';
echo '<td style="border: 1px solid black;">' . ($po ? $po->updated_at : 'Pending Submission') . '</td>'; echo '<td style="border: 1px solid black; color: '.($po ? "green" : "red").';">' . ($po ? $po->updated_at->format('d-m-Y h:i A') : 'Pending Submission') . '</td>';
echo '<td style="border: 1px solid black;">' . ($po ? ($po->status === ApprovalStatus::APPROVED ? $po->updated_at : '' ) : '' ). '</td>'; echo '<td style="border: 1px solid black;">' . ($po ? ($po->status === ApprovalStatus::APPROVED ? $po->updated_at->format('d-m-Y h:i A') : '' ) : '' ). '</td>';
echo '</tr>'; echo '</tr>';
} }