From 822b86e126c19a0c6316d24242a120d725960f5f Mon Sep 17 00:00:00 2001 From: mohd asif Date: Thu, 16 Jul 2020 12:16:13 +0530 Subject: [PATCH 1/6] fixed issue 3311 in default theme --- .../Webkul/Shop/src/Resources/views/products/index.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/Webkul/Shop/src/Resources/views/products/index.blade.php b/packages/Webkul/Shop/src/Resources/views/products/index.blade.php index 6a4df8163..5247d65c2 100755 --- a/packages/Webkul/Shop/src/Resources/views/products/index.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/products/index.blade.php @@ -46,9 +46,9 @@ @if (in_array($category->display_mode, [null, 'products_only', 'products_and_description'])) getAll($category->id); ?> - @if ($products->count()) + @include ('shop::products.list.toolbar') - @include ('shop::products.list.toolbar') + @if ($products->count()) @inject ('toolbarHelper', 'Webkul\Product\Helpers\Toolbar') From 222b03ed412e4718ae686eb44f35837cc5536e1e Mon Sep 17 00:00:00 2001 From: Devansh Date: Thu, 16 Jul 2020 13:12:19 +0530 Subject: [PATCH 2/6] Category filter limit zero issue fixed --- .../Webkul/Product/src/Repositories/ProductRepository.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/Webkul/Product/src/Repositories/ProductRepository.php b/packages/Webkul/Product/src/Repositories/ProductRepository.php index 9d0b0e8a4..690d6658d 100755 --- a/packages/Webkul/Product/src/Repositories/ProductRepository.php +++ b/packages/Webkul/Product/src/Repositories/ProductRepository.php @@ -113,7 +113,7 @@ class ProductRepository extends Repository $perPage = isset($params['limit']) ? $params['limit'] : current($pages); } else { - $perPage = isset($params['limit']) ? $params['limit'] : 9; + $perPage = isset($params['limit']) && !empty($params['limit']) ? $params['limit'] : 9; } $page = Paginator::resolveCurrentPage('page'); @@ -388,7 +388,7 @@ class ProductRepository extends Repository ->where('product_flat.channel', $channel) ->where('product_flat.locale', $locale) ->whereNotNull('product_flat.url_key') - ->where(function($subQuery) use ($term) { + ->where(function($subQuery) use ($term) { $queries = explode('_', $term); foreach (array_map('trim', $queries) as $value) { @@ -399,7 +399,7 @@ class ProductRepository extends Repository ->orderBy('product_id', 'desc'); })->paginate(16); } - + return $results; } From 47d90ce1f8eb9af7c858f62de74741545c2d047c Mon Sep 17 00:00:00 2001 From: vaishali agarwal Date: Thu, 16 Jul 2020 13:31:05 +0530 Subject: [PATCH 3/6] chinese locale search issue fixed --- .../Velocity/src/Resources/views/shop/UI/particals.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/UI/particals.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/UI/particals.blade.php index 56b0129ac..b238eeeb5 100644 --- a/packages/Webkul/Velocity/src/Resources/views/shop/UI/particals.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/shop/UI/particals.blade.php @@ -308,7 +308,7 @@ searchedItem.forEach(item => { let splitedItem = item.split('='); - updatedSearchedCollection[splitedItem[0]] = splitedItem[1]; + updatedSearchedCollection[splitedItem[0]] = decodeURI(splitedItem[1]); }); if (updatedSearchedCollection['image-search'] == 1) { From acbe32861ff96d1e80ad653a62dba3a01dea75cb Mon Sep 17 00:00:00 2001 From: vaishali agarwal Date: Thu, 16 Jul 2020 21:14:41 +0530 Subject: [PATCH 4/6] Pl local issue fixed --- packages/Webkul/Ui/src/Resources/lang/pl/app.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/Webkul/Ui/src/Resources/lang/pl/app.php b/packages/Webkul/Ui/src/Resources/lang/pl/app.php index 65a467a76..6949c5121 100644 --- a/packages/Webkul/Ui/src/Resources/lang/pl/app.php +++ b/packages/Webkul/Ui/src/Resources/lang/pl/app.php @@ -35,4 +35,6 @@ return [ 'items-per-page' => 'Przedmioty na stronę', 'value-here' => 'Wartość tutaj', 'numeric-value-here' => 'wartość liczbowa tutaj', - 'submit' => 'Prześlij' \ No newline at end of file + 'submit' => 'Prześlij' + ] +]; \ No newline at end of file From 412a620dbd183867ef421bff883ff586feabee6d Mon Sep 17 00:00:00 2001 From: vaishali agarwal Date: Thu, 16 Jul 2020 21:29:58 +0530 Subject: [PATCH 5/6] undo changes --- packages/Webkul/Ui/src/Resources/lang/pl/app.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/Webkul/Ui/src/Resources/lang/pl/app.php b/packages/Webkul/Ui/src/Resources/lang/pl/app.php index 6949c5121..65a467a76 100644 --- a/packages/Webkul/Ui/src/Resources/lang/pl/app.php +++ b/packages/Webkul/Ui/src/Resources/lang/pl/app.php @@ -35,6 +35,4 @@ return [ 'items-per-page' => 'Przedmioty na stronę', 'value-here' => 'Wartość tutaj', 'numeric-value-here' => 'wartość liczbowa tutaj', - 'submit' => 'Prześlij' - ] -]; \ No newline at end of file + 'submit' => 'Prześlij' \ No newline at end of file From c1f611bd2cedf71f8888df029360a1c44aa865f0 Mon Sep 17 00:00:00 2001 From: vaishali agarwal Date: Thu, 16 Jul 2020 22:16:38 +0530 Subject: [PATCH 6/6] Issue #3508 fixed --- packages/Webkul/Ui/src/Resources/lang/pl/app.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/Webkul/Ui/src/Resources/lang/pl/app.php b/packages/Webkul/Ui/src/Resources/lang/pl/app.php index 65a467a76..6949c5121 100644 --- a/packages/Webkul/Ui/src/Resources/lang/pl/app.php +++ b/packages/Webkul/Ui/src/Resources/lang/pl/app.php @@ -35,4 +35,6 @@ return [ 'items-per-page' => 'Przedmioty na stronę', 'value-here' => 'Wartość tutaj', 'numeric-value-here' => 'wartość liczbowa tutaj', - 'submit' => 'Prześlij' \ No newline at end of file + 'submit' => 'Prześlij' + ] +]; \ No newline at end of file