diff --git a/app/Http/Controllers/paypal/PaypalController.php b/app/Http/Controllers/paypal/PaypalController.php index 420bd9d..5b013d0 100755 --- a/app/Http/Controllers/paypal/PaypalController.php +++ b/app/Http/Controllers/paypal/PaypalController.php @@ -315,6 +315,7 @@ class PaypalController extends Controller $voucher = $m->selectVoucherWhereIn($voucherIds); $item_id = $item->Id; $totalValue = $voucher[0]->VoucherValue; + if ($voucher[0]->VoucherType == "Percentage") { $getPercentageValue = $totalValue / 100; $getDiscountValue = ($getSubtotal[0]->Subtotal * $getPercentageValue); @@ -323,7 +324,7 @@ class PaypalController extends Controller ); $m->updateVoucherValueInCart($data, $item_id); - } else if ($voucher[0]->VoucherType == "Percentage") { + } else if ($voucher[0]->VoucherType == "Flat") { $data = array( 'Price' => round($totalValue * -1, 2) ); @@ -336,6 +337,9 @@ class PaypalController extends Controller } else if ($voucher[0]->VoucherType == "Shipping") { return $shippingFee = 0; } + } else { + $getSmallItemQty += $item->Quantity; + $CAShippingfee += $item->Quantity; // for canada } // var_dump($item->ShippingCostId); // if ($item->ShippingCostId == 1) { @@ -347,8 +351,7 @@ class PaypalController extends Controller // } else if ($item->ShippingCostId == 4) { // $getDGSItemQty += $item->Quantity; // } - $getSmallItemQty += $item->Quantity; - $CAShippingfee += $item->Quantity; // for canada + } $array_address_book = $UserModel->selectAddresBook('UserId', $userId); diff --git a/app/Http/Controllers/teamstore/TeamStoreController.php b/app/Http/Controllers/teamstore/TeamStoreController.php index 7e47931..869b5ea 100755 --- a/app/Http/Controllers/teamstore/TeamStoreController.php +++ b/app/Http/Controllers/teamstore/TeamStoreController.php @@ -95,7 +95,7 @@ class TeamStoreController extends Controller } } - + $thumbnails = []; foreach ($product_array as $p => $pr_arr) { @@ -650,6 +650,7 @@ class TeamStoreController extends Controller $cartKey = $request->session()->get('cartkey'); $items = $m->myCart($cartKey); + // var_dump($items); $getSubtotal = $m->getSubtotal($cartKey); $items_group = $m->myCartGroup($cartKey); //var_dump($items_group); @@ -674,6 +675,8 @@ class TeamStoreController extends Controller $vouchers = $m->selectVoucherWhereIn($voucherIds); } + // var_dump($vouchers); + $totalValue = 0; if (!empty($vouchers)) { foreach ($vouchers as $voucher) { @@ -693,6 +696,11 @@ class TeamStoreController extends Controller if ($voucherData['type'] == "Percentage") { $getPercentageValue = $voucherData['totalValue'] / 100; + + // var_dump($getPercentageValue); + // var_dump($getSubtotal[0]->Subtotal); + // var_dump($getSubtotal[0]->Subtotal * $getPercentageValue); + $getDiscountValue = ($getSubtotal[0]->Subtotal * $getPercentageValue); $finalSubTotal = $getSubtotal[0]->Subtotal - $getDiscountValue; } else { @@ -712,6 +720,7 @@ class TeamStoreController extends Controller $tax = []; } + // var_dump($finalSubTotal); return view('merchbay.cart') ->with('item_group', $items_group) @@ -910,15 +919,17 @@ class TeamStoreController extends Controller } if ($getVoucher[0]->VoucherType == "Percentage") { - $offData = $getVoucher[0]->VoucherValue . '%'; - } else { - $offData = $getVoucher[0]->VoucherValue . ' ' . $store_array[0]->StoreCurrency; + $offData = $getVoucher[0]->VoucherValue . '%' . ' OFF'; + } else if ($voucherData['type'] == "Flat") { + $offData = $getVoucher[0]->VoucherValue . ' ' . $store_array[0]->StoreCurrency . ' OFF'; + } else if ($voucherData['type'] == "Shipping") { + $offData = ""; } $message = '
- + @@ -929,7 +940,9 @@ class TeamStoreController extends Controller 'success' => true, 'message' => $message, 'shippingFee' => number_format($shippingFee, 2), - 'subtotal' => number_format($finalSubTotal + $shippingFee + $tax["tax"], 2) + 'total' => number_format($finalSubTotal + $shippingFee + $tax["tax"], 2), + 'subtotal' => number_format($finalSubTotal, 2), + 'remaining_shippingfee' => number_format(99 - $finalSubTotal, 2) )); } else { diff --git a/app/Models/teamstore/TeamStoreModel.php b/app/Models/teamstore/TeamStoreModel.php index f564ab1..caff5c3 100755 --- a/app/Models/teamstore/TeamStoreModel.php +++ b/app/Models/teamstore/TeamStoreModel.php @@ -184,6 +184,7 @@ class TeamStoreModel extends Model $i = DB::table('cart_tmp')->select(DB::raw('SUM(Quantity * Price) AS Subtotal')) ->where('CartKey', '=', $cartKey) + ->where('VoucherId', '=', null) ->get(); return $i; } diff --git a/resources/views/merchbay/cart.blade.php b/resources/views/merchbay/cart.blade.php index 6847f8c..4a7a0f9 100755 --- a/resources/views/merchbay/cart.blade.php +++ b/resources/views/merchbay/cart.blade.php @@ -63,7 +63,7 @@
+ src="{{ config('site_config.uploads') .'teamstore/' .$store_array[0]->ImageFolder .'/' .$store_array[0]->StoreLogo }}"> {{ $store_array[0]->StoreName }}
@@ -110,15 +110,12 @@ Quantity - @elseif($item->FormUsed == 'quantity-form') Price Quantity - - @elseif($item->FormUsed == 'name-number-form') Name @@ -127,8 +124,7 @@ Quantity - - @elseif($item->FormUsed == 'name-number-size-form' || $item->FormUsed == "roster-name-number-size-form") + @elseif($item->FormUsed == 'name-number-size-form' || $item->FormUsed == 'roster-name-number-size-form') Name Number @@ -137,7 +133,6 @@ Quantity - @elseif($item->FormUsed == 'number-form') Number @@ -180,15 +175,19 @@ @else - @endif @foreach ($row as $sub_item) @if ($sub_item->ProductId == $item->ProductId) - @if ($item->FormUsed == 'jersey-and-shorts-form') - @if ($sub_item->Name != '') {{ $sub_item->Name }} @else -- @endif + + @if ($sub_item->Name != '') + {{ $sub_item->Name }} + @else + -- + @endif + {{ $sub_item->Number }} {{ $sub_item->JerseySize }} {{ $sub_item->ShortsSize }} @@ -229,7 +228,7 @@ href="{{ url('removeitem') }}/{{ $sub_item->Id }}"> - @elseif($item->FormUsed == 'name-number-size-form' || $item->FormUsed == "roster-name-number-size-form") + @elseif($item->FormUsed == 'name-number-size-form' || $item->FormUsed == 'roster-name-number-size-form') {{ $sub_item->Name }} {{ $sub_item->Number }} @@ -298,9 +297,7 @@ class="fa fa-times"> @else - @endif - @endif @endforeach @@ -325,7 +322,6 @@

Order Summary

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

Ship to:

@@ -336,7 +332,7 @@
{{ $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 }} + {{ $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 ]
@@ -346,17 +342,19 @@ @endif
Subtotal: - {{ number_format($tax['order_grandtotal'], 2) . ' ' . $store_array[0]->StoreCurrency }} + {{ number_format($getSubtotal, 2) }} + {{ $store_array[0]->StoreCurrency }}
Shipping Fee: - {{ number_format($shipping_fee, 2) }} {{ $store_array[0]->StoreCurrency }} + {{ 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) }} + id="my_total">{{ number_format($getSubtotal + $shipping_fee + $tax['tax'], 2) }} {{ $store_array[0]->StoreCurrency }}

@@ -364,7 +362,9 @@ @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) }} + + {{ number_format(99 - $getSubtotal, 2) }} {{ $store_array[0]->StoreCurrency }} away.
@endif @@ -387,10 +387,14 @@ - @else + @elseif ($item->VoucherType == 'Flat') + @else + {{-- Shipping Voucher --}} + @endif
  • - Checkout
    + +
    -->
    Payments made on Merchbay will show up as Crewsportswear on your order confirmations and receipt. diff --git a/resources/views/merchbay_main.blade.php b/resources/views/merchbay_main.blade.php index cffb758..35a1104 100755 --- a/resources/views/merchbay_main.blade.php +++ b/resources/views/merchbay_main.blade.php @@ -478,8 +478,11 @@ $("#voucher_list").append(response.message); form.validate().resetForm(); form[0].reset(); + $('#my_total').text(response.total); $('#my_subtotal').text(response.subtotal); $('#shippingFee').text(response.shippingFee); + $('#remaining_shippingfee').text(response.remaining_shippingfee); + } else { $("#error_voucher").html(response.message).fadeIn().delay(5000).fadeOut('slow', diff --git a/resources/views/teamstore-sublayouts/product-details.blade.php b/resources/views/teamstore-sublayouts/product-details.blade.php index 6b8aea8..cd7c4ba 100755 --- a/resources/views/teamstore-sublayouts/product-details.blade.php +++ b/resources/views/teamstore-sublayouts/product-details.blade.php @@ -131,8 +131,8 @@ @media screen and (min-width: 1440px) { /* .carousel-inner{ - margin-left: -60px; - } */ + margin-left: -60px; + } */ } @media screen and (min-width: 1200px) and (max-width: 1439px) { @@ -194,8 +194,8 @@ /* .btn-roster-action { */ /* width: 20px; - height: 20px; - border-radius: 10px; */ + height: 20px; + border-radius: 10px; */ /* } */ .btn-group-sm>.btn { @@ -270,7 +270,7 @@
    - ...
    @@ -361,7 +361,9 @@
    - @include('teamstore-sublayouts.forms.'.$product_array[0]->ProductForm) + @include( + 'teamstore-sublayouts.forms.' . $product_array[0]->ProductForm + ) @if ($product_array[0]->ProductPrice > 0) {{-- @if ($available_qty !== null) --}} @@ -372,7 +374,6 @@
    @endif {{-- @endif --}} - @endif
    diff --git a/resources/views/teamstore-sublayouts/stores.blade.php b/resources/views/teamstore-sublayouts/stores.blade.php index b03e4db..c723012 100755 --- a/resources/views/teamstore-sublayouts/stores.blade.php +++ b/resources/views/teamstore-sublayouts/stores.blade.php @@ -1,9 +1,8 @@
    @foreach ($stores_array as $store) -
    -
    -{{-- - @if($store->Password != null ) +
    +
    + {{-- @if ($store->Password != null) @@ -14,34 +13,30 @@

    {{ $store->StoreName }}

    @endif --}} - @if($store->Password != null ) - - -
    {{ $store->StoreName }}
    -     - @else - - -
    {{ $store->StoreName }}
    -     - @endif -
    -
    + @if ($store->Password != null) + + +
    {{ $store->StoreName }}
    +     + @else + + +
    {{ $store->StoreName }}
    +     + @endif +
    +
    @endforeach {{--
    @@ -100,35 +95,39 @@
    --}} {{--