merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge cart issue fixed for downloadable product

This commit is contained in:
jitendra 2019-09-11 11:21:12 +05:30
parent 128dde536e
commit 1ce4dfea95
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/bundle-items.blade.php
View File

@ -76,7 +76,7 @@
<div class="control-group" :class="[errors.has(inputName + '[sort_order]') ? 'has-error' : '']">
<label class="required">{{ __('admin::app.catalog.products.sort-order') }}</label>
<input type="text" v-validate="'required'" :name="inputName + '[sort_order]'" v-model="option.sort_order" class="control" data-vv-as="&quot;{{ __('admin::app.catalog.products.sort-order') }}&quot;"/>
<input type="text" v-validate="'required|numeric|min_value:0'" :name="inputName + '[sort_order]'" v-model="option.sort_order" class="control" data-vv-as="&quot;{{ __('admin::app.catalog.products.sort-order') }}&quot;"/>
<span class="control-error" v-if="errors.has(inputName + '[sort_order]')">@{{ errors.first(inputName + '[sort_order]') }}</span>
</div>

4
packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/downloadable.blade.php
View File

@ -158,7 +158,7 @@
<td>
<div class="control-group" :class="[errors.has(linkInputName + '[sort_order]') ? 'has-error' : '']">
<input type="number" v-validate="'required'" v-model="link.sort_order" :name="[linkInputName + '[sort_order]']" class="control" data-vv-as="&quot;{{ __('admin::app.catalog.products.sort-order') }}&quot;"/>
<input type="number" v-validate="'required|numeric|min_value:0'" v-model="link.sort_order" :name="[linkInputName + '[sort_order]']" class="control" data-vv-as="&quot;{{ __('admin::app.catalog.products.sort-order') }}&quot;"/>
<span class="control-error" v-if="errors.has(linkInputName + '[sort_order]')">@{{ errors.first(linkInputName + '[sort_order]') }}</span>
</div>
@ -250,7 +250,7 @@
<td>
<div class="control-group" :class="[errors.has(sampleInputName + '[sort_order]') ? 'has-error' : '']">
<input type="number" v-validate="'required'" v-model="sample.sort_order" :name="[sampleInputName + '[sort_order]']" class="control" data-vv-as="&quot;{{ __('admin::app.catalog.products.sort-order') }}&quot;"/>
<input type="number" v-validate="'required|numeric|min_value:0'" v-model="sample.sort_order" :name="[sampleInputName + '[sort_order]']" class="control" data-vv-as="&quot;{{ __('admin::app.catalog.products.sort-order') }}&quot;"/>
<span class="control-error" v-if="errors.has(sampleInputName + '[sort_order]')">@{{ errors.first(sampleInputName + '[sort_order]') }}</span>
</div>

14
packages/Webkul/Checkout/src/Cart.php
View File

@ -331,14 +331,16 @@ class Cart {
}
foreach ($guestCart->items as $key => $guestCartItem) {
$found = false;
foreach ($cart->items as $cartItem) {
if (! $cartItem->product->getTypeInstance()->compareOptions($cartItem->additional, $guestCartItem->additional))
continue;
$cartItem->quantity = $newQuantity = $cartItem->quantity + $guestCartItem->quantity;
if ($this->isItemHaveQuantity($cartItem)) {
if (! $this->isItemHaveQuantity($cartItem)) {
$this->cartItemRepository->delete($guestCartItem->id);
continue;
@ -681,7 +683,7 @@ class Cart {
if (! $cart = $this->getCart())
return false;
if (! $shippingAddress = $cart->shipping_address)
if (! $address = $cart->shipping_address)
return;
foreach ($cart->items()->get() as $item) {
@ -691,8 +693,8 @@ class Cart {
continue;
$taxRates = $taxCategory->tax_rates()->where([
'state' => $shippingAddress->state,
'country' => $shippingAddress->country,
'state' => $address->state,
'country' => $address->country,
])->orderBy('tax_rate', 'desc')->get();
if (count( $taxRates) > 0) {
@ -700,11 +702,11 @@ class Cart {
$haveTaxRate = false;
if (! $rate->is_zip) {
if ($rate->zip_code == '*' || $rate->zip_code == $shippingAddress->postcode) {
if ($rate->zip_code == '*' || $rate->zip_code == $address->postcode) {
$haveTaxRate = true;
}
} else {
if ($shippingAddress->postcode >= $rate->zip_from && $shippingAddress->postcode <= $rate->zip_to) {
if ($address->postcode >= $rate->zip_from && $address->postcode <= $rate->zip_to) {
$haveTaxRate = true;
}
}