From fd7fdfe385c69bb1044f0406de074286201e0dea Mon Sep 17 00:00:00 2001 From: prateek srivastava Date: Thu, 4 Feb 2021 18:12:02 +0530 Subject: [PATCH] changes in facade --- packages/Webkul/API/Http/Resources/Catalog/Product.php | 5 +++-- packages/Webkul/Product/src/Helpers/ConfigurableOption.php | 1 + packages/Webkul/Product/src/Type/AbstractType.php | 3 ++- packages/Webkul/Velocity/src/Helpers/Helper.php | 5 +++-- .../Velocity/src/Http/Controllers/Shop/ShopController.php | 3 ++- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/packages/Webkul/API/Http/Resources/Catalog/Product.php b/packages/Webkul/API/Http/Resources/Catalog/Product.php index 79661f556..cc1bbc18d 100644 --- a/packages/Webkul/API/Http/Resources/Catalog/Product.php +++ b/packages/Webkul/API/Http/Resources/Catalog/Product.php @@ -3,6 +3,7 @@ namespace Webkul\API\Http\Resources\Catalog; use Illuminate\Http\Resources\Json\JsonResource; +use Webkul\Product\Facades\ProductImage as ProductImageFacade; class Product extends JsonResource { @@ -44,8 +45,8 @@ class Product extends JsonResource 'formated_price' => core()->currency($productTypeInstance->getMinimalPrice()), 'short_description' => $product->short_description, 'description' => $product->description, - 'images' => ProductImage::collection($product->images), - 'base_image' => app('Webkul\Product\ProductImage')->getProductBaseImage($product), + 'images' => ProductImageFacade::collection($product->images), + 'base_image' => ProductImageFacade::getProductBaseImage($product), 'created_at' => $product->created_at, 'updated_at' => $product->updated_at, diff --git a/packages/Webkul/Product/src/Helpers/ConfigurableOption.php b/packages/Webkul/Product/src/Helpers/ConfigurableOption.php index a29359cfd..5b5eae71f 100755 --- a/packages/Webkul/Product/src/Helpers/ConfigurableOption.php +++ b/packages/Webkul/Product/src/Helpers/ConfigurableOption.php @@ -4,6 +4,7 @@ namespace Webkul\Product\Helpers; use Webkul\Product\Models\Product; use Webkul\Product\Models\ProductAttributeValue; +use Webkul\Product\Facades\ProductImage; class ConfigurableOption extends AbstractProduct { diff --git a/packages/Webkul/Product/src/Type/AbstractType.php b/packages/Webkul/Product/src/Type/AbstractType.php index 69061cdde..aacd176d0 100644 --- a/packages/Webkul/Product/src/Type/AbstractType.php +++ b/packages/Webkul/Product/src/Type/AbstractType.php @@ -5,6 +5,7 @@ namespace Webkul\Product\Type; use Webkul\Checkout\Facades\Cart; use Webkul\Checkout\Models\CartItem; use Illuminate\Support\Facades\Storage; +use Webkul\Product\Facades\ProductImage; use Webkul\Product\Models\ProductAttributeValue; use Webkul\Product\Repositories\ProductRepository; use Webkul\Attribute\Repositories\AttributeRepository; @@ -837,7 +838,7 @@ abstract class AbstractType */ public function getBaseImage($item) { - return app('Webkul\Product\ProductImage')->getProductBaseImage($item->product); + return ProductImage::getProductBaseImage($item->product); } /** diff --git a/packages/Webkul/Velocity/src/Helpers/Helper.php b/packages/Webkul/Velocity/src/Helpers/Helper.php index f0d61da0d..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; @@ -312,8 +313,8 @@ class Helper extends Review $avgRatings = ceil($reviewHelper->getAverageRating($product)); - $galleryImages = \ProductImage::getGalleryImages($product); - $productImage = \ProductImage::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/ShopController.php b/packages/Webkul/Velocity/src/Http/Controllers/Shop/ShopController.php index 10e2c94a6..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 = \ProductImage::getProductBaseImage($product); + $galleryImages = ProductImage::getProductBaseImage($product); $response = [ 'status' => true,