upated shipping fee and using voucher code

This commit is contained in:
franknstayn
2022-03-26 19:43:32 +08:00
parent b418b43469
commit 80bf7e6c67
7 changed files with 125 additions and 100 deletions

View File

@@ -63,7 +63,7 @@
<div class="col-md-8 col-md-pull-4">
<div style="border: 1px solid #e2e2e2; padding: 10px;">
<h6><img height="30px" class="cart-store-logo"
src="{{ config('site_config.uploads') . 'teamstore/' . $store_array[0]->ImageFolder . '/' . $store_array[0]->StoreLogo }}">
src="{{ config('site_config.uploads') .'teamstore/' .$store_array[0]->ImageFolder .'/' .$store_array[0]->StoreLogo }}">
{{ $store_array[0]->StoreName }}
</h6>
</div>
@@ -110,15 +110,12 @@
<th>Quantity</th>
<th></th>
</tr>
@elseif($item->FormUsed == 'quantity-form')
<tr>
<th>Price</th>
<th>Quantity</th>
<th></th>
</tr>
@elseif($item->FormUsed == 'name-number-form')
<tr>
<th>Name</th>
@@ -127,8 +124,7 @@
<th>Quantity</th>
<th></th>
</tr>
@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')
<tr>
<th>Name</th>
<th>Number</th>
@@ -137,7 +133,6 @@
<th>Quantity</th>
<th></th>
</tr>
@elseif($item->FormUsed == 'number-form')
<tr>
<th>Number</th>
@@ -180,15 +175,19 @@
<th></th>
</tr>
@else
@endif
@foreach ($row as $sub_item)
@if ($sub_item->ProductId == $item->ProductId)
@if ($item->FormUsed == 'jersey-and-shorts-form')
<tr>
<td> @if ($sub_item->Name != '') {{ $sub_item->Name }} @else -- @endif </td>
<td>
@if ($sub_item->Name != '')
{{ $sub_item->Name }}
@else
--
@endif
</td>
<td>{{ $sub_item->Number }}</td>
<td>{{ $sub_item->JerseySize }}</td>
<td>{{ $sub_item->ShortsSize }}</td>
@@ -229,7 +228,7 @@
href="{{ url('removeitem') }}/{{ $sub_item->Id }}"><i
class="fa fa-times"></i></a></td>
</tr>
@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')
<tr>
<td>{{ $sub_item->Name }}</td>
<td>{{ $sub_item->Number }}</td>
@@ -298,9 +297,7 @@
class="fa fa-times"></i></a></td>
</tr>
@else
@endif
@endif
@endforeach
</table>
@@ -325,7 +322,6 @@
<h3>Order Summary</h3>
</div>
@if (!Auth::guest())
<div style="border: 1px solid #e2e2e2; padding: 10px; border-bottom: none;">
<p><strong>Ship to:</strong></p>
@@ -336,7 +332,7 @@
<div>{{ $address_book[0]->Fullname }}</div>
<div>{{ $address_book[0]->ContactNumber }}</div>
<div>
{{ $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 }}
<a href="{{ url('user/address-book/edit/' . $address_book[0]->Id) }}">[ Edit
]</a>
</div>
@@ -346,17 +342,19 @@
@endif
<div style="border: 1px solid #e2e2e2; padding: 10px; border-bottom: none;">
<h5>Subtotal:
<small>{{ number_format($tax['order_grandtotal'], 2) . ' ' . $store_array[0]->StoreCurrency }}</small>
<small><span id="my_subtotal">{{ number_format($getSubtotal, 2) }}</span>
{{ $store_array[0]->StoreCurrency }}</small>
</h5>
<h5>Shipping Fee:
<small> <span id="shippingFee">{{ number_format($shipping_fee, 2) }}</span> {{ $store_array[0]->StoreCurrency }}</small>
<small> <span id="shippingFee">{{ number_format($shipping_fee, 2) }}</span>
{{ $store_array[0]->StoreCurrency }}</small>
</h5>
<h5>Tax:
<small>{{ number_format($tax['tax'], 2) . ' ' . $store_array[0]->StoreCurrency }}</small>
</h5>
<hr>
<h3>Total: <span
id="my_subtotal">{{ number_format($getSubtotal + $shipping_fee + $tax['tax'], 2) }}</span>
id="my_total">{{ number_format($getSubtotal + $shipping_fee + $tax['tax'], 2) }}</span>
<small>{{ $store_array[0]->StoreCurrency }}</small>
</h3>
@@ -364,7 +362,9 @@
@if ($getSubtotal >= 1 && $getSubtotal <= 98)
<div class="border rounded-2 p-2 mt-2">
If you order $99 worth of product you get free shipping (pre tax). You are
<strong>{{ number_format(99 - $getSubtotal, 2) }}
<strong>
<span
id="remaining_shippingfee">{{ number_format(99 - $getSubtotal, 2) }}</span>
{{ $store_array[0]->StoreCurrency }}</strong> away.
</div>
@endif
@@ -387,10 +387,14 @@
<button type="button" class="btn btn-black btn-sm dropdown-toggle"
data-bs-toggle="dropdown">{{ $item->VoucherCode . ' ' . $item->VoucherValue . '%' }}
OFF</button>
@else
@elseif ($item->VoucherType == 'Flat')
<button type="button" class="btn btn-black btn-sm dropdown-toggle"
data-bs-toggle="dropdown">{{ $item->VoucherCode . ' ' . $item->VoucherValue . ' ' . $store_array[0]->StoreCurrency }}
OFF</button>
@else
{{-- Shipping Voucher --}}
<button type="button" class="btn btn-black btn-sm dropdown-toggle"
data-bs-toggle="dropdown">{{ $item->VoucherCode }}</button>
@endif
<ul class="dropdown-menu">
<li><a class="dropdown-item"
@@ -417,11 +421,12 @@
</div>
<div style="border: 1px solid #e2e2e2; padding: 10px;">
<a @if ($getSubtotal <= 0) disabled @endif href="{{ url('getCheckout') }}" class="btn w-100"
<a @if ($getSubtotal <= 0) disabled @endif href="{{ url('getCheckout') }}"
class="btn w-100"
style="background-color: #ffc300; border-color: #e2ad00; text-align: -webkit-center;">Checkout</a><br>
<!-- <div class="my-2">
<button class="btn btn-lg btn-info w-100">Checkout with Voucher</button>
</div> -->
<button class="btn btn-lg btn-info w-100">Checkout with Voucher</button>
</div> -->
<div class="border rounded-2 p-2 mt-2">
Payments made on Merchbay will show up as Crewsportswear on your order confirmations and
receipt.