From 1186d090bba04ada683aa8b995898bd68ab48833 Mon Sep 17 00:00:00 2001
From: Frank John Begornia <frank.begornia@yahoo.com>
Date: Sun, 24 Sep 2023 16:17:22 +0800
Subject: [PATCH] updated

---
 app/Http/Controllers/paypal/PaypalController.php | 12 ++++++++++++
 app/Models/user/UserModel.php                    |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/paypal/PaypalController.php b/app/Http/Controllers/paypal/PaypalController.php
index d21f1fc..063d8ff 100755
--- a/app/Http/Controllers/paypal/PaypalController.php
+++ b/app/Http/Controllers/paypal/PaypalController.php
@@ -296,6 +296,7 @@ class PaypalController extends Controller
 		}
 
 
+		$array_storename 		= $UserModel->selectTeamStoreName($cartKey); // email subject
 
 		$items 	 		= $m->myCart($cartKey); // item from cart_tmp
 		$getSubtotal 	= $m->getSubtotal($cartKey);
@@ -387,6 +388,17 @@ 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;
 	}
 
diff --git a/app/Models/user/UserModel.php b/app/Models/user/UserModel.php
index 27b4263..de14c93 100755
--- a/app/Models/user/UserModel.php
+++ b/app/Models/user/UserModel.php
@@ -305,7 +305,7 @@ class UserModel extends Model
 	function selectTeamStoreName($ck)
 	{
 		$pdo 	= 	DB::connection()->getPdo();
-		$query	=	$pdo->prepare("SELECT t.Id, t.StoreName FROM orders AS o INNER JOIN teamstores AS t ON t.Id = o.StoreId WHERE o.CartKey = :ck GROUP BY o.StoreId ORDER BY t.StoreName ASC");
+		$query	=	$pdo->prepare("SELECT t.Id, t.StoreName, t.NoShippingFee FROM orders AS o INNER JOIN teamstores AS t ON t.Id = o.StoreId WHERE o.CartKey = :ck GROUP BY o.StoreId ORDER BY t.StoreName ASC");
 		$query->execute(array(':ck' => $ck));
 		$row = $query->fetchAll(\PDO::FETCH_OBJ);
 		return $row;