From 879d6abdbdd5a4b29a6810dfd047cf8f49b1fb5d Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 03:33:08 +0800
Subject: [PATCH] convert 1688 purchase order to po on document upload

---
 .../Convert1688PurchaseOrderToProductList.php | 41 +++++++++----------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/app/Classes/Modules/Bookings/Services/Convert1688PurchaseOrderToProductList.php b/app/Classes/Modules/Bookings/Services/Convert1688PurchaseOrderToProductList.php
index 26c519ef..934adea3 100644
--- a/app/Classes/Modules/Bookings/Services/Convert1688PurchaseOrderToProductList.php
+++ b/app/Classes/Modules/Bookings/Services/Convert1688PurchaseOrderToProductList.php
@@ -35,27 +35,6 @@ class Convert1688PurchaseOrderToProductList
         $discount = array_filter($footer, function($var) { return preg_match("/(Discount|优惠)/", $var); });
         $discount = (float) filter_var(reset($discount), FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION );
 
-        if($shipping > 0) {
-            $productList[] = [
-                'stockCode' => '',
-                'description' => 'Shipping Fee',
-                'quantity' =>  1,
-                'unit_price' =>  $shipping,
-                'total' => $shipping
-            ];
-        }
-
-        if($discount > 0) {
-            $productList[] = [
-                'stockCode' => '',
-                'description' => 'Discount',
-                'quantity' =>  1,
-                'unit_price' =>  $discount * -1,
-                'total' => $discount * -1
-            ];
-        }
-
-
         array_shift($tables);
 
         foreach ($tables as $table){
@@ -81,6 +60,26 @@ class Convert1688PurchaseOrderToProductList
             }
         }
 
+        if($shipping > 0) {
+            $productList[] = [
+                'stockCode' => '',
+                'description' => 'Shipping Fee',
+                'quantity' =>  1,
+                'unit_price' =>  $shipping,
+                'total' => $shipping
+            ];
+        }
+
+        if($discount > 0) {
+            $productList[] = [
+                'stockCode' => '',
+                'description' => 'Discount',
+                'quantity' =>  1,
+                'unit_price' =>  $discount * -1,
+                'total' => $discount * -1
+            ];
+        }
+
         return $productList;
     }
 }