From 6f75a25b1013e52cc2df8db0ff5c27911f004871 Mon Sep 17 00:00:00 2001
From: franknstayn <begorniafrankjohn@gmail.com>
Date: Thu, 24 Feb 2022 21:20:36 +0800
Subject: [PATCH] updated shipping fee

---
 .../Controllers/paypal/PaypalController.php   | 22 +++++++++----------
 resources/views/emails/orders.blade.php       |  4 ++--
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/Http/Controllers/paypal/PaypalController.php b/app/Http/Controllers/paypal/PaypalController.php
index 32a5943..b7b16fb 100755
--- a/app/Http/Controllers/paypal/PaypalController.php
+++ b/app/Http/Controllers/paypal/PaypalController.php
@@ -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") {
diff --git a/resources/views/emails/orders.blade.php b/resources/views/emails/orders.blade.php
index 06fdad6..f913b3e 100755
--- a/resources/views/emails/orders.blade.php
+++ b/resources/views/emails/orders.blade.php
@@ -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>