diff --git a/app/Http/Controllers/paypal/PaypalController.php b/app/Http/Controllers/paypal/PaypalController.php index 96d95f9..e5e6e19 100755 --- a/app/Http/Controllers/paypal/PaypalController.php +++ b/app/Http/Controllers/paypal/PaypalController.php @@ -298,6 +298,11 @@ class PaypalController extends Controller $items = $m->myCart($cartKey); // item from cart_tmp $getSubtotal = $m->getSubtotal($cartKey); + // var_dump($getSubtotal); + if($getSubtotal[0]->Subtotal >= 150) { + return $shippingFee = 0; + } + $getSmallItemQty = 0; $getBulkyItemQty = 0; $getMaskItemQty = 0; @@ -363,6 +368,8 @@ class PaypalController extends Controller $shippingFee = $CAShippingfee; } + + return $shippingFee; } diff --git a/app/Http/Controllers/teamstore/TeamStoreController.php b/app/Http/Controllers/teamstore/TeamStoreController.php index 2814f62..9710db2 100755 --- a/app/Http/Controllers/teamstore/TeamStoreController.php +++ b/app/Http/Controllers/teamstore/TeamStoreController.php @@ -748,7 +748,7 @@ class TeamStoreController extends Controller if ($getSubtotal[0]->Subtotal <= $getVoucher[0]->VoucherValue) { return response()->json(array( 'success' => false, - 'message' => 'Please add more item to redeem this voucher.', + 'message' => 'Please add another item to redeem this voucher.', )); } } diff --git a/resources/views/merchbay/cart.blade.php b/resources/views/merchbay/cart.blade.php index facfcce..88b9a80 100755 --- a/resources/views/merchbay/cart.blade.php +++ b/resources/views/merchbay/cart.blade.php @@ -1,403 +1,448 @@ @extends('merchbay_main') @section('main-content') - + .cart-store-logo { + border: 1px solid #e2e2e2; + } -
-
-
+ - {{-- breadcrumbs --}} -
-
-
- +
+
+
+ + {{-- breadcrumbs --}} +
+
+
+ +
-
-
-
-

Shopping Cart

- @if (Session::has('cartkeyError')) - {{--
+
+
+

Shopping Cart

+ @if (Session::has('cartkeyError')) + {{--

Error:

{!! Session::get('cartkeyError') !!}
--}} - - @endif -
-
- - @if (count($row) > 0) -
-
-
-
- {{ $store_array[0]->StoreName }} -
-
- @foreach ($item_group as $item) - @if ($item->VoucherId == null) -
-
-
-
- @foreach ($img_thumb as $img) - @if ($img->ProductId == $item->ProductId) - - @endif - @endforeach -
+ -
-

- {{ $item->ProductName }} -

-

Total Price: - {{ $item->total_price . ' ' . $store_array[0]->StoreCurrency }} - • Row(s): {{ $item->qty }} -

-
- - - @if ($item->FormUsed == 'jersey-and-shorts-form') - - - - - - - - - - @elseif($item->FormUsed=="tshirt-form") - - - - - - - - @elseif($item->FormUsed=="quantity-form") - - - - - - - - @elseif($item->FormUsed=="name-number-form") - - - - - - - - - @elseif($item->FormUsed=="name-number-size-form") - - - - - - - - - - @elseif($item->FormUsed=="number-form") - - - - - - - @elseif($item->FormUsed=="name-name2-size-form") - - - - - - - - - @elseif($item->FormUsed=="name-size-form") - - - - - - - - @elseif($item->FormUsed=="jersey-and-shorts-quantity-form") - - - - - - - - @elseif($item->FormUsed=="number-jersey-shorts-form") - - - - - - - - - @else - - @endif - - @foreach ($row as $sub_item) - @if ($sub_item->ProductId == $item->ProductId) - - @if ($item->FormUsed == 'jersey-and-shorts-form') - - - - - - - - - - @elseif($item->FormUsed=="tshirt-form") - - - - - - - @elseif($item->FormUsed=="quantity-form") - - - - - - @elseif($item->FormUsed=="name-number-form") - - - - - - - - @elseif($item->FormUsed=="name-number-size-form") - - - - - - - - - @elseif($item->FormUsed=="number-form") - - - - - - - @elseif($item->FormUsed=="name-name2-size-form") - - - - - - - - - @elseif($item->FormUsed=="name-size-form") - - - - - - - - @elseif($item->FormUsed=="jersey-and-shorts-quantity-form") - - - - - - - - @elseif($item->FormUsed=="number-jersey-shorts-form") - - - - - - - - - @else - - @endif - - @endif - @endforeach -
NameNumberJersey SizeShorts SizePriceQuantity
SizePriceQuantity
PriceQuantity
NameNumberPriceQuantity
NameNumberSizePriceQuantity
NumberPriceQuantity
Gamer TagNameSizePriceQuantity
NameSizePriceQuantity
Jersey SizeShorts SizePriceQuantity
NumberJersey SizeShorts SizePriceQuantity
@if ($sub_item->Name != '') {{ $sub_item->Name }} @else -- @endif {{ $sub_item->Number }}{{ $sub_item->JerseySize }}{{ $sub_item->ShortsSize }}{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }} - {{ $sub_item->Quantity }}
{{ $sub_item->Size }}{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }} - {{ $sub_item->Quantity }}
{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }} - {{ $sub_item->Quantity }}
{{ $sub_item->Name }}{{ $sub_item->Number }}{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }} - {{ $sub_item->Quantity }}
{{ $sub_item->Name }}{{ $sub_item->Number }}{{ $sub_item->Size }}{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }} - {{ $sub_item->Quantity }}
{{ $sub_item->Number }}{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }} - {{ $sub_item->Quantity }}
{{ $sub_item->Name }}{{ $sub_item->Name2 }}{{ $sub_item->Size }}{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }} - {{ $sub_item->Quantity }}
{{ $sub_item->Name }}{{ $sub_item->Size }}{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }} - {{ $sub_item->Quantity }}
{{ $sub_item->JerseySize }}{{ $sub_item->ShortsSize }}{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }} - {{ $sub_item->Quantity }}
{{ $sub_item->Number }}{{ $sub_item->JerseySize }}{{ $sub_item->ShortsSize }}{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }} - {{ $sub_item->Quantity }}
-
-
-
+ @endif
- @endif - @endforeach
-
-
- @if (Session::has('msg')) -
- -

Warning:

- {!! Session::get('msg') !!} -
- @endif -

Order Summary

-
- @if (!Auth::guest()) + @if (count($row) > 0) +
+
+
+
+ {{ $store_array[0]->StoreName }} +
+
+ @foreach ($item_group as $item) + @if ($item->VoucherId == null) +
+
+
+
+ @foreach ($img_thumb as $img) + @if ($img->ProductId == $item->ProductId) + + @endif + @endforeach +
+
+
+

+ {{ $item->ProductName }} +

+

Total Price: + {{ $item->total_price . ' ' . $store_array[0]->StoreCurrency }} + • Row(s): {{ $item->qty }} +

+
+ -
+ @if ($item->FormUsed == 'jersey-and-shorts-form') +
+ + + + + + + + + @elseif($item->FormUsed=="tshirt-form") + + + + + + -

Ship to:

+ @elseif($item->FormUsed=="quantity-form") + + + + + - @if ($address_book === null) - [ Add ] - @else -
{{ $address_book[0]->Fullname }}
-
{{ $address_book[0]->ContactNumber }}
-
- {{ $address_book[0]->Address . ' ' . $address_book[0]->Address2 . ', ' . $address_book[0]->State . ', ' . $address_book[0]->City . ', ' . $address_book[0]->Country . ', ' . $address_book[0]->CountryCode . ' ' . $address_book[0]->ZipCode }} - [ Edit ] -
- @endif - - @endif -
-
Subtotal: - {{ number_format($tax['order_grandtotal'], 2) . ' ' . $store_array[0]->StoreCurrency }} -
-
Shipping Fee: - {{ number_format($shipping_fee, 2) . ' ' . $store_array[0]->StoreCurrency }} -
-
Tax: - {{ number_format($tax['tax'], 2) . ' ' . $store_array[0]->StoreCurrency }} -
-
-

Total: {{ number_format($getSubtotal + $shipping_fee + $tax['tax'], 2) }} - {{ $store_array[0]->StoreCurrency }} -

+ @elseif($item->FormUsed=="name-number-form") +
+ + + + + + - {{-- {{ var_dump($tax) }} - {{ var_dump($shipping_fee) }} --}} -
-
- @foreach ($row as $item) - @if ($item->VoucherId != null) -
- @if ($item->VoucherType == 'Percentage') - - @else - + @elseif($item->FormUsed=="name-number-size-form") +
+ + + + + + + + + @elseif($item->FormUsed=="number-form") + + + + + + + @elseif($item->FormUsed=="name-name2-size-form") + + + + + + + + + @elseif($item->FormUsed=="name-size-form") + + + + + + + + @elseif($item->FormUsed=="jersey-and-shorts-quantity-form") + + + + + + + + @elseif($item->FormUsed=="number-jersey-shorts-form") + + + + + + + + + @else + + @endif + + @foreach ($row as $sub_item) + @if ($sub_item->ProductId == $item->ProductId) + + @if ($item->FormUsed == 'jersey-and-shorts-form') + + + + + + + + + + @elseif($item->FormUsed=="tshirt-form") + + + + + + + @elseif($item->FormUsed=="quantity-form") + + + + + + @elseif($item->FormUsed=="name-number-form") + + + + + + + + @elseif($item->FormUsed=="name-number-size-form") + + + + + + + + + @elseif($item->FormUsed=="number-form") + + + + + + + @elseif($item->FormUsed=="name-name2-size-form") + + + + + + + + + @elseif($item->FormUsed=="name-size-form") + + + + + + + + @elseif($item->FormUsed=="jersey-and-shorts-quantity-form") + + + + + + + + @elseif($item->FormUsed=="number-jersey-shorts-form") + + + + + + + + + @else + + @endif + + @endif + @endforeach +
NameNumberJersey SizeShorts SizePriceQuantity
SizePriceQuantity
PriceQuantity
NameNumberPriceQuantity
NameNumberSizePriceQuantity
NumberPriceQuantity
Gamer TagNameSizePriceQuantity
NameSizePriceQuantity
Jersey SizeShorts SizePriceQuantity
NumberJersey SizeShorts SizePriceQuantity
@if ($sub_item->Name != '') {{ $sub_item->Name }} @else -- @endif {{ $sub_item->Number }}{{ $sub_item->JerseySize }}{{ $sub_item->ShortsSize }}{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }} + {{ $sub_item->Quantity }}
{{ $sub_item->Size }}{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }} + {{ $sub_item->Quantity }}
{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }} + {{ $sub_item->Quantity }}
{{ $sub_item->Name }}{{ $sub_item->Number }}{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }} + {{ $sub_item->Quantity }}
{{ $sub_item->Name }}{{ $sub_item->Number }}{{ $sub_item->Size }}{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }} + {{ $sub_item->Quantity }}
{{ $sub_item->Number }}{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }} + {{ $sub_item->Quantity }}
{{ $sub_item->Name }}{{ $sub_item->Name2 }}{{ $sub_item->Size }}{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }} + {{ $sub_item->Quantity }}
{{ $sub_item->Name }}{{ $sub_item->Size }}{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }} + {{ $sub_item->Quantity }}
{{ $sub_item->JerseySize }}{{ $sub_item->ShortsSize }}{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }} + {{ $sub_item->Quantity }}
{{ $sub_item->Number }}{{ $sub_item->JerseySize }}{{ $sub_item->ShortsSize }}{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }} + {{ $sub_item->Quantity }}
+
+
+
+
@endif - -
- @endif @endforeach -
-
-
- - - - + +
+
+ @if (Session::has('msg')) +
+ +

Warning:

+ {!! Session::get('msg') !!} +
+ @endif +

Order Summary

+
+ @if (!Auth::guest()) + +
+ +

Ship to:

+ + @if ($address_book === null) + [ Add ] + @else +
{{ $address_book[0]->Fullname }}
+
{{ $address_book[0]->ContactNumber }}
+
+ {{ $address_book[0]->Address . ' ' . $address_book[0]->Address2 . ', ' . $address_book[0]->State . ', ' . $address_book[0]->City . ', ' . $address_book[0]->Country . ', ' . $address_book[0]->CountryCode . ' ' . $address_book[0]->ZipCode }} + [ Edit + ] +
+ @endif + +
+ @endif +
+
Subtotal: + {{ number_format($tax['order_grandtotal'], 2) . ' ' . $store_array[0]->StoreCurrency }} +
+
Shipping Fee: + {{ number_format($shipping_fee, 2) . ' ' . $store_array[0]->StoreCurrency }} +
+
Tax: + {{ number_format($tax['tax'], 2) . ' ' . $store_array[0]->StoreCurrency }} +
+
+

Total: {{ number_format($getSubtotal + $shipping_fee + $tax['tax'], 2) }} + {{ $store_array[0]->StoreCurrency }} +

+ + @if ($getSubtotal >= 100) +
+ If you order $150 worth of product you get free shipping (pre tax) +
+ @endif + + {{-- {{ var_dump($tax) }} + {{ var_dump($shipping_fee) }} --}} +
+
+ @foreach ($row as $item) + @if ($item->VoucherId != null) +
+ @if ($item->VoucherType == 'Percentage') + + @else + + @endif + +
+ @endif + @endforeach + +
+ +
+ + + + +
+ + +
+
+ +
+ Checkout
+ +
+ Payments made on Merchbay will show up as Crewsportswear on your order confirmations and + receipt. +
+ +
+ Store payments are processed through PayPal. A PayPal account is not required to make a + purchase. If you do not have a PayPal account click on “Pay with Debit or Credit Card” + on the PayPal check out page +
+
+ +
+ Continue Shopping
- - -
-
-
- Checkout
- -
- Payments made on Merchbay will show up as Crewsportswear on your order confirmations and receipt.
-
- Store payments are processed through PayPal. A PayPal account is not required to make a purchase. If you do not have a PayPal account click on “Pay with Debit or Credit Card” on the PayPal check out page +
+ @else +
+
+

Your cart is currently empty.

- -
- Continue Shopping -
- -
+ @endif
- @else -
-
-

Your cart is currently empty.

-
-
- @endif -
-
-@endsection \ No newline at end of file +@endsection