From e40afeaf906e87336a67ba0f34c9a3d58e6606d5 Mon Sep 17 00:00:00 2001 From: Shubham Mehrotra Date: Mon, 10 Aug 2020 21:43:31 +0530 Subject: [PATCH 1/3] update --- .../Shop/src/Resources/views/layouts/header/index.blade.php | 2 +- .../Webkul/Shop/src/Resources/views/products/compare.blade.php | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php b/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php index 9aeea6461..bb0c450bb 100755 --- a/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php @@ -337,7 +337,7 @@ }); let comparedItems = JSON.parse(localStorage.getItem('compared_product')); - $('#compare-items-count').append(comparedItems.length); + $('#compare-items-count').html(comparedItems ? comparedItems.length : 0); function toggleDropdown(e) { var currentElement = $(e.currentTarget); diff --git a/packages/Webkul/Shop/src/Resources/views/products/compare.blade.php b/packages/Webkul/Shop/src/Resources/views/products/compare.blade.php index 447e75661..805ebe669 100755 --- a/packages/Webkul/Shop/src/Resources/views/products/compare.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/products/compare.blade.php @@ -82,6 +82,9 @@ this.$root.addFlashMessages() } } + + let comparedItems = JSON.parse(localStorage.getItem('compared_product')); + $('#compare-items-count').html(comparedItems ? comparedItems.length : 0); }, 'getStorageValue': function (key) { From 17a5e453f55d70c154e99a2d8b4c947b9216f3a8 Mon Sep 17 00:00:00 2001 From: Shubham Mehrotra Date: Mon, 10 Aug 2020 22:20:46 +0530 Subject: [PATCH 2/3] updates --- .../Resources/views/guest/compare/compare-products.blade.php | 2 +- .../views/shop/guest/compare/compare-products.blade.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/Webkul/Shop/src/Resources/views/guest/compare/compare-products.blade.php b/packages/Webkul/Shop/src/Resources/views/guest/compare/compare-products.blade.php index cba9eff37..7e696e987 100644 --- a/packages/Webkul/Shop/src/Resources/views/guest/compare/compare-products.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/guest/compare/compare-products.blade.php @@ -4,7 +4,7 @@ $locale = request()->get('locale') ?: app()->getLocale(); - $attributeOptionTranslations = DB::table(DB::getTablePrefix() . 'attribute_option_translations')->where('locale', $locale)->get()->toJson(); + $attributeOptionTranslations = DB::table('attribute_option_translations')->where('locale', $locale)->get()->toJson(); @endphp @push('scripts') diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/guest/compare/compare-products.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/guest/compare/compare-products.blade.php index 83266e50f..eaf6c6199 100644 --- a/packages/Webkul/Velocity/src/Resources/views/shop/guest/compare/compare-products.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/shop/guest/compare/compare-products.blade.php @@ -4,7 +4,7 @@ $locale = request()->get('locale') ?: app()->getLocale(); - $attributeOptionTranslations = DB::table(DB::getTablePrefix() . 'attribute_option_translations')->where('locale', $locale)->get()->toJson(); + $attributeOptionTranslations = DB::table('attribute_option_translations')->where('locale', $locale)->get()->toJson(); @endphp @push('css') From bcc87623d832e071353f981d6b1b9163270f0411 Mon Sep 17 00:00:00 2001 From: Shubham Mehrotra Date: Tue, 11 Aug 2020 12:04:10 +0530 Subject: [PATCH 3/3] updates --- .../guest/compare/compare-products.blade.php | 24 +++++++++++++++ .../views/layouts/header/index.blade.php | 18 ++++++++++-- .../views/products/compare.blade.php | 29 ++++++++++++++++--- .../src/Http/Controllers/Shop/Controller.php | 1 - 4 files changed, 65 insertions(+), 7 deletions(-) diff --git a/packages/Webkul/Shop/src/Resources/views/guest/compare/compare-products.blade.php b/packages/Webkul/Shop/src/Resources/views/guest/compare/compare-products.blade.php index 7e696e987..403341771 100644 --- a/packages/Webkul/Shop/src/Resources/views/guest/compare/compare-products.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/guest/compare/compare-products.blade.php @@ -230,6 +230,8 @@ this.$root.addFlashMessages(); } + + this.updateCompareCount(); }, 'getDynamicHTML': function (input) { @@ -311,6 +313,28 @@ } return attributeOptions; + }, + + 'updateCompareCount': function () { + if (this.isCustomer == "true" || this.isCustomer == true) { + this.$http.get(`${this.baseUrl}/items-count`) + .then(response => { + $('#compare-items-count').html(response.data.compareProductsCount); + }) + .catch(exception => { + window.flashMessages = [{ + 'type': `alert-error`, + 'message': "{{ __('shop::app.common.error') }}" + }]; + + this.$root.addFlashMessages(); + }); + } else { + let comparedItems = JSON.parse(localStorage.getItem('compared_product')); + comparedItemsCount = comparedItems ? comparedItems.length : 0; + + $('#compare-items-count').html(comparedItemsCount); + } } } }); diff --git a/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php b/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php index bb0c450bb..18204a281 100755 --- a/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php @@ -336,8 +336,22 @@ toggleDropdown(e); }); - let comparedItems = JSON.parse(localStorage.getItem('compared_product')); - $('#compare-items-count').html(comparedItems ? comparedItems.length : 0); + @auth('customer') + @php + $compareCount = app('Webkul\Velocity\Repositories\VelocityCustomerCompareProductRepository') + ->count([ + 'customer_id' => auth()->guard('customer')->user()->id, + ]); + @endphp + + let comparedItems = JSON.parse(localStorage.getItem('compared_product')); + $('#compare-items-count').html({{ $compareCount }}); + @endauth + + @guest('customer') + let comparedItems = JSON.parse(localStorage.getItem('compared_product')); + $('#compare-items-count').html(comparedItems ? comparedItems.length : 0); + @endguest function toggleDropdown(e) { var currentElement = $(e.currentTarget); diff --git a/packages/Webkul/Shop/src/Resources/views/products/compare.blade.php b/packages/Webkul/Shop/src/Resources/views/products/compare.blade.php index 805ebe669..5a5778858 100755 --- a/packages/Webkul/Shop/src/Resources/views/products/compare.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/products/compare.blade.php @@ -18,7 +18,7 @@ template: '#compare-component-template', - data: function () { + data: function () { return { 'baseUrl': "{{ url()->to('/') }}", 'customer': '{{ auth()->guard('customer')->user() ? "true" : "false" }}' == "true", @@ -37,7 +37,7 @@ 'type': `alert-${response.data.status}`, 'message': response.data.message }]; - + this.$root.addFlashMessages() }).catch(error => { window.flashMessages = [{ @@ -83,8 +83,7 @@ } } - let comparedItems = JSON.parse(localStorage.getItem('compared_product')); - $('#compare-items-count').html(comparedItems ? comparedItems.length : 0); + this.updateCompareCount(); }, 'getStorageValue': function (key) { @@ -102,6 +101,28 @@ return true; }, + + 'updateCompareCount': function () { + if (this.customer == "true" || this.customer == true) { + this.$http.get(`${this.baseUrl}/items-count`) + .then(response => { + $('#compare-items-count').html(response.data.compareProductsCount); + }) + .catch(exception => { + window.flashMessages = [{ + 'type': `alert-error`, + 'message': "{{ __('shop::app.common.error') }}" + }]; + + this.$root.addFlashMessages(); + }); + } else { + let comparedItems = JSON.parse(localStorage.getItem('compared_product')); + comparedItemsCount = comparedItems ? comparedItems.length : 0; + + $('#compare-items-count').html(comparedItemsCount); + } + } } }); diff --git a/packages/Webkul/Velocity/src/Http/Controllers/Shop/Controller.php b/packages/Webkul/Velocity/src/Http/Controllers/Shop/Controller.php index cbe3ab1e3..4d5c1a356 100755 --- a/packages/Webkul/Velocity/src/Http/Controllers/Shop/Controller.php +++ b/packages/Webkul/Velocity/src/Http/Controllers/Shop/Controller.php @@ -93,7 +93,6 @@ class Controller extends BaseController * @param \Webkul\Category\Repositories\CategoryRepository $categoryRepository * @param \Webkul\Velocity\Repositories\Product\ProductRepository $velocityProductRepository * @param \Webkul\Velocity\Repositories\VelocityCustomerCompareProductRepository $compareProductsRepository - * @param \Webkul\Velocity\Repositories\VelocityCustomerCompareProductRepository $compareProductsRepository * * @return void */