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; $m = new TeamStoreModel;
$UserModel = new UserModel; $UserModel = new UserModel;
$userId = 0; $userId = 0;
if (!Auth::guest()) { if (!Auth::guest()) {
$userId = Auth::user()->id; $userId = Auth::user()->id;
} }
@@ -299,9 +300,6 @@ class PaypalController extends Controller
$items = $m->myCart($cartKey); // item from cart_tmp $items = $m->myCart($cartKey); // item from cart_tmp
$getSubtotal = $m->getSubtotal($cartKey); $getSubtotal = $m->getSubtotal($cartKey);
// var_dump($getSubtotal); // var_dump($getSubtotal);
if($getSubtotal[0]->Subtotal >= 99) {
return $shippingFee = 0;
}
$getSmallItemQty = 0; $getSmallItemQty = 0;
$getBulkyItemQty = 0; $getBulkyItemQty = 0;
@@ -337,8 +335,9 @@ class PaypalController extends Controller
// ); // );
} }
} }
// var_dump($item->ShippingCostId);
if ($item->ShippingCostId == 1) { if ($item->ShippingCostId == 1) {
$getSmallItemQty += $item->Quantity; $getSmallItemQty += $item->Quantity;
} else if ($item->ShippingCostId == 2) { } else if ($item->ShippingCostId == 2) {
$getBulkyItemQty += $item->Quantity; $getBulkyItemQty += $item->Quantity;
@@ -360,12 +359,15 @@ class PaypalController extends Controller
// $getSmallItemQty = ceil($getSmallItemQty / 3) * 8.99; // $getSmallItemQty = ceil($getSmallItemQty / 3) * 8.99;
if($getSmallItemQty >= 2) { if($getSmallItemQty >= 1) {
$getSmallItemQty = ceil(($getSmallItemQty - 1) / 1) * 2.49; if($getSmallItemQty >= 2) {
$getSmallItemQty = $getSmallItemQty + 8.99; $getSmallItemQty = ceil(($getSmallItemQty - 1) / 1) * 2.49;
}else { $getSmallItemQty = $getSmallItemQty + 8.99;
$getSmallItemQty = 8.99; }else {
$getSmallItemQty = 8.99;
}
} }
$getBulkyItemQty = ceil($getBulkyItemQty / 1) * 8; $getBulkyItemQty = ceil($getBulkyItemQty / 1) * 8;
$getMaskItemQty = ceil($getMaskItemQty / 25) * 8; $getMaskItemQty = ceil($getMaskItemQty / 25) * 8;
@@ -375,6 +377,10 @@ class PaypalController extends Controller
if ($countryCode == "CA") { if ($countryCode == "CA") {
$shippingFee = $CAShippingfee; $shippingFee = $CAShippingfee;
} }
if($getSubtotal[0]->Subtotal >= 99 && $countryCode != "CA") {
return $shippingFee = 0;
}
return $shippingFee; return $shippingFee;
} }

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

@@ -103,7 +103,7 @@
<th>Quantity</th> <th>Quantity</th>
<th></th> <th></th>
</tr> </tr>
@elseif($item->FormUsed=="tshirt-form") @elseif($item->FormUsed == 'tshirt-form')
<tr> <tr>
<th>Size</th> <th>Size</th>
<th>Price</th> <th>Price</th>
@@ -111,7 +111,7 @@
<th></th> <th></th>
</tr> </tr>
@elseif($item->FormUsed=="quantity-form") @elseif($item->FormUsed == 'quantity-form')
<tr> <tr>
<th>Price</th> <th>Price</th>
<th>Quantity</th> <th>Quantity</th>
@@ -119,7 +119,7 @@
</tr> </tr>
@elseif($item->FormUsed=="name-number-form") @elseif($item->FormUsed == 'name-number-form')
<tr> <tr>
<th>Name</th> <th>Name</th>
<th>Number</th> <th>Number</th>
@@ -128,7 +128,7 @@
<th></th> <th></th>
</tr> </tr>
@elseif($item->FormUsed=="name-number-size-form") @elseif($item->FormUsed == 'name-number-size-form')
<tr> <tr>
<th>Name</th> <th>Name</th>
<th>Number</th> <th>Number</th>
@@ -138,14 +138,14 @@
<th></th> <th></th>
</tr> </tr>
@elseif($item->FormUsed=="number-form") @elseif($item->FormUsed == 'number-form')
<tr> <tr>
<th>Number</th> <th>Number</th>
<th>Price</th> <th>Price</th>
<th>Quantity</th> <th>Quantity</th>
<th></th> <th></th>
</tr> </tr>
@elseif($item->FormUsed=="name-name2-size-form") @elseif($item->FormUsed == 'name-name2-size-form')
<tr> <tr>
<th>Gamer Tag</th> <th>Gamer Tag</th>
<th>Name</th> <th>Name</th>
@@ -154,7 +154,7 @@
<th>Quantity</th> <th>Quantity</th>
<th></th> <th></th>
</tr> </tr>
@elseif($item->FormUsed=="name-size-form") @elseif($item->FormUsed == 'name-size-form')
<tr> <tr>
<th>Name</th> <th>Name</th>
<th>Size</th> <th>Size</th>
@@ -162,7 +162,7 @@
<th>Quantity</th> <th>Quantity</th>
<th></th> <th></th>
</tr> </tr>
@elseif($item->FormUsed=="jersey-and-shorts-quantity-form") @elseif($item->FormUsed == 'jersey-and-shorts-quantity-form')
<tr> <tr>
<th>Jersey Size</th> <th>Jersey Size</th>
<th>Shorts Size</th> <th>Shorts Size</th>
@@ -170,7 +170,7 @@
<th>Quantity</th> <th>Quantity</th>
<th></th> <th></th>
</tr> </tr>
@elseif($item->FormUsed=="number-jersey-shorts-form") @elseif($item->FormUsed == 'number-jersey-shorts-form')
<tr> <tr>
<th>Number</th> <th>Number</th>
<th>Jersey Size</th> <th>Jersey Size</th>
@@ -199,7 +199,7 @@
href="{{ url('removeitem') }}/{{ $sub_item->Id }}"><i href="{{ url('removeitem') }}/{{ $sub_item->Id }}"><i
class="fa fa-times"></i></a></td> class="fa fa-times"></i></a></td>
</tr> </tr>
@elseif($item->FormUsed=="tshirt-form") @elseif($item->FormUsed == 'tshirt-form')
<tr> <tr>
<td>{{ $sub_item->Size }}</td> <td>{{ $sub_item->Size }}</td>
<td>{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }} <td>{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }}
@@ -209,7 +209,7 @@
href="{{ url('removeitem') }}/{{ $sub_item->Id }}"><i href="{{ url('removeitem') }}/{{ $sub_item->Id }}"><i
class="fa fa-times"></i></a></td> class="fa fa-times"></i></a></td>
</tr> </tr>
@elseif($item->FormUsed=="quantity-form") @elseif($item->FormUsed == 'quantity-form')
<tr> <tr>
<td>{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }} <td>{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }}
</td> </td>
@@ -218,7 +218,7 @@
href="{{ url('removeitem') }}/{{ $sub_item->Id }}"><i href="{{ url('removeitem') }}/{{ $sub_item->Id }}"><i
class="fa fa-times"></i></a></td> class="fa fa-times"></i></a></td>
</tr> </tr>
@elseif($item->FormUsed=="name-number-form") @elseif($item->FormUsed == 'name-number-form')
<tr> <tr>
<td>{{ $sub_item->Name }}</td> <td>{{ $sub_item->Name }}</td>
<td>{{ $sub_item->Number }}</td> <td>{{ $sub_item->Number }}</td>
@@ -229,7 +229,7 @@
href="{{ url('removeitem') }}/{{ $sub_item->Id }}"><i href="{{ url('removeitem') }}/{{ $sub_item->Id }}"><i
class="fa fa-times"></i></a></td> class="fa fa-times"></i></a></td>
</tr> </tr>
@elseif($item->FormUsed=="name-number-size-form") @elseif($item->FormUsed == 'name-number-size-form')
<tr> <tr>
<td>{{ $sub_item->Name }}</td> <td>{{ $sub_item->Name }}</td>
<td>{{ $sub_item->Number }}</td> <td>{{ $sub_item->Number }}</td>
@@ -241,7 +241,7 @@
href="{{ url('removeitem') }}/{{ $sub_item->Id }}"><i href="{{ url('removeitem') }}/{{ $sub_item->Id }}"><i
class="fa fa-times"></i></a></td> class="fa fa-times"></i></a></td>
</tr> </tr>
@elseif($item->FormUsed=="number-form") @elseif($item->FormUsed == 'number-form')
<tr> <tr>
<td>{{ $sub_item->Number }}</td> <td>{{ $sub_item->Number }}</td>
<td>{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }} <td>{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }}
@@ -251,7 +251,7 @@
href="{{ url('removeitem') }}/{{ $sub_item->Id }}"><i href="{{ url('removeitem') }}/{{ $sub_item->Id }}"><i
class="fa fa-times"></i></a></td> class="fa fa-times"></i></a></td>
</tr> </tr>
@elseif($item->FormUsed=="name-name2-size-form") @elseif($item->FormUsed == 'name-name2-size-form')
<tr> <tr>
<td>{{ $sub_item->Name }}</td> <td>{{ $sub_item->Name }}</td>
<td>{{ $sub_item->Name2 }}</td> <td>{{ $sub_item->Name2 }}</td>
@@ -263,7 +263,7 @@
href="{{ url('removeitem') }}/{{ $sub_item->Id }}"><i href="{{ url('removeitem') }}/{{ $sub_item->Id }}"><i
class="fa fa-times"></i></a></td> class="fa fa-times"></i></a></td>
</tr> </tr>
@elseif($item->FormUsed=="name-size-form") @elseif($item->FormUsed == 'name-size-form')
<tr> <tr>
<td>{{ $sub_item->Name }}</td> <td>{{ $sub_item->Name }}</td>
<td>{{ $sub_item->Size }}</td> <td>{{ $sub_item->Size }}</td>
@@ -274,7 +274,7 @@
href="{{ url('removeitem') }}/{{ $sub_item->Id }}"><i href="{{ url('removeitem') }}/{{ $sub_item->Id }}"><i
class="fa fa-times"></i></a></td> class="fa fa-times"></i></a></td>
</tr> </tr>
@elseif($item->FormUsed=="jersey-and-shorts-quantity-form") @elseif($item->FormUsed == 'jersey-and-shorts-quantity-form')
<tr> <tr>
<td>{{ $sub_item->JerseySize }}</td> <td>{{ $sub_item->JerseySize }}</td>
<td>{{ $sub_item->ShortsSize }}</td> <td>{{ $sub_item->ShortsSize }}</td>
@@ -285,7 +285,7 @@
href="{{ url('removeitem') }}/{{ $sub_item->Id }}"><i href="{{ url('removeitem') }}/{{ $sub_item->Id }}"><i
class="fa fa-times"></i></a></td> class="fa fa-times"></i></a></td>
</tr> </tr>
@elseif($item->FormUsed=="number-jersey-shorts-form") @elseif($item->FormUsed == 'number-jersey-shorts-form')
<tr> <tr>
<td>{{ $sub_item->Number }}</td> <td>{{ $sub_item->Number }}</td>
<td>{{ $sub_item->JerseySize }}</td> <td>{{ $sub_item->JerseySize }}</td>
@@ -360,16 +360,22 @@
<small>{{ $store_array[0]->StoreCurrency }}</small> <small>{{ $store_array[0]->StoreCurrency }}</small>
</h3> </h3>
@if ($getSubtotal >= 1 && $getSubtotal <= 98) @if ($shipping_fee)
<div class="border rounded-2 p-2 mt-2"> @if ($getSubtotal >= 1 && $getSubtotal <= 98)
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 class="border rounded-2 p-2 mt-2">
</div> 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 @else
<div class="border rounded-2 p-2 mt-2"> <div class="border rounded-2 p-2 mt-2">
Congratulations! You have activated free shipping! Congratulations! You have activated free shipping!
</div> </div>
@endif @endif
{{-- {{ var_dump($tax) }} {{-- {{ var_dump($tax) }}
{{ var_dump($shipping_fee) }} --}} {{ var_dump($shipping_fee) }} --}}
<hr> <hr>
@@ -414,8 +420,8 @@
<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> style="background-color: #ffc300; border-color: #e2ad00; text-align: -webkit-center;">Checkout</a><br>
<!-- <div class="my-2"> <!-- <div class="my-2">
<button class="btn btn-lg btn-info w-100">Checkout with Voucher</button> <button class="btn btn-lg btn-info w-100">Checkout with Voucher</button>
</div> --> </div> -->
<div class="border rounded-2 p-2 mt-2"> <div class="border rounded-2 p-2 mt-2">
Payments made on Merchbay will show up as Crewsportswear on your order confirmations and Payments made on Merchbay will show up as Crewsportswear on your order confirmations and
receipt. receipt.