diff --git a/packages/Webkul/Shop/src/Resources/views/products/view.blade.php b/packages/Webkul/Shop/src/Resources/views/products/view.blade.php
index f37336ac4..946da0a51 100755
--- a/packages/Webkul/Shop/src/Resources/views/products/view.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/products/view.blade.php
@@ -15,7 +15,7 @@
@endif
- getProductBaseImage($product); ?>
+ getProductBaseImage($product); ?>
diff --git a/packages/Webkul/Shop/src/Resources/views/products/view/gallery.blade.php b/packages/Webkul/Shop/src/Resources/views/products/view/gallery.blade.php
index 7ffa5261b..b87eb34d7 100755
--- a/packages/Webkul/Shop/src/Resources/views/products/view/gallery.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/products/view/gallery.blade.php
@@ -1,13 +1,11 @@
-@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
-@inject ('productVideoHelper', 'Webkul\Product\Helpers\ProductVideo')
@inject ('wishListHelper', 'Webkul\Customer\Helpers\Wishlist')
-getGalleryImages($product);
+getGalleryImages($product);
- $videos = $productVideoHelper->getVideos($product);
+ $videos = productvideo()->getVideos($product);
- $images = array_merge($images, $videos);
+ $images = array_merge($images, $videos);
?>
diff --git a/packages/Webkul/Velocity/src/Helpers/Helper.php b/packages/Webkul/Velocity/src/Helpers/Helper.php
index 05ccf80a2..c2cb28969 100644
--- a/packages/Webkul/Velocity/src/Helpers/Helper.php
+++ b/packages/Webkul/Velocity/src/Helpers/Helper.php
@@ -4,6 +4,7 @@ namespace Webkul\Velocity\Helpers;
use Illuminate\Support\Facades\DB;
use Webkul\Product\Helpers\Review;
+use Webkul\Product\Facades\ProductImage;
use Webkul\Product\Models\Product as ProductModel;
use Webkul\Product\Repositories\ProductRepository;
use Webkul\Product\Repositories\ProductFlatRepository;
@@ -307,14 +308,13 @@ class Helper extends Review
public function formatProduct($product, $list = false, $metaInformation = [])
{
$reviewHelper = app('Webkul\Product\Helpers\Review');
- $productImageHelper = app('Webkul\Product\Helpers\ProductImage');
$totalReviews = $reviewHelper->getTotalReviews($product);
$avgRatings = ceil($reviewHelper->getAverageRating($product));
- $galleryImages = $productImageHelper->getGalleryImages($product);
- $productImage = $productImageHelper->getProductBaseImage($product)['medium_image_url'];
+ $galleryImages = ProductImage::getGalleryImages($product);
+ $productImage = ProductImage::getProductBaseImage($product)['medium_image_url'];
$largeProductImageName = "large-product-placeholder.png";
$mediumProductImageName = "meduim-product-placeholder.png";
diff --git a/packages/Webkul/Velocity/src/Http/Controllers/Shop/Controller.php b/packages/Webkul/Velocity/src/Http/Controllers/Shop/Controller.php
index 4d5c1a356..d90951a41 100755
--- a/packages/Webkul/Velocity/src/Http/Controllers/Shop/Controller.php
+++ b/packages/Webkul/Velocity/src/Http/Controllers/Shop/Controller.php
@@ -7,7 +7,6 @@ use Illuminate\Routing\Controller as BaseController;
use Illuminate\Foundation\Validation\ValidatesRequests;
use Webkul\Velocity\Helpers\Helper;
-use Webkul\Product\Helpers\ProductImage;
use Webkul\Product\Repositories\SearchRepository;
use Webkul\Product\Repositories\ProductRepository;
use Webkul\Customer\Repositories\WishlistRepository;
@@ -26,13 +25,6 @@ class Controller extends BaseController
*/
protected $_config;
- /**
- * ProductImage object
- *
- * @var \Webkul\Product\Helpers\ProductImage
- */
- protected $productImageHelper;
-
/**
* SearchRepository object
*
@@ -87,18 +79,16 @@ class Controller extends BaseController
* Create a new controller instance.
*
* @param \Webkul\Velocity\Helpers\Helper $velocityHelper
- * @param \Webkul\Product\Helpers\ProductImage $productImageHelper
* @param \Webkul\Product\Repositories\SearchRepository $searchRepository
* @param \Webkul\Product\Repositories\ProductRepository $productRepository
* @param \Webkul\Category\Repositories\CategoryRepository $categoryRepository
* @param \Webkul\Velocity\Repositories\Product\ProductRepository $velocityProductRepository
* @param \Webkul\Velocity\Repositories\VelocityCustomerCompareProductRepository $compareProductsRepository
- *
+ *
* @return void
*/
public function __construct(
Helper $velocityHelper,
- ProductImage $productImageHelper,
SearchRepository $searchRepository,
ProductRepository $productRepository,
WishlistRepository $wishlistRepository,
@@ -114,14 +104,12 @@ class Controller extends BaseController
$this->productRepository = $productRepository;
- $this->productImageHelper = $productImageHelper;
-
$this->categoryRepository = $categoryRepository;
$this->wishlistRepository = $wishlistRepository;
$this->velocityProductRepository = $velocityProductRepository;
-
+
$this->compareProductsRepository = $compareProductsRepository;
}
}
diff --git a/packages/Webkul/Velocity/src/Http/Controllers/Shop/ShopController.php b/packages/Webkul/Velocity/src/Http/Controllers/Shop/ShopController.php
index 4dad820ea..380e61e1e 100644
--- a/packages/Webkul/Velocity/src/Http/Controllers/Shop/ShopController.php
+++ b/packages/Webkul/Velocity/src/Http/Controllers/Shop/ShopController.php
@@ -3,6 +3,7 @@
namespace Webkul\Velocity\Http\Controllers\Shop;
use Illuminate\Http\Request;
+use Webkul\Product\Facades\ProductImage;
use Webkul\Velocity\Http\Shop\Controllers;
use Webkul\Checkout\Contracts\Cart as CartModel;
use Cart;
@@ -28,7 +29,7 @@ class ShopController extends Controller
if ($product) {
$productReviewHelper = app('Webkul\Product\Helpers\Review');
- $galleryImages = $this->productImageHelper->getProductBaseImage($product);
+ $galleryImages = ProductImage::getProductBaseImage($product);
$response = [
'status' => true,
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/cart/index.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/cart/index.blade.php
index fc85aa0b2..2fa3f57d6 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/cart/index.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/cart/index.blade.php
@@ -1,5 +1,4 @@
@inject ('reviewHelper', 'Webkul\Product\Helpers\Review')
-@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
@extends('shop::layouts.master')
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/review.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/review.blade.php
index 086e3a5dd..c4a089206 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/review.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/review.blade.php
@@ -1,5 +1,3 @@
-@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
-