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

Merge pull request #3882 from devansh-webkul/variant_issue 

Fixed #3874
This commit is contained in:
Jitendra Singh 2020-10-09 16:56:20 +05:30 committed by GitHub
parent 850fed2678 dc17e4799d
commit b0ba7bf754
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 64 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Velocity/publishable/assets/js/velocity.js vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Velocity/publishable/assets/mix-manifest.json
View File

@ -1,5 +1,5 @@
{
"/js/velocity.js": "/js/velocity.js?id=4f93a5fcaa9e170dd72f",
"/js/velocity.js": "/js/velocity.js?id=c4d3d75a0e1999b9baad",
"/css/velocity-admin.css": "/css/velocity-admin.css?id=4322502d80a0e4a0affd",
"/css/velocity.css": "/css/velocity.css?id=a37ae1fb6f34223126b8"
}

19
packages/Webkul/Velocity/src/Resources/assets/js/UI/components/add-to-cart.vue
View File

@ -1,9 +1,25 @@
<template>
<form method="POST" @submit.prevent="addToCart">
<!-- for move to cart from wishlist -->
<a
:href="wishlistMoveRoute"
:disabled="isButtonEnable == 'false' || isButtonEnable == false"
:class="`btn btn-add-to-cart ${addClassToBtn}`"
v-if="moveToCart"
>
<i class="material-icons text-down-3" v-if="showCartIcon">shopping_cart</i>
<span class="fs14 fw6 text-uppercase text-up-4" v-text="btnText"></span>
</a>
<!-- for add to cart -->
<button
type="submit"
:disabled="isButtonEnable == 'false' || isButtonEnable == false"
:class="`btn btn-add-to-cart ${addClassToBtn}`">
:class="`btn btn-add-to-cart ${addClassToBtn}`"
v-else
>
<i class="material-icons text-down-3" v-if="showCartIcon">shopping_cart</i>
@ -22,6 +38,7 @@
'productId',
'reloadPage',
'moveToCart',
'wishlistMoveRoute',
'showCartIcon',
'addClassToBtn',
'productFlatId',

25
packages/Webkul/Velocity/src/Resources/views/shop/customers/account/wishlist/wishlist.blade.php
View File

@ -23,7 +23,7 @@
{!! view_render_event('bagisto.shop.customers.account.wishlist.list.before', ['wishlist' => $items]) !!}
<div class="account-items-list row wishlist-container">
<div class="wishlist-container">
@if ($items->count())
@foreach ($items as $item)
@ -33,19 +33,22 @@
@endphp
@include ('shop::products.list.card', [
'checkmode' => true,
'moveToCart' => true,
'addToCartForm' => true,
'removeWishlist' => true,
'reloadPage' => true,
'itemId' => $item->id,
'product' => $item->product,
'btnText' => $moveToCartText,
'addToCartBtnClass' => 'small-padding',
'list' => true,
'checkmode' => true,
'moveToCart' => true,
'wishlistMoveRoute' => route('customer.wishlist.move', $item->id),
'addToCartForm' => true,
'removeWishlist' => true,
'reloadPage' => true,
'itemId' => $item->id,
'product' => $item->product,
'additionalAttributes' => true,
'btnText' => $moveToCartText,
'addToCartBtnClass' => 'small-padding',
])
@endforeach
<div class="bottom-toolbar">
<div>
{{ $items->links() }}
</div>
@else

5
packages/Webkul/Velocity/src/Resources/views/shop/products/add-to-cart.blade.php
View File

@ -67,10 +67,11 @@
product-id="{{ $product->product_id }}"
reload-page="{{ $reloadPage ?? false }}"
move-to-cart="{{ $moveToCart ?? false }}"
wishlist-move-route="{{ $wishlistMoveRoute ?? false }}"
add-class-to-btn="{{ $addToCartBtnClass ?? '' }}"
is-enable={{ ! $product->isSaleable() ? 'false' : 'true' }}
show-cart-icon={{ !(isset($showCartIcon) && !$showCartIcon) }}
btn-text="{{ ($product->type == 'booking') ? __('shop::app.products.book-now') : $btnText ?? __('shop::app.products.add-to-cart') }}">
show-cart-icon={{ ! (isset($showCartIcon) && ! $showCartIcon) }}
btn-text="{{ (! isset($moveToCart) && $product->type == 'booking') ? __('shop::app.products.book-now') : $btnText ?? __('shop::app.products.add-to-cart') }}">
</add-to-cart>
@endif
</div>

29
packages/Webkul/Velocity/src/Resources/views/shop/products/list/card.blade.php
View File

@ -26,7 +26,7 @@
$galleryImages = $productImageHelper->getGalleryImages($product);
$priceHTML = view('shop::products.price', ['product' => $product])->render();
$product->__set('priceHTML', $priceHTML);
$product->__set('avgRating', $avgRatings);
$product->__set('totalReviews', $totalReviews);
@ -73,6 +73,18 @@
<span class="fs16">{{ $product->name }}</span>
</a>
@if (isset($additionalAttributes) && $additionalAttributes)
@if (isset($item->additional['attributes']))
<div class="item-options">
@foreach ($item->additional['attributes'] as $attribute)
<b>{{ $attribute['attribute_name'] }} : </b>{{ $attribute['option_label'] }}</br>
@endforeach
</div>
@endif
@endif
</div>
<div class="product-price">
@ -115,7 +127,7 @@
{{-- <product-quick-view-btn :quick-view-details="product"></product-quick-view-btn> --}}
<product-quick-view-btn :quick-view-details="{{ json_encode($product) }}"></product-quick-view-btn>
</a>
@if ($product->new)
<div class="sticker new">
{{ __('shop::app.products.new') }}
@ -130,6 +142,18 @@
class="unset">
<span class="fs16">{{ $product->name }}</span>
@if (isset($additionalAttributes) && $additionalAttributes)
@if (isset($item->additional['attributes']))
<div class="item-options">
@foreach ($item->additional['attributes'] as $attribute)
<b>{{ $attribute['attribute_name'] }} : </b>{{ $attribute['option_label'] }}</br>
@endforeach
</div>
@endif
@endif
</a>
</div>
@ -155,6 +179,7 @@
'product' => $product,
'btnText' => $btnText ?? null,
'moveToCart' => $moveToCart ?? null,
'wishlistMoveRoute' => $wishlistMoveRoute ?? null,
'reloadPage' => $reloadPage ?? null,
'addToCartForm' => $addToCartForm ?? false,
'addToCartBtnClass' => $addToCartBtnClass ?? '',