From 9a6e41ff3b17553aa838acf65cba7c57946c8d35 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Wed, 27 Mar 2024 09:47:42 +0800
Subject: [PATCH] tidy up whiteform report

---
 routes/web.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/routes/web.php b/routes/web.php
index 06e0dc67..246cb94b 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -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>';