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

updated shipping fee

Browse Source
This commit is contained in:
franknstayn
2022-02-24 21:20:36 +08:00
parent fe12960c00
commit 6f75a25b10
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -336,17 +336,16 @@ class PaypalController extends Controller
}
}
// var_dump($item->ShippingCostId);
if ($item->ShippingCostId == 1) {
$getSmallItemQty += $item->Quantity;
} else if ($item->ShippingCostId == 2) {
$getBulkyItemQty += $item->Quantity;
} else if ($item->ShippingCostId == 3) {
$getMaskItemQty += $item->Quantity;
} else if ($item->ShippingCostId == 4) {
$getDGSItemQty += $item->Quantity;
}
// if ($item->ShippingCostId == 1) {
// $getSmallItemQty += $item->Quantity;
// } else if ($item->ShippingCostId == 2) {
// $getBulkyItemQty += $item->Quantity;
// } else if ($item->ShippingCostId == 3) {
// $getMaskItemQty += $item->Quantity;
// } else if ($item->ShippingCostId == 4) {
// $getDGSItemQty += $item->Quantity;
// }
$getSmallItemQty += $item->Quantity;
$CAShippingfee += $item->Quantity; // for canada
}
@@ -372,6 +371,7 @@ class PaypalController extends Controller
$getBulkyItemQty = ceil($getBulkyItemQty / 1) * 8;
$getMaskItemQty = ceil($getMaskItemQty / 25) * 8;
$getDGSItemQty = ceil($getDGSItemQty / 4) * 5;
$shippingFee = $getSmallItemQty + $getBulkyItemQty + $getMaskItemQty + $getDGSItemQty;
if ($countryCode == "CA") {

4
resources/views/emails/orders.blade.php
View File

@@ -686,8 +686,8 @@
<table role="presentation" border="0" cellpadding="0" cellspacing="0">
<tr>
<td class="content-block">
<span class="apple-link">Copyright &copy 2019 <a
href="https://crewsportswear.com">crewsportswear.com</a>. All rights
<span class="apple-link">Copyright &copy {{ date('Y') }} <a
href="https://merchbay.com">merchbay.com</a>. All rights
reserved.</span>
</td>
</tr>