diff --git a/routes/web.php b/routes/web.php
index d8ea0f1b..861f5bdf 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -994,8 +994,6 @@ Route::get('/show-white-form-transactions-in-date-range/{from_date}/{to_date}',
echo '
Amount | ';
echo 'Payment Date | ';
echo 'Status | ';
- echo 'Remark | ';
- echo 'Add Remarks | ';
echo '';
echo '';
echo '';
@@ -1006,21 +1004,6 @@ Route::get('/show-white-form-transactions-in-date-range/{from_date}/{to_date}',
echo '' . round($approvedTransaction->amount, 2) . ' | ';
echo '' . $approvedTransaction->created_at->format('d-m-Y h:i A') . ' | ';
echo '' . ApprovalStatus::APPROVAL_STATUS_ID[$approvedTransaction->status] . ' | ';
- $remarks = $approvedTransaction->remarks;
- echo '';
- foreach ($remarks as $remark) {
- echo $remark->created_at->format('d-m-Y | h:i A') . ' - ';
- echo $remark->content;
- echo ' ';
- }
- echo ' | ';
- echo '' ;
- echo '';
- echo ' | ';
echo '';
}
@@ -1043,6 +1026,8 @@ Route::get('/show-white-form-transactions-in-date-range/{from_date}/{to_date}',
echo 'Upload bank slip Date | ';
echo 'PO submit date | ';
echo 'PO approve date | ';
+ echo 'Remark | ';
+ echo 'Add Remarks | ';
echo '';
echo '';
echo '';
@@ -1062,6 +1047,21 @@ Route::get('/show-white-form-transactions-in-date-range/{from_date}/{to_date}',
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') : '' ) : '' ). ' | ';
+ $remarks = $bill->remarks;
+ echo '';
+ foreach ($remarks as $remark) {
+ echo $remark->created_at->format('d-m-Y : h:i A') . ' - ';
+ echo $remark->content;
+ echo ' ';
+ }
+ echo ' | ';
+ echo '' ;
+ echo '';
+ echo ' | ';
echo '';
}