From 57e088b29ff929ed8df787acfa6022986ef23dbe Mon Sep 17 00:00:00 2001 From: "vishal.kushwaha650" Date: Tue, 6 Oct 2020 19:09:19 +0530 Subject: [PATCH 1/9] create function for attribute option related to product --- .../Repositories/ProductFlatRepository.php | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/packages/Webkul/Product/src/Repositories/ProductFlatRepository.php b/packages/Webkul/Product/src/Repositories/ProductFlatRepository.php index 2f33f4a82..72303594c 100644 --- a/packages/Webkul/Product/src/Repositories/ProductFlatRepository.php +++ b/packages/Webkul/Product/src/Repositories/ProductFlatRepository.php @@ -87,6 +87,39 @@ class ProductFlatRepository extends Repository return $filterAttributes; } + /** + * filter attribute option according to products + * + * @param array $filterAttributes + * @param array $products + * @return \Illuminate\Support\Collection + */ + public function productsRelatedAttributes($filterAttributes, $products) { + $allProductAttributeOptionsCode = []; + + foreach ($products as $key => $product) { + foreach ($filterAttributes as $attribute) { + if ($attribute->code <> 'price') { + if (isset($product[$attribute->code])) { + if (! in_array($product[$attribute->code], $allProductAttributeOptionsCode)) { + array_push($allProductAttributeOptionsCode, $product[$attribute->code]); + } + } + } + } + } + + foreach ($filterAttributes as $attribute) { + foreach ($attribute->options as $key => $option) { + if (! in_array($option->id, $allProductAttributeOptionsCode)) { + unset($attribute->options[$key]); + } + } + } + + return $filterAttributes; + + } /** * update product_flat custom column From 6ad00c46345b0f78b660d3952a713f4704b25fd1 Mon Sep 17 00:00:00 2001 From: "vishal.kushwaha650" Date: Wed, 7 Oct 2020 11:40:52 +0530 Subject: [PATCH 2/9] Issue #3950 fixed --- .../src/Repositories/ProductFlatRepository.php | 11 +++++++---- .../src/Repositories/ProductRepository.php | 17 +++++++++++++++++ .../products/list/layered-navigation.blade.php | 2 +- .../products/list/layered-navigation.blade.php | 2 +- 4 files changed, 26 insertions(+), 6 deletions(-) diff --git a/packages/Webkul/Product/src/Repositories/ProductFlatRepository.php b/packages/Webkul/Product/src/Repositories/ProductFlatRepository.php index 72303594c..dc9027d3d 100644 --- a/packages/Webkul/Product/src/Repositories/ProductFlatRepository.php +++ b/packages/Webkul/Product/src/Repositories/ProductFlatRepository.php @@ -88,13 +88,16 @@ class ProductFlatRepository extends Repository } /** - * filter attribute option according to products + * filter attributes according to products * - * @param array $filterAttributes - * @param array $products + * @param array $category * @return \Illuminate\Support\Collection */ - public function productsRelatedAttributes($filterAttributes, $products) { + public function getProductsRelatedFilterableAttributes($category) { + $products = app('Webkul\Product\Repositories\ProductRepository')->getProductsRelatedToCategory($category->id); + + $filterAttributes = $this->getFilterableAttributes($category, $products); + $allProductAttributeOptionsCode = []; foreach ($products as $key => $product) { diff --git a/packages/Webkul/Product/src/Repositories/ProductRepository.php b/packages/Webkul/Product/src/Repositories/ProductRepository.php index 8245ea1e3..53559b2a6 100755 --- a/packages/Webkul/Product/src/Repositories/ProductRepository.php +++ b/packages/Webkul/Product/src/Repositories/ProductRepository.php @@ -110,6 +110,23 @@ class ProductRepository extends Repository Event::dispatch('catalog.product.delete.after', $id); } + /** + * @param int $categoryId + * + * @return \Illuminate\Support\Collection + */ + public function getProductsRelatedToCategory($categoryId = null) + { + $qb = $this->model + ->leftJoin('product_categories', 'products.id', '=', 'product_categories.product_id'); + + if ($categoryId) { + $qb->where('product_categories.category_id', $categoryId); + } + + return $qb->get(); + } + /** * @param int $categoryId * diff --git a/packages/Webkul/Shop/src/Resources/views/products/list/layered-navigation.blade.php b/packages/Webkul/Shop/src/Resources/views/products/list/layered-navigation.blade.php index 3c8aadd3d..51030d51e 100755 --- a/packages/Webkul/Shop/src/Resources/views/products/list/layered-navigation.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/products/list/layered-navigation.blade.php @@ -11,7 +11,7 @@ if (isset($category)) { $products = $productRepository->getAll($category->id); - $filterAttributes = $productFlatRepository->getFilterableAttributes($category, $products); + $filterAttributes = $productFlatRepository->getProductsRelatedFilterableAttributes($category); $maxPrice = core()->convertPrice($productFlatRepository->getCategoryProductMaximumPrice($category)); } diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/products/list/layered-navigation.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/products/list/layered-navigation.blade.php index 04251d924..a3fd0cb71 100644 --- a/packages/Webkul/Velocity/src/Resources/views/shop/products/list/layered-navigation.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/shop/products/list/layered-navigation.blade.php @@ -9,7 +9,7 @@ if (isset($category)) { $products = $productRepository->getAll($category->id); - $filterAttributes = $productFlatRepository->getFilterableAttributes($category, $products); + $filterAttributes = $productFlatRepository->getProductsRelatedFilterableAttributes($category); $maxPrice = core()->convertPrice($productFlatRepository->getCategoryProductMaximumPrice($category)); } From bbe567ab9bb9706421228bc20a1eb4077f499f9d Mon Sep 17 00:00:00 2001 From: mohd asif Date: Wed, 7 Oct 2020 11:45:44 +0530 Subject: [PATCH 3/9] fixed issue #3983 --- .../src/Resources/views/customers/general.blade.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/Webkul/Admin/src/Resources/views/customers/general.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/general.blade.php index 6118ea986..f95e3773b 100644 --- a/packages/Webkul/Admin/src/Resources/views/customers/general.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/customers/general.blade.php @@ -4,13 +4,13 @@
@csrf() - +
 
- +
{!! view_render_event('bagisto.admin.customer.edit.form.before', ['customer' => $customer]) !!} - +
{!! view_render_event('bagisto.admin.customer.edit.first_name.after', ['customer' => $customer]) !!} - +
@@ -102,4 +102,4 @@
- {!! view_render_event('bagisto.admin.customer.edit.after', ['customer' => $customer]) !!} \ No newline at end of file + {!! view_render_event('bagisto.admin.customer.edit.form.after', ['customer' => $customer]) !!} \ No newline at end of file From 63c93ed73473c3ec06942bc32007a5b693af16f9 Mon Sep 17 00:00:00 2001 From: mohd asif Date: Wed, 7 Oct 2020 13:11:46 +0530 Subject: [PATCH 4/9] fix update #3983 --- .../Admin/src/Resources/views/customers/general.blade.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/Webkul/Admin/src/Resources/views/customers/general.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/general.blade.php index f95e3773b..9917a319e 100644 --- a/packages/Webkul/Admin/src/Resources/views/customers/general.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/customers/general.blade.php @@ -1,5 +1,3 @@ -{!! view_render_event('bagisto.admin.customer.edit.before', ['customer' => $customer]) !!} -
@@ -95,11 +93,13 @@ @endforeach
+ + {!! view_render_event('bagisto.admin.customer.edit.form.after', ['customer' => $customer]) !!} +
- - {!! view_render_event('bagisto.admin.customer.edit.form.after', ['customer' => $customer]) !!} \ No newline at end of file + \ No newline at end of file From 1ce3d26d255f58efeccfea86d035e6fe2e51cdcf Mon Sep 17 00:00:00 2001 From: Jaseel P V Date: Wed, 7 Oct 2020 22:20:15 +0530 Subject: [PATCH 5/9] Fixed issue in image slider path (Path adding to url instead of redirecting issue) #3987 --- .../Shop/src/Resources/assets/js/components/image-slider.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/Webkul/Shop/src/Resources/assets/js/components/image-slider.vue b/packages/Webkul/Shop/src/Resources/assets/js/components/image-slider.vue index 18b0ed2f0..e0cb120e9 100755 --- a/packages/Webkul/Shop/src/Resources/assets/js/components/image-slider.vue +++ b/packages/Webkul/Shop/src/Resources/assets/js/components/image-slider.vue @@ -67,7 +67,7 @@ export default { self.images.push({ 'path': self.public_path + '/storage/' + slider.path, 'title' : slider.title, - 'slider_path': slider.slider_path ? self.public_path+'/'+slider.slider_path : null + 'slider_path': slider.slider_path ? slider.slider_path : null }); self.content.push(slider.content); From e1a78f28a54f8f6ca72f67664eec661733c5e3ca Mon Sep 17 00:00:00 2001 From: paymin Date: Thu, 8 Oct 2020 00:48:02 +0700 Subject: [PATCH 6/9] fix: showing success message on deleting --- .../Admin/src/Http/Controllers/Customer/AddressController.php | 2 +- packages/Webkul/Admin/src/Resources/lang/en/app.php | 1 + .../Webkul/Admin/src/Resources/views/customers/create.blade.php | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/Webkul/Admin/src/Http/Controllers/Customer/AddressController.php b/packages/Webkul/Admin/src/Http/Controllers/Customer/AddressController.php index 459a7af52..50d9e78d9 100644 --- a/packages/Webkul/Admin/src/Http/Controllers/Customer/AddressController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/Customer/AddressController.php @@ -170,7 +170,7 @@ class AddressController extends Controller session()->flash('success', trans('admin::app.customers.addresses.success-delete')); - return redirect()->back(); + return redirect()->route($this->_config['redirect']); } /** diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php index 3593eab94..dd016d581 100755 --- a/packages/Webkul/Admin/src/Resources/lang/en/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php @@ -938,6 +938,7 @@ return [ 'gender' => 'Gender', 'email' => 'Email', 'date_of_birth' => 'Date of Birth', + 'date_of_birth_placeholder' => 'yyyy-mm-dd', 'phone' => 'Phone', 'customer_group' => 'Customer Group', 'save-btn-title' => 'Save Customer', diff --git a/packages/Webkul/Admin/src/Resources/views/customers/create.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/create.blade.php index 62fe98992..f34f71a67 100755 --- a/packages/Webkul/Admin/src/Resources/views/customers/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/customers/create.blade.php @@ -72,7 +72,7 @@
- + @{{ errors.first('date_of_birth') }}
From 6afb1ffa4476b2f6c979963456d079008e94393d Mon Sep 17 00:00:00 2001 From: "vishal.kushwaha650" Date: Thu, 8 Oct 2020 12:48:09 +0530 Subject: [PATCH 7/9] Issue #4030 Fixed --- .../Shop/src/Resources/views/home/featured-products.blade.php | 2 +- .../Webkul/Shop/src/Resources/views/home/new-products.blade.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/Webkul/Shop/src/Resources/views/home/featured-products.blade.php b/packages/Webkul/Shop/src/Resources/views/home/featured-products.blade.php index 5f8b75075..77aa48998 100755 --- a/packages/Webkul/Shop/src/Resources/views/home/featured-products.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/home/featured-products.blade.php @@ -1,4 +1,4 @@ -@if (app('Webkul\Product\Repositories\ProductRepository')->getFeaturedProducts()) +@if (count(app('Webkul\Product\Repositories\ProductRepository')->getFeaturedProducts()))
diff --git a/packages/Webkul/Shop/src/Resources/views/home/new-products.blade.php b/packages/Webkul/Shop/src/Resources/views/home/new-products.blade.php index 8fe92d434..c36bfca87 100755 --- a/packages/Webkul/Shop/src/Resources/views/home/new-products.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/home/new-products.blade.php @@ -1,4 +1,4 @@ -@if (app('Webkul\Product\Repositories\ProductRepository')->getNewProducts()) +@if (count(app('Webkul\Product\Repositories\ProductRepository')->getNewProducts()))
From a2cbec7ad27281de1b6eb74ec6f254590e067829 Mon Sep 17 00:00:00 2001 From: Jaseel P V Date: Thu, 8 Oct 2020 00:57:06 +0530 Subject: [PATCH 8/9] Fixed filter issue in admin panel --- .../Webkul/Ui/src/Resources/views/datagrid/table.blade.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php b/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php index 2f57da155..1b20365c6 100644 --- a/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php +++ b/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php @@ -1,6 +1,7 @@ @php $locale = request()->get('locale') ?: app()->getLocale(); $channel = request()->get('channel') ?: (core()->getCurrentChannelCode() ?: core()->getDefaultChannelCode()); + $customer_group = request()->get('customer_group'); @endphp
@@ -27,7 +28,7 @@ @foreach ($results['extraFilters']['channels'] as $channelModel) @endforeach From 8399833225ae300d2a36fa1b1df3094425fa2e9a Mon Sep 17 00:00:00 2001 From: "vishal.kushwaha650" Date: Thu, 8 Oct 2020 13:02:23 +0530 Subject: [PATCH 9/9] Issue #4031 Fixed --- packages/Webkul/Paypal/src/Config/paymentmethods.php | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/Webkul/Paypal/src/Config/paymentmethods.php b/packages/Webkul/Paypal/src/Config/paymentmethods.php index d5cd28675..63f792094 100755 --- a/packages/Webkul/Paypal/src/Config/paymentmethods.php +++ b/packages/Webkul/Paypal/src/Config/paymentmethods.php @@ -15,6 +15,7 @@ return [ 'code' => 'paypal_smart_button', 'title' => 'Paypal Smart Button', 'description' => 'Paypal Smart Button', + 'client_id' => 'sb', 'class' => 'Webkul\Paypal\Payment\SmartButton', 'sandbox' => true, 'active' => true,