From 0dacfd807276b6f7059ea75f96f4f54e7d38d0e1 Mon Sep 17 00:00:00 2001 From: rahulshukla-home Date: Thu, 19 Nov 2020 17:49:21 +0530 Subject: [PATCH] test case failure fix --- .../Webkul/BookingProduct/src/Type/Booking.php | 13 +++++++++---- .../Webkul/Product/src/Type/AbstractType.php | 10 +++++----- packages/Webkul/Product/src/Type/Bundle.php | 8 ++++++-- .../Webkul/Product/src/Type/Downloadable.php | 8 ++++++-- packages/Webkul/Product/src/Type/Grouped.php | 18 +++++++++++------- 5 files changed, 37 insertions(+), 20 deletions(-) diff --git a/packages/Webkul/BookingProduct/src/Type/Booking.php b/packages/Webkul/BookingProduct/src/Type/Booking.php index b3508f8a2..0a876ae42 100644 --- a/packages/Webkul/BookingProduct/src/Type/Booking.php +++ b/packages/Webkul/BookingProduct/src/Type/Booking.php @@ -12,6 +12,7 @@ use Webkul\Product\Datatypes\CartItemValidationResult; use Webkul\Product\Helpers\ProductImage; use Webkul\Product\Repositories\ProductAttributeValueRepository; use Webkul\Product\Repositories\ProductImageRepository; +use Webkul\Product\Repositories\ProductVideoRepository; use Webkul\Product\Repositories\ProductInventoryRepository; use Webkul\Product\Repositories\ProductRepository; use Webkul\Product\Type\Virtual; @@ -44,6 +45,7 @@ class Booking extends Virtual 'admin::catalog.products.accordians.channels', 'bookingproduct::admin.catalog.products.accordians.booking', 'admin::catalog.products.accordians.product-links', + 'admin::catalog.products.accordians.videos', ]; /** @@ -54,9 +56,10 @@ class Booking extends Virtual * @param \Webkul\Product\Repositories\ProductAttributeValueRepository $attributeValueRepository * @param \Webkul\Product\Repositories\ProductInventoryRepository $productInventoryRepository * @param \Webkul\Product\Repositories\ProductImageRepository $productImageRepository - * @param \Webkul\Product\Helpers\ProductImage $productImageHelper + * @param \Webkul\Product\Helpers\ProductImage $productImageHelper * @param \Webkul\BookingProduct\Repositories\BookingProductRepository $bookingProductRepository - * @param \Webkul\BookingProduct\Helpers\BookingHelper $bookingHelper + * @param \Webkul\BookingProduct\Helpers\BookingHelper $bookingHelper + * @param \Webkul\Product\Repositories\ProductVideoRepository $productVideoRepository * @return void */ public function __construct( @@ -67,7 +70,8 @@ class Booking extends Virtual ProductImageRepository $productImageRepository, ProductImage $productImageHelper, BookingProductRepository $bookingProductRepository, - BookingHelper $bookingHelper + BookingHelper $bookingHelper, + ProductVideoRepository $productVideoRepository ) { parent::__construct( @@ -76,7 +80,8 @@ class Booking extends Virtual $attributeValueRepository, $productInventoryRepository, $productImageRepository, - $productImageHelper + $productImageHelper, + $productVideoRepository ); $this->bookingProductRepository = $bookingProductRepository; diff --git a/packages/Webkul/Product/src/Type/AbstractType.php b/packages/Webkul/Product/src/Type/AbstractType.php index 947143398..5ac820274 100644 --- a/packages/Webkul/Product/src/Type/AbstractType.php +++ b/packages/Webkul/Product/src/Type/AbstractType.php @@ -148,8 +148,8 @@ abstract class AbstractType * @param \Webkul\Product\Repositories\ProductAttributeValueRepository $attributeValueRepository * @param \Webkul\Product\Repositories\ProductInventoryRepository $productInventoryRepository * @param \Webkul\Product\Repositories\ProductImageRepository $productImageRepository - * @param \Webkul\Product\Repositories\ProductVideoRepository $productVideoRepository * @param \Webkul\Product\Helpers\ProductImage $productImageHelper + * @param \Webkul\Product\Repositories\ProductVideoRepository $productVideoRepository * * @return void */ @@ -159,8 +159,8 @@ abstract class AbstractType ProductAttributeValueRepository $attributeValueRepository, ProductInventoryRepository $productInventoryRepository, ProductImageRepository $productImageRepository, - ProductVideoRepository $productVideoRepository, - ProductImage $productImageHelper + ProductImage $productImageHelper, + ProductVideoRepository $productVideoRepository ) { $this->attributeRepository = $attributeRepository; @@ -172,9 +172,9 @@ abstract class AbstractType $this->productImageRepository = $productImageRepository; - $this->productVideoRepository = $productVideoRepository; - $this->productImageHelper = $productImageHelper; + + $this->productVideoRepository = $productVideoRepository; } /** diff --git a/packages/Webkul/Product/src/Type/Bundle.php b/packages/Webkul/Product/src/Type/Bundle.php index a5162d48e..4c8709763 100644 --- a/packages/Webkul/Product/src/Type/Bundle.php +++ b/packages/Webkul/Product/src/Type/Bundle.php @@ -8,6 +8,7 @@ use Webkul\Product\Repositories\ProductRepository; use Webkul\Product\Repositories\ProductAttributeValueRepository; use Webkul\Product\Repositories\ProductInventoryRepository; use Webkul\Product\Repositories\ProductImageRepository; +use Webkul\Product\Repositories\ProductVideoRepository; use Webkul\Product\Repositories\ProductBundleOptionRepository; use Webkul\Product\Repositories\ProductBundleOptionProductRepository; use Webkul\Product\Helpers\ProductImage; @@ -89,6 +90,7 @@ class Bundle extends AbstractType * @param \Webkul\Product\Repositories\ProductBundleOptionProductRepository $productBundleOptionProductRepository * @param \Webkul\Product\Helpers\ProductImage $productImageHelper * @param \Webkul\Product\Helpers\BundleOption $bundleOptionHelper + * @param \Webkul\Product\Repositories\ProductVideoRepository $productVideoRepository * @return void */ public function __construct( @@ -100,7 +102,8 @@ class Bundle extends AbstractType ProductBundleOptionRepository $productBundleOptionRepository, ProductBundleOptionProductRepository $productBundleOptionProductRepository, ProductImage $productImageHelper, - BundleOption $bundleOptionHelper + BundleOption $bundleOptionHelper, + ProductVideoRepository $productVideoRepository ) { parent::__construct( @@ -109,7 +112,8 @@ class Bundle extends AbstractType $attributeValueRepository, $productInventoryRepository, $productImageRepository, - $productImageHelper + $productImageHelper, + $productVideoRepository ); $this->productBundleOptionRepository = $productBundleOptionRepository; diff --git a/packages/Webkul/Product/src/Type/Downloadable.php b/packages/Webkul/Product/src/Type/Downloadable.php index b84cedc81..e8cf7741f 100644 --- a/packages/Webkul/Product/src/Type/Downloadable.php +++ b/packages/Webkul/Product/src/Type/Downloadable.php @@ -8,6 +8,7 @@ use Webkul\Product\Repositories\ProductRepository; use Webkul\Attribute\Repositories\AttributeRepository; use Webkul\Product\Datatypes\CartItemValidationResult; use Webkul\Product\Repositories\ProductImageRepository; +use Webkul\Product\Repositories\ProductVideoRepository; use Webkul\Product\Repositories\ProductInventoryRepository; use Webkul\Product\Repositories\ProductAttributeValueRepository; use Webkul\Product\Repositories\ProductDownloadableLinkRepository; @@ -80,6 +81,7 @@ class Downloadable extends AbstractType * @param \Webkul\Product\Repositories\ProductDownloadableLinkRepository $productDownloadableLinkRepository * @param \Webkul\Product\Repositories\ProductDownloadableSampleRepository $productDownloadableSampleRepository * @param \Webkul\Product\Helpers\ProductImage $productImageHelper + * @param \Webkul\Product\Repositories\ProductVideoRepository $productVideoRepository * * @return void */ @@ -91,7 +93,8 @@ class Downloadable extends AbstractType productImageRepository $productImageRepository, ProductDownloadableLinkRepository $productDownloadableLinkRepository, ProductDownloadableSampleRepository $productDownloadableSampleRepository, - ProductImage $productImageHelper + ProductImage $productImageHelper, + ProductVideoRepository $productVideoRepository ) { parent::__construct( @@ -100,7 +103,8 @@ class Downloadable extends AbstractType $attributeValueRepository, $productInventoryRepository, $productImageRepository, - $productImageHelper + $productImageHelper, + $productVideoRepository ); $this->productDownloadableLinkRepository = $productDownloadableLinkRepository; diff --git a/packages/Webkul/Product/src/Type/Grouped.php b/packages/Webkul/Product/src/Type/Grouped.php index 4c8540a44..1f7f1c42d 100644 --- a/packages/Webkul/Product/src/Type/Grouped.php +++ b/packages/Webkul/Product/src/Type/Grouped.php @@ -7,6 +7,7 @@ use Webkul\Product\Repositories\ProductRepository; use Webkul\Product\Repositories\ProductAttributeValueRepository; use Webkul\Product\Repositories\ProductInventoryRepository; use Webkul\Product\Repositories\ProductImageRepository; +use Webkul\Product\Repositories\ProductVideoRepository; use Webkul\Product\Repositories\ProductGroupedProductRepository; use Webkul\Product\Helpers\ProductImage; use Webkul\Product\Models\ProductAttributeValue; @@ -52,13 +53,14 @@ class Grouped extends AbstractType /** * Create a new product type instance. * - * @param \Webkul\Attribute\Repositories\AttributeRepository $attributeRepository - * @param \Webkul\Product\Repositories\ProductRepository $productRepository + * @param \Webkul\Attribute\Repositories\AttributeRepository $attributeRepository + * @param \Webkul\Product\Repositories\ProductRepository $productRepository * @param \Webkul\Product\Repositories\ProductAttributeValueRepository $attributeValueRepository - * @param \Webkul\Product\Repositories\ProductInventoryRepository $productInventoryRepository - * @param \Webkul\Product\Repositories\ProductImageRepository $productImageRepository + * @param \Webkul\Product\Repositories\ProductInventoryRepository $productInventoryRepository + * @param \Webkul\Product\Repositories\ProductImageRepository $productImageRepository * @param \Webkul\Product\Repositories\ProductGroupedProductRepository $productGroupedProductRepository - * @param \Webkul\Product\Helpers\ProductImage $productImageHelper + * @param \Webkul\Product\Helpers\ProductImage $productImageHelper + * @param \Webkul\Product\Repositories\ProductVideoRepository $productVideoRepository * @return void */ public function __construct( @@ -68,7 +70,8 @@ class Grouped extends AbstractType ProductInventoryRepository $productInventoryRepository, ProductImageRepository $productImageRepository, ProductGroupedProductRepository $productGroupedProductRepository, - ProductImage $productImageHelper + ProductImage $productImageHelper, + ProductVideoRepository $productVideoRepository ) { parent::__construct( @@ -77,7 +80,8 @@ class Grouped extends AbstractType $attributeValueRepository, $productInventoryRepository, $productImageRepository, - $productImageHelper + $productImageHelper, + $productVideoRepository ); $this->productGroupedProductRepository = $productGroupedProductRepository;