From f58dea32ac8bb39a67b9b9820eef8668da229806 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Wed, 7 Aug 2024 18:27:58 +0800
Subject: [PATCH] revert fixed pending_orders table

---
 routes/web.php | 48 +++++++++++++++++++-----------------------------
 1 file changed, 19 insertions(+), 29 deletions(-)

diff --git a/routes/web.php b/routes/web.php
index 1a654013..76446093 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -403,32 +403,24 @@ Route::get('/pending_orders', function(){
         ->orderBy('updated_at', 'desc')
         ->get();
         
-        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>Booking</th>';
-    echo '<th>Payment Type</th>';
-    echo '<th>Payment Currency</th>';
-    echo '<th>Payment Amount</th>';
-    echo '<th>Customer</th>';
-    echo '<th></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>';
-    echo '<th>Cust Supplier Acc Name</th>';
-    echo '</tr>';
-    echo '</thead>';
-    echo '<tbody>';
+    echo '<table border="1">';
+    // echo '<thead>';
+    // echo '<tr>';
+    // echo '<th>Client Booking 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>Service</th>';
+    // echo '<th>Days</th>';
+    // echo '<th>Cust Supplier Acc Type</th>';
+    // echo '<th>Cust Supplier Acc Name</th>';
+    // echo '</tr>';
+    // echo '</thead>';
+    // echo '<tbody>';
     $i = 0;
     foreach ($payments as $payment){
         $booking = $payment->owner;
@@ -446,15 +438,13 @@ Route::get('/pending_orders', function(){
 
         echo '<tr>';
         echo '<td>'.$payment->updated_at->format('d-M-y').'</td>';
-        echo '<td>'.$booking->marking.'</td>';
         echo '<td>'.\App\Classes\ValueObjects\Constants\PaymentMethodType::PAYMENT_METHODS_ID[$payment->payment_method].'</td>';
+        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>'.$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>';
         echo '<td>'.$booking->service->name.'</td>';
         echo '<td>'.$payment->updated_at->diffForHumans().'</td>';
         echo '<td>'.$bankType.'</td>';