From 270e20ce33219f3cebd0cf0b1001707843965b9e Mon Sep 17 00:00:00 2001 From: Devansh Date: Thu, 3 Sep 2020 20:41:20 +0530 Subject: [PATCH 01/45] Variant Issue Fixed --- .../account/wishlist/wishlist.blade.php | 59 ++++++++++++++----- 1 file changed, 43 insertions(+), 16 deletions(-) diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/wishlist/wishlist.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/wishlist/wishlist.blade.php index ffdb4d665..2ba351fdb 100644 --- a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/wishlist/wishlist.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/wishlist/wishlist.blade.php @@ -1,4 +1,5 @@ @inject ('toolbarHelper', 'Webkul\Product\Helpers\Toolbar') +@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage') @extends('shop::customers.account.index') @@ -27,26 +28,52 @@ @if ($items->count()) @foreach ($items as $item) - @php - $currentMode = $toolbarHelper->getCurrentMode(); - $moveToCartText = __('shop::app.customer.account.wishlist.move-to-cart'); - @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', - ]) + +
+ +
+ +
+ +
+
+
+ + + {{ $item->product->name }} + + @if (isset($item->additional['attributes'])) +
+ + @foreach ($item->additional['attributes'] as $attribute) + {{ $attribute['attribute_name'] }} : {{ $attribute['option_label'] }}
+ @endforeach + +
+ @endif + +
+ +
+ @include ('shop::products.price', ['product' => $item->product]) +
+
+
+
@endforeach
- {{ $items->links() }} + {{ $items->links() }}
@else
From ae95459974c4e35806a6ffff8c64a2fd9f2343bc Mon Sep 17 00:00:00 2001 From: Devansh Date: Fri, 4 Sep 2020 01:00:31 +0530 Subject: [PATCH 02/45] Move To Cart Button Added --- .../customers/account/wishlist/wishlist.blade.php | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/wishlist/wishlist.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/wishlist/wishlist.blade.php index 2ba351fdb..caa220814 100644 --- a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/wishlist/wishlist.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/wishlist/wishlist.blade.php @@ -37,15 +37,12 @@ -
- -
-
+
@@ -67,6 +64,16 @@
@include ('shop::products.price', ['product' => $item->product])
+ +
+ + {{ __('shop::app.customer.account.wishlist.move-to-cart') }} + + + + {{ __('shop::app.customer.account.address.index.delete') }} + +
From 0737ba63ee484d91a4ab25ed1c176c2ca723ff62 Mon Sep 17 00:00:00 2001 From: Devansh Date: Fri, 4 Sep 2020 20:17:59 +0530 Subject: [PATCH 03/45] Done From User End --- .../account/wishlist/wishlist.blade.php | 67 +++++-------------- .../views/shop/products/list/card.blade.php | 16 ++++- 2 files changed, 31 insertions(+), 52 deletions(-) diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/wishlist/wishlist.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/wishlist/wishlist.blade.php index caa220814..3a4a52004 100644 --- a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/wishlist/wishlist.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/wishlist/wishlist.blade.php @@ -1,5 +1,4 @@ @inject ('toolbarHelper', 'Webkul\Product\Helpers\Toolbar') -@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage') @extends('shop::customers.account.index') @@ -28,59 +27,27 @@ @if ($items->count()) @foreach ($items as $item) -
-
- + @php + $currentMode = $toolbarHelper->getCurrentMode(); + $moveToCartText = __('shop::app.customer.account.wishlist.move-to-cart'); + @endphp - - -
- -
- -
-
+ @include ('shop::products.list.card', [ + 'checkmode' => true, + 'moveToCart' => true, + 'addToCartForm' => true, + 'removeWishlist' => true, + 'reloadPage' => true, + 'itemId' => $item->id, + 'product' => $item->product, + 'additionalAttributes' => true, + 'btnText' => $moveToCartText, + 'addToCartBtnClass' => 'small-padding', + ]) @endforeach
- {{ $items->links() }} + {{ $items->links() }}
@else
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/products/list/card.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/products/list/card.blade.php index 245cf7b16..5a592e6ef 100644 --- a/packages/Webkul/Velocity/src/Resources/views/shop/products/list/card.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/shop/products/list/card.blade.php @@ -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); @@ -115,7 +115,7 @@ {{-- --}} - + @if ($product->new)
{{ __('shop::app.products.new') }} @@ -130,6 +130,18 @@ class="unset"> {{ $product->name }} + + @if (isset($additionalAttributes) && $additionalAttributes) + @if (isset($item->additional['attributes'])) +
+ + @foreach ($item->additional['attributes'] as $attribute) + {{ $attribute['attribute_name'] }} : {{ $attribute['option_label'] }}
+ @endforeach + +
+ @endif + @endif
From 791613dcb46b83e853a9fe4ecf27c81fe0000d4c Mon Sep 17 00:00:00 2001 From: Devansh Date: Sat, 5 Sep 2020 13:55:35 +0530 Subject: [PATCH 04/45] Customer End Fix --- .../assets/js/UI/components/add-to-cart.vue | 16 +++++++++++++++- .../account/wishlist/wishlist.blade.php | 1 + .../views/shop/products/add-to-cart.blade.php | 1 + .../views/shop/products/list/card.blade.php | 1 + 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/add-to-cart.vue b/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/add-to-cart.vue index 5b490767c..6bde086b2 100644 --- a/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/add-to-cart.vue +++ b/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/add-to-cart.vue @@ -1,9 +1,22 @@