diff --git a/app/Http/Controllers/paypal/PaypalController.php b/app/Http/Controllers/paypal/PaypalController.php index cc55599..49ec306 100755 --- a/app/Http/Controllers/paypal/PaypalController.php +++ b/app/Http/Controllers/paypal/PaypalController.php @@ -290,6 +290,7 @@ class PaypalController extends Controller $m = new TeamStoreModel; $UserModel = new UserModel; $userId = 0; + if (!Auth::guest()) { $userId = Auth::user()->id; } @@ -299,9 +300,6 @@ class PaypalController extends Controller $items = $m->myCart($cartKey); // item from cart_tmp $getSubtotal = $m->getSubtotal($cartKey); // var_dump($getSubtotal); - if($getSubtotal[0]->Subtotal >= 99) { - return $shippingFee = 0; - } $getSmallItemQty = 0; $getBulkyItemQty = 0; @@ -337,8 +335,9 @@ class PaypalController extends Controller // ); } } - + // var_dump($item->ShippingCostId); if ($item->ShippingCostId == 1) { + $getSmallItemQty += $item->Quantity; } else if ($item->ShippingCostId == 2) { $getBulkyItemQty += $item->Quantity; @@ -360,12 +359,15 @@ class PaypalController extends Controller // $getSmallItemQty = ceil($getSmallItemQty / 3) * 8.99; - if($getSmallItemQty >= 2) { - $getSmallItemQty = ceil(($getSmallItemQty - 1) / 1) * 2.49; - $getSmallItemQty = $getSmallItemQty + 8.99; - }else { - $getSmallItemQty = 8.99; + if($getSmallItemQty >= 1) { + if($getSmallItemQty >= 2) { + $getSmallItemQty = ceil(($getSmallItemQty - 1) / 1) * 2.49; + $getSmallItemQty = $getSmallItemQty + 8.99; + }else { + $getSmallItemQty = 8.99; + } } + $getBulkyItemQty = ceil($getBulkyItemQty / 1) * 8; $getMaskItemQty = ceil($getMaskItemQty / 25) * 8; @@ -375,6 +377,10 @@ class PaypalController extends Controller if ($countryCode == "CA") { $shippingFee = $CAShippingfee; } + + if($getSubtotal[0]->Subtotal >= 99 && $countryCode != "CA") { + return $shippingFee = 0; + } return $shippingFee; } diff --git a/resources/views/merchbay/cart.blade.php b/resources/views/merchbay/cart.blade.php index 3a3181c..71a844c 100755 --- a/resources/views/merchbay/cart.blade.php +++ b/resources/views/merchbay/cart.blade.php @@ -103,7 +103,7 @@ Quantity - @elseif($item->FormUsed=="tshirt-form") + @elseif($item->FormUsed == 'tshirt-form') Size Price @@ -111,7 +111,7 @@ - @elseif($item->FormUsed=="quantity-form") + @elseif($item->FormUsed == 'quantity-form') Price Quantity @@ -119,7 +119,7 @@ - @elseif($item->FormUsed=="name-number-form") + @elseif($item->FormUsed == 'name-number-form') Name Number @@ -128,7 +128,7 @@ - @elseif($item->FormUsed=="name-number-size-form") + @elseif($item->FormUsed == 'name-number-size-form') Name Number @@ -138,14 +138,14 @@ - @elseif($item->FormUsed=="number-form") + @elseif($item->FormUsed == 'number-form') Number Price Quantity - @elseif($item->FormUsed=="name-name2-size-form") + @elseif($item->FormUsed == 'name-name2-size-form') Gamer Tag Name @@ -154,7 +154,7 @@ Quantity - @elseif($item->FormUsed=="name-size-form") + @elseif($item->FormUsed == 'name-size-form') Name Size @@ -162,7 +162,7 @@ Quantity - @elseif($item->FormUsed=="jersey-and-shorts-quantity-form") + @elseif($item->FormUsed == 'jersey-and-shorts-quantity-form') Jersey Size Shorts Size @@ -170,7 +170,7 @@ Quantity - @elseif($item->FormUsed=="number-jersey-shorts-form") + @elseif($item->FormUsed == 'number-jersey-shorts-form') Number Jersey Size @@ -199,7 +199,7 @@ href="{{ url('removeitem') }}/{{ $sub_item->Id }}"> - @elseif($item->FormUsed=="tshirt-form") + @elseif($item->FormUsed == 'tshirt-form') {{ $sub_item->Size }} {{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }} @@ -209,7 +209,7 @@ href="{{ url('removeitem') }}/{{ $sub_item->Id }}"> - @elseif($item->FormUsed=="quantity-form") + @elseif($item->FormUsed == 'quantity-form') {{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }} @@ -218,7 +218,7 @@ href="{{ url('removeitem') }}/{{ $sub_item->Id }}"> - @elseif($item->FormUsed=="name-number-form") + @elseif($item->FormUsed == 'name-number-form') {{ $sub_item->Name }} {{ $sub_item->Number }} @@ -229,7 +229,7 @@ href="{{ url('removeitem') }}/{{ $sub_item->Id }}"> - @elseif($item->FormUsed=="name-number-size-form") + @elseif($item->FormUsed == 'name-number-size-form') {{ $sub_item->Name }} {{ $sub_item->Number }} @@ -241,7 +241,7 @@ href="{{ url('removeitem') }}/{{ $sub_item->Id }}"> - @elseif($item->FormUsed=="number-form") + @elseif($item->FormUsed == 'number-form') {{ $sub_item->Number }} {{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }} @@ -251,7 +251,7 @@ href="{{ url('removeitem') }}/{{ $sub_item->Id }}"> - @elseif($item->FormUsed=="name-name2-size-form") + @elseif($item->FormUsed == 'name-name2-size-form') {{ $sub_item->Name }} {{ $sub_item->Name2 }} @@ -263,7 +263,7 @@ href="{{ url('removeitem') }}/{{ $sub_item->Id }}"> - @elseif($item->FormUsed=="name-size-form") + @elseif($item->FormUsed == 'name-size-form') {{ $sub_item->Name }} {{ $sub_item->Size }} @@ -274,7 +274,7 @@ href="{{ url('removeitem') }}/{{ $sub_item->Id }}"> - @elseif($item->FormUsed=="jersey-and-shorts-quantity-form") + @elseif($item->FormUsed == 'jersey-and-shorts-quantity-form') {{ $sub_item->JerseySize }} {{ $sub_item->ShortsSize }} @@ -285,7 +285,7 @@ href="{{ url('removeitem') }}/{{ $sub_item->Id }}"> - @elseif($item->FormUsed=="number-jersey-shorts-form") + @elseif($item->FormUsed == 'number-jersey-shorts-form') {{ $sub_item->Number }} {{ $sub_item->JerseySize }} @@ -360,16 +360,22 @@ {{ $store_array[0]->StoreCurrency }} - @if ($getSubtotal >= 1 && $getSubtotal <= 98) -
- If you order $99 worth of product you get free shipping (pre tax). You are {{ number_format(99 - $getSubtotal, 2) }} {{ $store_array[0]->StoreCurrency }} away. -
+ @if ($shipping_fee) + @if ($getSubtotal >= 1 && $getSubtotal <= 98) +
+ If you order $99 worth of product you get free shipping (pre tax). You are + {{ number_format(99 - $getSubtotal, 2) }} + {{ $store_array[0]->StoreCurrency }} away. +
+ @endif @else
Congratulations! You have activated free shipping!
@endif + + {{-- {{ var_dump($tax) }} {{ var_dump($shipping_fee) }} --}}
@@ -414,8 +420,8 @@ Checkout
+ + -->
Payments made on Merchbay will show up as Crewsportswear on your order confirmations and receipt.