From c8458404a9499b92c4357a437b6a9dcdfbce09b8 Mon Sep 17 00:00:00 2001
From: Frank John Begornia <frank.begornia@yahoo.com>
Date: Sun, 24 Sep 2023 16:23:39 +0800
Subject: [PATCH] updated shipping fee

---
 .../Controllers/paypal/PaypalController.php     | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/app/Http/Controllers/paypal/PaypalController.php b/app/Http/Controllers/paypal/PaypalController.php
index 063d8ff..035ab99 100755
--- a/app/Http/Controllers/paypal/PaypalController.php
+++ b/app/Http/Controllers/paypal/PaypalController.php
@@ -298,6 +298,13 @@ class PaypalController extends Controller
 
 		$array_storename 		= $UserModel->selectTeamStoreName($cartKey); // email subject
 
+		if (count($array_storename) >= 1  && count($array_storename) <= 1) {
+			
+			if($array_storename[0]->NoShippingFee) {
+				return $shippingFee = 0;
+			}
+		}
+
 		$items 	 		= $m->myCart($cartKey); // item from cart_tmp
 		$getSubtotal 	= $m->getSubtotal($cartKey);
 		// var_dump($getSubtotal);
@@ -388,16 +395,6 @@ class PaypalController extends Controller
 			return $shippingFee = 0;
 		}
 
-		if (count($array_storename) >= 1  && count($array_storename) <= 1) {
-			
-			if($array_storename[0]->NoShippingFee) {
-				return $shippingFee = 0;
-			}
-		}
-
-		// if(count($array_storename) > ) {
-			
-		// }
 
 		return $shippingFee;
 	}