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 09:47:42 +08:00
parent 937610272c
commit 9a6e41ff3b
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
routes/web.php
+5 -2
View File
@@ -900,7 +900,7 @@ Route::get('/show-white-form-transactions-in-date-range/{from_date}/{to_date}',
foreach ($approvedTransactions as $approvedTransaction) {
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;">' . $approvedTransaction->amount . '</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;">' . ApprovalStatus::APPROVAL_STATUS_ID[$approvedTransaction->status] . '</td>';
echo '</tr>';
@@ -918,8 +918,10 @@ Route::get('/show-white-form-transactions-in-date-range/{from_date}/{to_date}',
echo '<thead>';
echo '<tr>';
echo '<th style="border: 1px solid black;">Booking</th>';
echo '<th style="border: 1px solid black;">Amount</th>';
echo '<th style="border: 1px solid black;">Customer payment date</th>';
echo '<th style="border: 1px solid black;">White form date</th>';
echo '<th style="border: 1px solid black;">Supplier</th>';
echo '<th style="border: 1px solid black;">Upload bank slip Date</th>';
echo '<th style="border: 1px solid black;">PO submit date</th>';
echo '<th style="border: 1px solid black;">PO approve date</th>';
@@ -933,10 +935,11 @@ Route::get('/show-white-form-transactions-in-date-range/{from_date}/{to_date}',
foreach ($bills as $bill) {
echo '<tr>';
$payment = $bill->owner;
$po = $payment->owner->transaction()->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;">' . $payment->created_at . '</td>';
echo '<td style="border: 1px solid black;">' . $bill->created_at . '</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;">' . $po ? $po->updated_at : 'Pending Submission' . '</td>';
echo '<td style="border: 1px solid black;">' . $po ? ($po->status === ApprovalStatus::APPROVED ? $po->updated_at : '' ) : '' . '</td>';