From 5935fbf28ce50b1f4bcbeee031f63bd9496b8abe Mon Sep 17 00:00:00 2001 From: prateek srivastava Date: Mon, 4 Jan 2021 17:44:33 +0530 Subject: [PATCH] product Image helper removed --- config/repository.php | 3 ++- .../Resources/views/dashboard/index.blade.php | 6 ++---- .../src/Helpers/ConfigurableOption.php | 20 +------------------ .../Webkul/Product/src/Type/AbstractType.php | 2 +- .../views/checkout/cart/index.blade.php | 2 -- .../views/checkout/cart/mini-cart.blade.php | 2 -- .../views/checkout/onepage/review.blade.php | 2 -- .../customers/account/reviews/index.blade.php | 4 +--- .../account/reviews/reviews.blade.php | 4 +--- .../account/wishlist/wishlist.blade.php | 2 -- .../views/products/list/card.blade.php | 4 +--- .../views/products/reviews/create.blade.php | 3 +-- .../views/products/reviews/index.blade.php | 4 +--- .../Resources/views/products/view.blade.php | 2 +- .../views/products/view/gallery.blade.php | 7 +++---- .../Webkul/Velocity/src/Helpers/Helper.php | 5 ++--- .../views/shop/checkout/cart/index.blade.php | 1 - .../shop/checkout/onepage/review.blade.php | 2 -- .../customers/account/reviews/index.blade.php | 4 +--- .../Resources/views/shop/home/index.blade.php | 1 - .../views/shop/products/list/card.blade.php | 7 +++---- .../shop/products/reviews/create.blade.php | 2 -- .../views/shop/products/view.blade.php | 5 ++--- .../view/configurable-options.blade.php | 3 +-- .../shop/products/view/gallery.blade.php | 3 +-- .../shop/products/view/small-view.blade.php | 4 +--- 26 files changed, 26 insertions(+), 78 deletions(-) diff --git a/config/repository.php b/config/repository.php index 3123c2789..f8498b8db 100755 --- a/config/repository.php +++ b/config/repository.php @@ -169,7 +169,8 @@ return [ */ 'acceptedConditions' => [ '=', - 'like' + 'like', + 'in' ], /* |-------------------------------------------------------------------------- diff --git a/packages/Webkul/Admin/src/Resources/views/dashboard/index.blade.php b/packages/Webkul/Admin/src/Resources/views/dashboard/index.blade.php index 930a6a8df..020d74d3f 100755 --- a/packages/Webkul/Admin/src/Resources/views/dashboard/index.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/dashboard/index.blade.php @@ -192,8 +192,6 @@ - @inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage') -
@@ -208,7 +206,7 @@
  • - getProductBaseImage($item->product); ?> + product); ?>
    @@ -318,7 +316,7 @@
  • - getProductBaseImage($item->product); ?> + product); ?>
    diff --git a/packages/Webkul/Product/src/Helpers/ConfigurableOption.php b/packages/Webkul/Product/src/Helpers/ConfigurableOption.php index 004ede9e5..ef0ca45b3 100755 --- a/packages/Webkul/Product/src/Helpers/ConfigurableOption.php +++ b/packages/Webkul/Product/src/Helpers/ConfigurableOption.php @@ -7,24 +7,6 @@ use Webkul\Product\Models\ProductAttributeValue; class ConfigurableOption extends AbstractProduct { - /** - * ProductImage object - * - * @var array - */ - protected $productImage; - - /** - * Create a new controller instance. - * - * @param \Webkul\Product\Helpers\ProductImage $productImage - * @return void - */ - public function __construct(ProductImage $productImage) - { - $this->productImage = $productImage; - } - /** * Returns the allowed variants * @@ -223,7 +205,7 @@ class ConfigurableOption extends AbstractProduct $variantId = $variant->id; } - $images[$variantId] = $this->productImage->getGalleryImages($variant); + $images[$variantId] = ProductImage::getGalleryImages($variant); } return $images; diff --git a/packages/Webkul/Product/src/Type/AbstractType.php b/packages/Webkul/Product/src/Type/AbstractType.php index 5ac820274..76ef5491e 100644 --- a/packages/Webkul/Product/src/Type/AbstractType.php +++ b/packages/Webkul/Product/src/Type/AbstractType.php @@ -849,7 +849,7 @@ abstract class AbstractType */ public function getBaseImage($item) { - return $this->productImageHelper->getProductBaseImage($item->product); + return ProductImage::getProductBaseImage($item->product); } /** diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php index d44caa83c..f14a10383 100755 --- a/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php @@ -5,8 +5,6 @@ @stop @section('content-wrapper') - @inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage') -
    @if ($cart)
    diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/cart/mini-cart.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/cart/mini-cart.blade.php index 4477af9b0..6750f8fdd 100755 --- a/packages/Webkul/Shop/src/Resources/views/checkout/cart/mini-cart.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/cart/mini-cart.blade.php @@ -1,5 +1,3 @@ -@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage') - getCart(); ?> @if ($cart) diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php index 223514041..43950ef85 100755 --- a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php @@ -68,8 +68,6 @@
    - @inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage') -
    @foreach ($cart->items as $item) @php diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/reviews/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/reviews/index.blade.php index 28683a5c4..5f0c93482 100755 --- a/packages/Webkul/Shop/src/Resources/views/customers/account/reviews/index.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/customers/account/reviews/index.blade.php @@ -1,5 +1,3 @@ -@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage') - @extends('shop::layouts.master') @section('page_title') @@ -34,7 +32,7 @@ @foreach ($reviews as $review)