From 20cb00ed248da5d86b3dfc88ee3b6cdd1cd66a50 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Thu, 25 Apr 2024 16:48:39 +0800
Subject: [PATCH] update add remark on white form transactions

---
 routes/web.php | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

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 '<th style="border: 1px solid black;">Amount</th>';
     echo '<th style="border: 1px solid black;">Payment Date</th>';
     echo '<th style="border: 1px solid black;">Status</th>';
-    echo '<th style="border: 1px solid black;">Remark</th>';
-    echo '<th style="border: 1px solid black;">Add Remarks</th>';
     echo '</tr>';
     echo '</thead>';
     echo '<tbody>';
@@ -1006,21 +1004,6 @@ Route::get('/show-white-form-transactions-in-date-range/{from_date}/{to_date}',
         echo '<td style="border: 1px solid black;">' . round($approvedTransaction->amount, 2) . '</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>';
-        $remarks = $approvedTransaction->remarks;
-        echo '<td style="border: 1px solid black;">';
-            foreach ($remarks as $remark) {
-                echo $remark->created_at->format('d-m-Y | h:i A') . ' - ';
-                echo $remark->content;
-                echo '<br>';
-            }
-        echo '</td>';
-        echo '<td style="border: 1px solid black;">' ;
-        echo '<form method="post" action="' . route('transaction.create-remark', ['id' => $approvedTransaction->id]) . '">';
-        echo '<input type="text" name="content" placeholder="Enter remark" required>';
-        echo '<button type="submit">Add Remark</button>';
-        echo csrf_field();
-        echo '</form>';
-        echo '</td>';
         echo '</tr>';
     }
 
@@ -1043,6 +1026,8 @@ Route::get('/show-white-form-transactions-in-date-range/{from_date}/{to_date}',
     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>';
+    echo '<th style="border: 1px solid black;">Remark</th>';
+    echo '<th style="border: 1px solid black;">Add Remarks</th>';
     echo '</tr>';
     echo '</thead>';
     echo '<tbody>';
@@ -1062,6 +1047,21 @@ Route::get('/show-white-form-transactions-in-date-range/{from_date}/{to_date}',
         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; 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->format('d-m-Y h:i A') : '' ) : '' ). '</td>';
+        $remarks = $bill->remarks;
+        echo '<td style="border: 1px solid black;">';
+            foreach ($remarks as $remark) {
+                echo $remark->created_at->format('d-m-Y : h:i A') . ' - ';
+                echo $remark->content;
+                echo '<br>';
+            }
+        echo '</td>';
+        echo '<td style="border: 1px solid black;">' ;
+        echo '<form method="post" style="display:flex; margin: 10px" action="' . route('transaction.create-remark', ['id' => $bill->id]) . '">';
+        echo '<input type="text" name="content" placeholder="Enter remark" required>';
+        echo '<button type="submit">Add</button>';
+        echo csrf_field();
+        echo '</form>';
+        echo '</td>';
         echo '</tr>';
     }