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 '
';
echo '| ' . $approvedTransaction->owner->marking . ' | ';
- echo '' . $approvedTransaction->amount . ' | ';
+ echo '' . round($approvedTransaction->amount, 2) . ' | ';
echo '' . $approvedTransaction->created_at . ' | ';
echo '' . ApprovalStatus::APPROVAL_STATUS_ID[$approvedTransaction->status] . ' | ';
echo '
';
@@ -918,8 +918,10 @@ Route::get('/show-white-form-transactions-in-date-range/{from_date}/{to_date}',
echo '';
echo '';
echo '| Booking | ';
+ echo 'Amount | ';
echo 'Customer payment date | ';
echo 'White form date | ';
+ echo 'Supplier | ';
echo 'Upload bank slip Date | ';
echo 'PO submit date | ';
echo 'PO approve date | ';
@@ -933,10 +935,11 @@ Route::get('/show-white-form-transactions-in-date-range/{from_date}/{to_date}',
foreach ($bills as $bill) {
echo '
';
$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 '| ' . $payment->owner->marking . ' | ';
echo '' . $payment->created_at . ' | ';
echo '' . $bill->created_at . ' | ';
+ 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 : '' ) : '' . ' | ';