From 0de17f471190b420107df758e5fcbb2932a49c88 Mon Sep 17 00:00:00 2001 From: Pranshu Tomar Date: Wed, 3 Jun 2020 13:25:02 +0530 Subject: [PATCH] Issue #3164 fixed --- packages/Webkul/Product/src/Helpers/Toolbar.php | 11 ++++++++--- .../Product/src/Repositories/ProductRepository.php | 6 +++--- packages/Webkul/Product/src/Type/Configurable.php | 3 ++- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/packages/Webkul/Product/src/Helpers/Toolbar.php b/packages/Webkul/Product/src/Helpers/Toolbar.php index 42b52dc56..8a1091b90 100755 --- a/packages/Webkul/Product/src/Helpers/Toolbar.php +++ b/packages/Webkul/Product/src/Helpers/Toolbar.php @@ -27,9 +27,14 @@ class Toolbar extends AbstractProduct */ public function getAvailableLimits() { - return core()->getConfigData('catalog.products.storefront.products_per_page') - ? explode(',', core()->getConfigData('catalog.products.storefront.products_per_page')) - : [9, 15, 21, 28]; + if (core()->getConfigData('catalog.products.storefront.products_per_page')) { + $pages = explode(',', core()->getConfigData('catalog.products.storefront.products_per_page')); + + var_dump($pages); + return $pages; + } + + return [9, 15, 21, 28]; } /** diff --git a/packages/Webkul/Product/src/Repositories/ProductRepository.php b/packages/Webkul/Product/src/Repositories/ProductRepository.php index 8838fd94d..f0bea176b 100755 --- a/packages/Webkul/Product/src/Repositories/ProductRepository.php +++ b/packages/Webkul/Product/src/Repositories/ProductRepository.php @@ -158,7 +158,7 @@ class ProductRepository extends Repository } } - if( $priceFilter = request('price') ){ + if ( $priceFilter = request('price') ){ $priceRange = explode(',', $priceFilter); if( count($priceRange) > 0 ) { $qb->where('variants.min_price', '>=', core()->convertToBasePrice($priceRange[0])); @@ -171,7 +171,7 @@ class ProductRepository extends Repository request()->except(['price']) )); - if( count($attributeFilters) > 0 ) { + if ( count($attributeFilters) > 0 ) { $qb->where(function ($filterQuery) use($attributeFilters){ foreach ($attributeFilters as $attribute) { @@ -220,7 +220,7 @@ class ProductRepository extends Repository $countQuery = "select count(*) as aggregate from ({$repository->model->toSql()}) c"; $count = collect(DB::select($countQuery, $repository->model->getBindings()))->pluck('aggregate')->first(); - if($count > 0) { + if ($count > 0) { # apply a new scope query to limit results to one page $repository->scopeQuery(function ($query) use ($page, $perPage) { return $query->forPage($page, $perPage); diff --git a/packages/Webkul/Product/src/Type/Configurable.php b/packages/Webkul/Product/src/Type/Configurable.php index f3689ee7c..03be6308c 100644 --- a/packages/Webkul/Product/src/Type/Configurable.php +++ b/packages/Webkul/Product/src/Type/Configurable.php @@ -344,9 +344,10 @@ class Configurable extends AbstractType /** * Get product minimal price * + * @param int $qty * @return float */ - public function getMinimalPrice() + public function getMinimalPrice($qty = null) { $minPrices = [];