diff --git a/packages/Webkul/Customer/src/Http/Controllers/WishlistController.php b/packages/Webkul/Customer/src/Http/Controllers/WishlistController.php index 712959ff4..c7f1399f3 100755 --- a/packages/Webkul/Customer/src/Http/Controllers/WishlistController.php +++ b/packages/Webkul/Customer/src/Http/Controllers/WishlistController.php @@ -64,14 +64,12 @@ class WishlistController extends Controller */ public function index() { - $wishlistItems = $this->wishlistRepository->getCustomerWishlist(); - if (! core()->getConfigData('general.content.shop.wishlist_option')) { abort(404); } return view($this->_config['view'], [ - 'wishlistItems' => $wishlistItems, + 'items' => $this->wishlistRepository->getCustomerWishlist(), 'isWishlistShared' => $this->currentCustomer->isWishlistShared(), 'wishlistSharedLink' => $this->currentCustomer->getWishlistSharedLink() ]); @@ -169,10 +167,10 @@ class WishlistController extends Controller $customer = $customerRepository->find(request()->get('id')); - $wishlistItems = $customer->wishlist_items()->where('shared', 1)->get(); + $items = $customer->wishlist_items()->where('shared', 1)->get(); - if ($customer && $wishlistItems->isNotEmpty()) { - return view($this->_config['view'], compact('customer', 'wishlistItems')); + if ($customer && $items->isNotEmpty()) { + return view($this->_config['view'], compact('customer', 'items')); } /** diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/wishlist/wishlist-product.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/wishlist/wishlist-product.blade.php index 685545035..2efc38381 100644 --- a/packages/Webkul/Shop/src/Resources/views/customers/account/wishlist/wishlist-product.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/customers/account/wishlist/wishlist-product.blade.php @@ -1,18 +1,18 @@
@php - $image = $wishlistItem->product->getTypeInstance()->getBaseImage($wishlistItem); + $image = $item->product->getTypeInstance()->getBaseImage($item); @endphp
- {{ $wishlistItem->product->name }} + {{ $item->product->name }} - @if (isset($wishlistItem->additional['attributes'])) + @if (isset($item->additional['attributes']))
- @foreach ($wishlistItem->additional['attributes'] as $attribute) + @foreach ($item->additional['attributes'] as $attribute) {{ $attribute['attribute_name'] }} : {{ $attribute['option_label'] }}
@endforeach
@@ -20,7 +20,7 @@
- @for ($i = 1; $i <= $reviewHelper->getAverageRating($wishlistItem->product); $i++) + @for ($i = 1; $i <= $reviewHelper->getAverageRating($item->product); $i++) @endfor @@ -28,7 +28,7 @@
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/wishlist/wishlist-shared.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/wishlist/wishlist-shared.blade.php index 9ff4054e9..ee81bfd3b 100644 --- a/packages/Webkul/Shop/src/Resources/views/customers/account/wishlist/wishlist-shared.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/customers/account/wishlist/wishlist-shared.blade.php @@ -15,10 +15,8 @@
- @foreach ($wishlistItems as $wishlistItem) - @include('shop::customers.account.wishlist.wishlist-product', [ - 'wishlistItem' => $wishlistItem - ]) + @foreach ($items as $item) + @include('shop::customers.account.wishlist.wishlist-product', ['item' => $item]) @endforeach
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/wishlist/wishlist.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/wishlist/wishlist.blade.php index 4b3238daa..9b98a7d6d 100755 --- a/packages/Webkul/Shop/src/Resources/views/customers/account/wishlist/wishlist.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/customers/account/wishlist/wishlist.blade.php @@ -11,7 +11,7 @@
{{ __('shop::app.customer.account.wishlist.title') }} - @if (count($wishlistItems)) + @if (count($items))
@method('DELETE') @@ -36,18 +36,18 @@
- {!! view_render_event('bagisto.shop.customers.account.wishlist.list.before', ['wishlist' => $wishlistItems]) !!} + {!! view_render_event('bagisto.shop.customers.account.wishlist.list.before', ['wishlist' => $items]) !!}
- @if ($wishlistItems->count()) - @foreach ($wishlistItems as $wishlistItem) + @if ($items->count()) + @foreach ($items as $item) @include('shop::customers.account.wishlist.wishlist-product', [ - 'wishlistItem' => $wishlistItem + 'item' => $item ]) @endforeach
- {{ $wishlistItems->links() }} + {{ $items->links() }}
@else
@@ -111,7 +111,7 @@
- {!! view_render_event('bagisto.shop.customers.account.wishlist.list.after', ['wishlist' => $wishlistItems]) !!} + {!! view_render_event('bagisto.shop.customers.account.wishlist.list.after', ['wishlist' => $items]) !!}
@endsection diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/wishlist/wishlist-product.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/wishlist/wishlist-product.blade.php index 0f8048289..284e51fc8 100644 --- a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/wishlist/wishlist-product.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/wishlist/wishlist-product.blade.php @@ -4,7 +4,7 @@ * * @var \Webkul\Product\Models\Product */ - $product = $wishlistItem->product; + $product = $item->product; @endphp
@@ -42,14 +42,14 @@ {{ __('shop::app.customer.account.wishlist.visibility') }} : - - {{ $wishlistItem->shared ? __('shop::app.customer.account.wishlist.public') : __('shop::app.customer.account.wishlist.private') }} + + {{ $item->shared ? __('shop::app.customer.account.wishlist.public') : __('shop::app.customer.account.wishlist.private') }}
- @include ('shop::products.add-to-cart', [ + @include('shop::products.add-to-cart', [ 'addWishlistClass' => 'pl10', 'product' => $product, 'addToCartBtnClass' => 'medium-padding', diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/wishlist/wishlist-shared.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/wishlist/wishlist-shared.blade.php index 578510bff..5a8df8246 100644 --- a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/wishlist/wishlist-shared.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/wishlist/wishlist-shared.blade.php @@ -6,14 +6,6 @@ @section('content-wrapper')
-
-
-
- -
-
-
-
@@ -21,8 +13,8 @@ {{ __('shop::app.customer.account.wishlist.customer-name', ['name' => $customer->name]) }} - @foreach ($wishlistItems as $wishlistItem) - @include ('shop::customers.account.wishlist.wishlist-product', ['wishlistItem' => $wishlistItem]) + @foreach ($items as $item) + @include('shop::customers.account.wishlist.wishlist-product', ['item' => $item]) @endforeach
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 23a364464..0fcf9ab3a 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 @@ -10,7 +10,7 @@