removed some bugs from summary blade for cart rule
This commit is contained in:
Prashant Singh
parent
131c73ce04
commit
26270979fd
|
|
@ -415,6 +415,7 @@ class Discount
|
|||
if ($action_type == config('pricerules.cart.validation.2')) {
|
||||
array_push($maxImpacts, [
|
||||
'id' => $rule->id,
|
||||
'rule' => $rule,
|
||||
'item_id' => $leastWorthItem['id'],
|
||||
'amount_given' => false,
|
||||
'amount' => $newQuantity,
|
||||
|
|
@ -423,6 +424,7 @@ class Discount
|
|||
} else {
|
||||
array_push($maxImpacts, [
|
||||
'id' => $rule->id,
|
||||
'rule' => $rule,
|
||||
'item_id' => $leastWorthItem['id'],
|
||||
'amount_given' => true,
|
||||
'amount' => $newBaseSubTotal,
|
||||
|
|
@ -435,8 +437,8 @@ class Discount
|
|||
}
|
||||
|
||||
$leastItemAvg = 999999999999;
|
||||
$leastId = 0;
|
||||
foreach($maxImpacts as $maxImpact) {
|
||||
$leastId = -1;
|
||||
foreach ($maxImpacts as $key => $maxImpact) {
|
||||
$minItemPrice = array();
|
||||
|
||||
if ($maxImpact['action_type'] == config('pricerules.cart.validation.2')) {
|
||||
|
|
@ -444,20 +446,21 @@ class Discount
|
|||
|
||||
if ($amount < $leastItemAvg) {
|
||||
$leastItemAvg = $amount;
|
||||
$leastId = $maxImpact['id'];
|
||||
$leastId = $key;
|
||||
}
|
||||
} else {
|
||||
$amount = $maxImpact['amount'] / $cart->items_qty;
|
||||
|
||||
if ($amount < $leastItemAvg) {
|
||||
$leastItemAvg = $amount;
|
||||
$leastId = $maxImpact['id'];
|
||||
$leastId = $key;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ($leastId != 0)
|
||||
return $this->cartRule->find($leastId);
|
||||
if ($leastId != -1) {
|
||||
return $maxImpacts[$leastId];
|
||||
}
|
||||
}
|
||||
|
||||
public function ruleCheck($code)
|
||||
|
|
|
|||
|
|
@ -114,13 +114,12 @@ class OnepageController extends Controller
|
|||
|
||||
$cart = Cart::getCart();
|
||||
|
||||
$rules = Cart::applyNonCoupon();
|
||||
dd($rules);
|
||||
$rule = Cart::applyNonCoupon();
|
||||
|
||||
return response()->json([
|
||||
'jump_to_section' => 'review',
|
||||
'html' => view('shop::checkout.onepage.review', compact('cart'))->render()
|
||||
]);
|
||||
'jump_to_section' => 'review',
|
||||
'html' => view('shop::checkout.onepage.review', compact('cart', 'rule'))->render()
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -141,9 +140,9 @@ class OnepageController extends Controller
|
|||
|
||||
if ($redirectUrl = Payment::getRedirectUrl($cart)) {
|
||||
return response()->json([
|
||||
'success' => true,
|
||||
'redirect_url' => $redirectUrl
|
||||
]);
|
||||
'success' => true,
|
||||
'redirect_url' => $redirectUrl
|
||||
]);
|
||||
}
|
||||
|
||||
$order = $this->orderRepository->create(Cart::prepareDataForOrder());
|
||||
|
|
@ -153,8 +152,8 @@ class OnepageController extends Controller
|
|||
session()->flash('order', $order);
|
||||
|
||||
return response()->json([
|
||||
'success' => true,
|
||||
]);
|
||||
'success' => true,
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -167,7 +167,5 @@
|
|||
<div class="pull-right" style="width: 40%; float: left;">
|
||||
@include('shop::checkout.total.summary', ['cart' => $cart])
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
|
@ -34,35 +34,60 @@
|
|||
@inject('cart_rule', 'Webkul\Discount\Helpers\Discount')
|
||||
|
||||
@if (! request()->is('checkout/cart'))
|
||||
<form class="coupon-form" method="post" @submit.prevent="onSubmit" v-if="discounted == false">
|
||||
<div class="control-group mt-20">
|
||||
<input v-model="code" type="text" class="control" value="" name="code" placeholder="Enter Coupon Code" v-on:change="codeChange" style="width: 100%">
|
||||
@if (isset($rule['rule']) && ! $rule['rule']->end_other_rules)
|
||||
<form class="coupon-form" method="post" @submit.prevent="onSubmit" v-if="discounted == false">
|
||||
<div class="control-group mt-20">
|
||||
<input v-model="code" type="text" class="control" value="" name="code" placeholder="Enter Coupon Code" v-on:change="codeChange" style="width: 100%">
|
||||
|
||||
<span class="coupon-message mt-5" style="display: block; color: #ff5656; margin-bottom: 5px;" v-if="message != 'Success' && message != 'success'">@{{ message }}</span>
|
||||
<span class="coupon-message mt-5" style="display: block; color: #ff5656; margin-bottom: 5px;" v-if="message != 'Success' && message != 'success'">@{{ message }}</span>
|
||||
|
||||
<span class="coupon-message mt-5" style="display: block; margin-bottom: 5px;" v-if="message == 'Success' || message == 'success'">@{{ message }}</span>
|
||||
<span class="coupon-message mt-5" style="display: block; margin-bottom: 5px;" v-if="message == 'Success' || message == 'success'">@{{ message }}</span>
|
||||
|
||||
<button class="btn btn-lg btn-black">Apply Coupon</button>
|
||||
<button class="btn btn-lg btn-black">Apply Coupon</button>
|
||||
</div>
|
||||
</form>
|
||||
@endif
|
||||
|
||||
@if($rule)
|
||||
<div class="discounted" v-if="! discounted">
|
||||
<div class="mt-15 mb-10">
|
||||
{{ $rule['rule']->name }} applied
|
||||
</div>
|
||||
|
||||
<span class="horizontal-rule"></span>
|
||||
|
||||
<span class="row mt-10">
|
||||
@if ($rule['amount_given'])
|
||||
<label style="float: left;">Amount Payable</label>
|
||||
|
||||
<label style="float: right;">{{ core()->currency($cart->tax_total + $rule['amount']) }}</label>
|
||||
@else
|
||||
<label style="float: left;">Got</label>
|
||||
<label style="float: right;">{{ $rule['amount'] }} Free</label>
|
||||
@endif
|
||||
</span>
|
||||
</div>
|
||||
</form>
|
||||
@endif
|
||||
|
||||
<div class="discounted" v-if="discounted">
|
||||
<div class="mt-15 mb-10">
|
||||
<b>Coupon used</b>
|
||||
@if (! $rule['rule']->end_other_rules)
|
||||
<div class="discounted" v-if="discounted">
|
||||
<div class="mt-15 mb-10">
|
||||
<b>Coupon used</b>
|
||||
</div>
|
||||
|
||||
<span class="row mb-10">
|
||||
<label style="float: left;">@{{ code }}</label>
|
||||
<label style="float: right;">@{{ discount.amount_given }}</label>
|
||||
</span>
|
||||
|
||||
<span class="horizontal-rule"></span>
|
||||
|
||||
<span class="row mt-10">
|
||||
<label style="float: left;">Amount Payable</label>
|
||||
<label style="float: right;">@{{ discount.amount }}</label>
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<span class="row mb-10">
|
||||
<label style="float: left;">@{{ code }}</label>
|
||||
<label style="float: right;">@{{ discount.amount_given }}</label>
|
||||
</span>
|
||||
|
||||
<span class="horizontal-rule"></span>
|
||||
|
||||
<span class="row mt-10">
|
||||
<label style="float: left;">Amount Payable</label>
|
||||
<label style="float: right;">@{{ discount.amount }}</label>
|
||||
</span>
|
||||
</div>
|
||||
@endif
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Reference in New Issue