webmaster/merchbay
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

updated

Browse Source
This commit is contained in:
Frank John Begornia
2023-09-24 16:17:22 +08:00
parent 33b7ab7b7f
commit 1186d090bb
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Http/Controllers/paypal/PaypalController.php
View File

@@ -296,6 +296,7 @@ class PaypalController extends Controller
} }
$array_storename = $UserModel->selectTeamStoreName($cartKey); // email subject
$items = $m->myCart($cartKey); // item from cart_tmp $items = $m->myCart($cartKey); // item from cart_tmp
$getSubtotal = $m->getSubtotal($cartKey); $getSubtotal = $m->getSubtotal($cartKey);
@@ -387,6 +388,17 @@ class PaypalController extends Controller
return $shippingFee = 0; 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; return $shippingFee;
} }

2
app/Models/user/UserModel.php
View File

@@ -305,7 +305,7 @@ class UserModel extends Model
function selectTeamStoreName($ck) function selectTeamStoreName($ck)
{ {
$pdo = DB::connection()->getPdo(); $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)); $query->execute(array(':ck' => $ck));
$row = $query->fetchAll(\PDO::FETCH_OBJ); $row = $query->fetchAll(\PDO::FETCH_OBJ);
return $row; return $row;