From ea06152dbf86ca417bd1f3d1ccaa7ab92aae75bf Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Wed, 7 Aug 2024 10:51:27 +0800
Subject: [PATCH 1/3] update pending_orders table header

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

diff --git a/routes/web.php b/routes/web.php
index c4ab51f7..a66457a6 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -406,16 +406,16 @@ Route::get('/pending_orders', function(){
     echo '<table border="1">';
     echo '<thead>';
     echo '<tr>';
-    echo '<th>Client Booking Date</th>';
+    echo '<th>Booking Updated Date</th>';
     echo '<th>Payment Type</th>';
-    echo '<th>Marking</th>';
-    echo '<th>Customer Payment Currency</th>';
-    echo '<th>Customer Payment Amount</th>';
-    echo '<th>Reference No.</th>';
-    echo '<th>Booking Amount Currency</th>';
-    echo '<th>CNY</th>';
+    echo '<th>Booking</th>';
+    echo '<th>Payment Currency</th>';
+    echo '<th>Payment Amount</th>';
+    echo '<th>Customer</th>';
+    echo '<th>Booking Currency</th>';
+    echo '<th>Booking Amount</th>';
     echo '<th>Service</th>';
-    echo '<th>Days</th>';
+    echo '<th>Payment Updated</th>';
     echo '<th>Cust Supplier Acc Type</th>';
     echo '<th>Cust Supplier Acc Name</th>';
     echo '</tr>';

From 764f242e871c1b346e777b246684f66a41bd0b58 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Wed, 7 Aug 2024 13:13:26 +0800
Subject: [PATCH 2/3] fix pending_orders table header

---
 routes/web.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/routes/web.php b/routes/web.php
index a66457a6..e912b49d 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -411,9 +411,11 @@ Route::get('/pending_orders', function(){
     echo '<th>Booking</th>';
     echo '<th>Payment Currency</th>';
     echo '<th>Payment Amount</th>';
+    echo '<th></th>';
     echo '<th>Customer</th>';
     echo '<th>Booking Currency</th>';
     echo '<th>Booking Amount</th>';
+    echo '<th></th>';
     echo '<th>Service</th>';
     echo '<th>Payment Updated</th>';
     echo '<th>Cust Supplier Acc Type</th>';
@@ -442,9 +444,11 @@ Route::get('/pending_orders', function(){
         echo '<td>'.$booking->marking.'</td>';
         echo '<td>'.$payment->currency->short_code.'</td>';
         echo '<td>'.number_format(bcsub($payment->amount, $refunds, 7), 5, '.', '').'</td>';
+        echo '<td></td>';
         echo '<td>'.$booking->company->reference.'</td>';
         echo '<td>'.$payment->original_currency->short_code.'</td>';
         echo '<td>'.number_format(bcsub($payment->original_amount, $original_refunds, 7), 5, '.', '').'</td>';
+        echo '<td></td>';
         echo '<td>'.$booking->service->name.'</td>';
         echo '<td>'.$payment->updated_at->diffForHumans().'</td>';
         echo '<td>'.$bankType.'</td>';

From 8a0005aa175ecee0185230117fe446a49e7de482 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Wed, 7 Aug 2024 15:40:24 +0800
Subject: [PATCH 3/3] fix pending_orders table header

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

diff --git a/routes/web.php b/routes/web.php
index e912b49d..1a654013 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -403,16 +403,22 @@ Route::get('/pending_orders', function(){
         ->orderBy('updated_at', 'desc')
         ->get();
         
-    echo '<table border="1">';
+        echo '
+        <style>
+            table { border-collapse: collapse; }
+            td, th { border-left: 1px solid black;}
+            td:first-child, th:first-child { border-left: none; }
+        </style>';
+    echo '<table class="pending_orders">';
     echo '<thead>';
     echo '<tr>';
     echo '<th>Booking Updated Date</th>';
-    echo '<th>Payment Type</th>';
     echo '<th>Booking</th>';
+    echo '<th>Payment Type</th>';
     echo '<th>Payment Currency</th>';
     echo '<th>Payment Amount</th>';
-    echo '<th></th>';
     echo '<th>Customer</th>';
+    echo '<th></th>';
     echo '<th>Booking Currency</th>';
     echo '<th>Booking Amount</th>';
     echo '<th></th>';
@@ -440,12 +446,12 @@ Route::get('/pending_orders', function(){
 
         echo '<tr>';
         echo '<td>'.$payment->updated_at->format('d-M-y').'</td>';
-        echo '<td>'.\App\Classes\ValueObjects\Constants\PaymentMethodType::PAYMENT_METHODS_ID[$payment->payment_method].'</td>';
         echo '<td>'.$booking->marking.'</td>';
+        echo '<td>'.\App\Classes\ValueObjects\Constants\PaymentMethodType::PAYMENT_METHODS_ID[$payment->payment_method].'</td>';
         echo '<td>'.$payment->currency->short_code.'</td>';
         echo '<td>'.number_format(bcsub($payment->amount, $refunds, 7), 5, '.', '').'</td>';
-        echo '<td></td>';
         echo '<td>'.$booking->company->reference.'</td>';
+        echo '<td></td>';
         echo '<td>'.$payment->original_currency->short_code.'</td>';
         echo '<td>'.number_format(bcsub($payment->original_amount, $original_refunds, 7), 5, '.', '').'</td>';
         echo '<td></td>';