webmaster/merchbay
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
franknstayn
2022-01-26 20:30:34 +08:00
parent 137fbbc843
commit 8a9b1209a3
2 changed files with 45 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/Http/Controllers/paypal/PaypalController.php
View File

@@ -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,13 +359,16 @@ 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;
$getDGSItemQty = ceil($getDGSItemQty / 4) * 5;
@@ -376,6 +378,10 @@ class PaypalController extends Controller
$shippingFee = $CAShippingfee;
}
if($getSubtotal[0]->Subtotal >= 99 && $countryCode != "CA") {
return $shippingFee = 0;
}
return $shippingFee;
}

54
resources/views/merchbay/cart.blade.php
View File

@@ -103,7 +103,7 @@
<th>Quantity</th>
<th></th>
</tr>
@elseif($item->FormUsed=="tshirt-form")
@elseif($item->FormUsed == 'tshirt-form')
<tr>
<th>Size</th>
<th>Price</th>
@@ -111,7 +111,7 @@
<th></th>
</tr>
@elseif($item->FormUsed=="quantity-form")
@elseif($item->FormUsed == 'quantity-form')
<tr>
<th>Price</th>
<th>Quantity</th>
@@ -119,7 +119,7 @@
</tr>
@elseif($item->FormUsed=="name-number-form")
@elseif($item->FormUsed == 'name-number-form')
<tr>
<th>Name</th>
<th>Number</th>
@@ -128,7 +128,7 @@
<th></th>
</tr>
@elseif($item->FormUsed=="name-number-size-form")
@elseif($item->FormUsed == 'name-number-size-form')
<tr>
<th>Name</th>
<th>Number</th>
@@ -138,14 +138,14 @@
<th></th>
</tr>
@elseif($item->FormUsed=="number-form")
@elseif($item->FormUsed == 'number-form')
<tr>
<th>Number</th>
<th>Price</th>
<th>Quantity</th>
<th></th>
</tr>
@elseif($item->FormUsed=="name-name2-size-form")
@elseif($item->FormUsed == 'name-name2-size-form')
<tr>
<th>Gamer Tag</th>
<th>Name</th>
@@ -154,7 +154,7 @@
<th>Quantity</th>
<th></th>
</tr>
@elseif($item->FormUsed=="name-size-form")
@elseif($item->FormUsed == 'name-size-form')
<tr>
<th>Name</th>
<th>Size</th>
@@ -162,7 +162,7 @@
<th>Quantity</th>
<th></th>
</tr>
@elseif($item->FormUsed=="jersey-and-shorts-quantity-form")
@elseif($item->FormUsed == 'jersey-and-shorts-quantity-form')
<tr>
<th>Jersey Size</th>
<th>Shorts Size</th>
@@ -170,7 +170,7 @@
<th>Quantity</th>
<th></th>
</tr>
@elseif($item->FormUsed=="number-jersey-shorts-form")
@elseif($item->FormUsed == 'number-jersey-shorts-form')
<tr>
<th>Number</th>
<th>Jersey Size</th>
@@ -199,7 +199,7 @@
href="{{ url('removeitem') }}/{{ $sub_item->Id }}"><i
class="fa fa-times"></i></a></td>
</tr>
@elseif($item->FormUsed=="tshirt-form")
@elseif($item->FormUsed == 'tshirt-form')
<tr>
<td>{{ $sub_item->Size }}</td>
<td>{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }}
@@ -209,7 +209,7 @@
href="{{ url('removeitem') }}/{{ $sub_item->Id }}"><i
class="fa fa-times"></i></a></td>
</tr>
@elseif($item->FormUsed=="quantity-form")
@elseif($item->FormUsed == 'quantity-form')
<tr>
<td>{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }}
</td>
@@ -218,7 +218,7 @@
href="{{ url('removeitem') }}/{{ $sub_item->Id }}"><i
class="fa fa-times"></i></a></td>
</tr>
@elseif($item->FormUsed=="name-number-form")
@elseif($item->FormUsed == 'name-number-form')
<tr>
<td>{{ $sub_item->Name }}</td>
<td>{{ $sub_item->Number }}</td>
@@ -229,7 +229,7 @@
href="{{ url('removeitem') }}/{{ $sub_item->Id }}"><i
class="fa fa-times"></i></a></td>
</tr>
@elseif($item->FormUsed=="name-number-size-form")
@elseif($item->FormUsed == 'name-number-size-form')
<tr>
<td>{{ $sub_item->Name }}</td>
<td>{{ $sub_item->Number }}</td>
@@ -241,7 +241,7 @@
href="{{ url('removeitem') }}/{{ $sub_item->Id }}"><i
class="fa fa-times"></i></a></td>
</tr>
@elseif($item->FormUsed=="number-form")
@elseif($item->FormUsed == 'number-form')
<tr>
<td>{{ $sub_item->Number }}</td>
<td>{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }}
@@ -251,7 +251,7 @@
href="{{ url('removeitem') }}/{{ $sub_item->Id }}"><i
class="fa fa-times"></i></a></td>
</tr>
@elseif($item->FormUsed=="name-name2-size-form")
@elseif($item->FormUsed == 'name-name2-size-form')
<tr>
<td>{{ $sub_item->Name }}</td>
<td>{{ $sub_item->Name2 }}</td>
@@ -263,7 +263,7 @@
href="{{ url('removeitem') }}/{{ $sub_item->Id }}"><i
class="fa fa-times"></i></a></td>
</tr>
@elseif($item->FormUsed=="name-size-form")
@elseif($item->FormUsed == 'name-size-form')
<tr>
<td>{{ $sub_item->Name }}</td>
<td>{{ $sub_item->Size }}</td>
@@ -274,7 +274,7 @@
href="{{ url('removeitem') }}/{{ $sub_item->Id }}"><i
class="fa fa-times"></i></a></td>
</tr>
@elseif($item->FormUsed=="jersey-and-shorts-quantity-form")
@elseif($item->FormUsed == 'jersey-and-shorts-quantity-form')
<tr>
<td>{{ $sub_item->JerseySize }}</td>
<td>{{ $sub_item->ShortsSize }}</td>
@@ -285,7 +285,7 @@
href="{{ url('removeitem') }}/{{ $sub_item->Id }}"><i
class="fa fa-times"></i></a></td>
</tr>
@elseif($item->FormUsed=="number-jersey-shorts-form")
@elseif($item->FormUsed == 'number-jersey-shorts-form')
<tr>
<td>{{ $sub_item->Number }}</td>
<td>{{ $sub_item->JerseySize }}</td>
@@ -360,16 +360,22 @@
<small>{{ $store_array[0]->StoreCurrency }}</small>
</h3>
@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) }} {{ $store_array[0]->StoreCurrency }}</strong> away.
</div>
@if ($shipping_fee)
@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) }}
{{ $store_array[0]->StoreCurrency }}</strong> away.
</div>
@endif
@else
<div class="border rounded-2 p-2 mt-2">
Congratulations! You have activated free shipping!
</div>
@endif
{{-- {{ var_dump($tax) }}
{{ var_dump($shipping_fee) }} --}}
<hr>
@@ -414,8 +420,8 @@
<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.