From 1398fee9162932ebcb2e887b89bee2e957d3aa70 Mon Sep 17 00:00:00 2001 From: sanjeev Date: Mon, 25 Jul 2022 15:01:29 +0530 Subject: [PATCH 1/4] disabling multiple click on element till respose get back --- .../Shop/src/Resources/views/checkout/cart/coupon.blade.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/cart/coupon.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/cart/coupon.blade.php index 4ad6516c9..252daab2a 100644 --- a/packages/Webkul/Shop/src/Resources/views/checkout/cart/coupon.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/cart/coupon.blade.php @@ -96,6 +96,7 @@ removeCoupon: function () { let self = this; + $('.cross-icon').css('pointer-events','none'); axios.delete('{{ route('shop.checkout.coupon.remove.coupon') }}') .then(function(response) { @@ -103,6 +104,8 @@ self.applied_coupon = ''; + $('.cross-icon').css('pointer-events','auto'); + window.flashMessages = [{'type': 'alert-success', 'message': response.data.message}]; self.$root.addFlashMessages(); From 011cd38481aa5c56c7c6fb8e0bde0de82df8c238 Mon Sep 17 00:00:00 2001 From: sanjeev Date: Mon, 25 Jul 2022 15:32:36 +0530 Subject: [PATCH 2/4] prevant multiple clicks on cross icon for default and velocity theme --- .../views/checkout/cart/coupon.blade.php | 15 +++++++++++---- .../views/shop/checkout/cart/coupon.blade.php | 13 ++++++++++++- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/cart/coupon.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/cart/coupon.blade.php index 252daab2a..9015a0c84 100644 --- a/packages/Webkul/Shop/src/Resources/views/checkout/cart/coupon.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/cart/coupon.blade.php @@ -41,7 +41,9 @@ route_name: "{{ request()->route()->getName() }}", - disable_button: false + disable_button: false, + + removeIconEnabled: true } }, @@ -96,15 +98,17 @@ removeCoupon: function () { let self = this; - $('.cross-icon').css('pointer-events','none'); + + if (self.removeIconEnabled) { + self.removeIconEnabled = false; - axios.delete('{{ route('shop.checkout.coupon.remove.coupon') }}') + axios.delete('{{ route('shop.checkout.coupon.remove.coupon') }}') .then(function(response) { self.$emit('onRemoveCoupon') self.applied_coupon = ''; - $('.cross-icon').css('pointer-events','auto'); + self.removeIconEnabled = true; window.flashMessages = [{'type': 'alert-success', 'message': response.data.message}]; @@ -116,7 +120,10 @@ window.flashMessages = [{'type': 'alert-error', 'message': error.response.data.message}]; self.$root.addFlashMessages(); + + self.removeIconEnabled = true; }); + } }, redirectIfCartPage: function() { diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/cart/coupon.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/cart/coupon.blade.php index e40137012..d7703ce42 100644 --- a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/cart/coupon.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/cart/coupon.blade.php @@ -43,6 +43,7 @@ applied_coupon: "{{ $cart->coupon_code }}", route_name: "{{ request()->route()->getName() }}", disable_button: false, + removeIconEnabled: true } }, @@ -100,7 +101,10 @@ removeCoupon: function () { let self = this; - axios + if (self.removeIconEnabled) { + self.removeIconEnabled = false; + + axios .delete('{{ route('shop.checkout.coupon.remove.coupon') }}') .then(function(response) { self.$emit('onRemoveCoupon') @@ -109,6 +113,8 @@ self.disable_button = false; + self.removeIconEnabled = true; + window.showAlert( 'alert-success', response.data.label, @@ -121,7 +127,12 @@ window.flashMessages = [{'type': 'alert-error', 'message': error.response.data.message}]; self.$root.addFlashMessages(); + + self.disable_button = false; + + self.removeIconEnabled = true; }); + } }, redirectIfCartPage: function() { From b361d548e6f5c9b7a1ef751f7cf47139d54fd9a6 Mon Sep 17 00:00:00 2001 From: sanjeev Date: Wed, 3 Aug 2022 13:30:13 +0530 Subject: [PATCH 3/4] camel case disable button --- .../Resources/views/checkout/cart/coupon.blade.php | 10 +++++----- .../views/shop/checkout/cart/coupon.blade.php | 14 +++++++------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/cart/coupon.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/cart/coupon.blade.php index 9015a0c84..f0f08676d 100644 --- a/packages/Webkul/Shop/src/Resources/views/checkout/cart/coupon.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/cart/coupon.blade.php @@ -9,7 +9,7 @@
@{{ error_message }}
- + @@ -41,7 +41,7 @@ route_name: "{{ request()->route()->getName() }}", - disable_button: false, + disableButton: false, removeIconEnabled: true } @@ -67,7 +67,7 @@ self.error_message = null; - self.disable_button = true; + self.disableButton = true; axios.post('{{ route('shop.checkout.cart.coupon.apply') }}', {code: self.coupon_code}) .then(function(response) { @@ -87,12 +87,12 @@ self.error_message = response.data.message; } - self.disable_button = false; + self.disableButton = false; }) .catch(function(error) { self.error_message = error.response.data.message; - self.disable_button = false; + self.disableButton = false; }); }, diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/cart/coupon.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/cart/coupon.blade.php index d7703ce42..24a80db3f 100644 --- a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/cart/coupon.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/cart/coupon.blade.php @@ -14,7 +14,7 @@
@{{ error_message }}
- + @@ -42,7 +42,7 @@ error_message: '', applied_coupon: "{{ $cart->coupon_code }}", route_name: "{{ request()->route()->getName() }}", - disable_button: false, + disableButton: false, removeIconEnabled: true } }, @@ -65,7 +65,7 @@ this.error_message = null; - this.disable_button = true; + this.disableButton = true; let code = this.coupon_code; @@ -90,11 +90,11 @@ this.error_message = response.data.message; } - this.disable_button = false; + this.disableButton = false; }).catch(error => { this.error_message = error.response.data.message; - this.disable_button = false; + this.disableButton = false; }); }, @@ -111,7 +111,7 @@ self.applied_coupon = ''; - self.disable_button = false; + self.disableButton = false; self.removeIconEnabled = true; @@ -128,7 +128,7 @@ self.$root.addFlashMessages(); - self.disable_button = false; + self.disableButton = false; self.removeIconEnabled = true; }); From dcbae7a39133a71835ba4ba91694039cf949825c Mon Sep 17 00:00:00 2001 From: sanjeev Date: Wed, 3 Aug 2022 13:45:21 +0530 Subject: [PATCH 4/4] updated all variable to camel case --- .../views/checkout/cart/coupon.blade.php | 42 +++++++++---------- .../views/shop/checkout/cart/coupon.blade.php | 42 +++++++++---------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/cart/coupon.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/cart/coupon.blade.php index f0f08676d..c6833b11b 100644 --- a/packages/Webkul/Shop/src/Resources/views/checkout/cart/coupon.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/cart/coupon.blade.php @@ -3,21 +3,21 @@
-
- +
+ -
@{{ error_message }}
+
@{{ errorMessage }}
-
+
@@ -33,13 +33,13 @@ data: function() { return { - coupon_code: '', + couponCode: '', - applied_coupon: "{{ $cart->coupon_code }}", + appliedCoupon: "{{ $cart->coupon_code }}", - error_message: '', + errorMessage: '', - route_name: "{{ request()->route()->getName() }}", + routeName: "{{ request()->route()->getName() }}", disableButton: false, @@ -48,9 +48,9 @@ }, watch: { - coupon_code: function (value) { + couponCode: function (value) { if (value != '') { - this.error_message = ''; + this.errorMessage = ''; } } }, @@ -59,24 +59,24 @@ applyCoupon: function() { let self = this; - if (! this.coupon_code.length) { - this.error_message = '{{ __('shop::app.checkout.total.invalid-coupon') }}'; + if (! this.couponCode.length) { + this.errorMessage = '{{ __('shop::app.checkout.total.invalid-coupon') }}'; return; } - self.error_message = null; + self.errorMessage = null; self.disableButton = true; - axios.post('{{ route('shop.checkout.cart.coupon.apply') }}', {code: self.coupon_code}) + axios.post('{{ route('shop.checkout.cart.coupon.apply') }}', {code: self.couponCode}) .then(function(response) { if (response.data.success) { self.$emit('onApplyCoupon'); - self.applied_coupon = self.coupon_code; + self.appliedCoupon = self.couponCode; - self.coupon_code = ''; + self.couponCode = ''; window.flashMessages = [{'type': 'alert-success', 'message': response.data.message}]; @@ -84,13 +84,13 @@ self.redirectIfCartPage(); } else { - self.error_message = response.data.message; + self.errorMessage = response.data.message; } self.disableButton = false; }) .catch(function(error) { - self.error_message = error.response.data.message; + self.errorMessage = error.response.data.message; self.disableButton = false; }); @@ -106,7 +106,7 @@ .then(function(response) { self.$emit('onRemoveCoupon') - self.applied_coupon = ''; + self.appliedCoupon = ''; self.removeIconEnabled = true; @@ -127,7 +127,7 @@ }, redirectIfCartPage: function() { - if (this.route_name != 'shop.checkout.cart.index') return; + if (this.routeName != 'shop.checkout.cart.index') return; setTimeout(function() { window.location.reload(); diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/cart/coupon.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/cart/coupon.blade.php index 24a80db3f..a6a99e040 100644 --- a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/cart/coupon.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/cart/coupon.blade.php @@ -3,26 +3,26 @@
-
+
-
@{{ error_message }}
+
@{{ errorMessage }}
-
+
@@ -38,36 +38,36 @@ data: function() { return { - coupon_code: '', - error_message: '', - applied_coupon: "{{ $cart->coupon_code }}", - route_name: "{{ request()->route()->getName() }}", + couponCode: '', + errorMessage: '', + appliedCoupon: "{{ $cart->coupon_code }}", + routeName: "{{ request()->route()->getName() }}", disableButton: false, removeIconEnabled: true } }, watch: { - coupon_code: function (value) { + couponCode: function (value) { if (value != '') { - this.error_message = ''; + this.errorMessage = ''; } } }, methods: { applyCoupon: function() { - if (! this.coupon_code.length) { - this.error_message = '{{ __('shop::app.checkout.total.invalid-coupon') }}'; + if (! this.couponCode.length) { + this.errorMessage = '{{ __('shop::app.checkout.total.invalid-coupon') }}'; return; } - this.error_message = null; + this.errorMessage = null; this.disableButton = true; - let code = this.coupon_code; + let code = this.couponCode; axios .post( @@ -76,8 +76,8 @@ if (response.data.success) { this.$emit('onApplyCoupon'); - this.applied_coupon = this.coupon_code; - this.coupon_code = ''; + this.appliedCoupon = this.couponCode; + this.couponCode = ''; window.showAlert( 'alert-success', @@ -87,12 +87,12 @@ this.redirectIfCartPage(); } else { - this.error_message = response.data.message; + this.errorMessage = response.data.message; } this.disableButton = false; }).catch(error => { - this.error_message = error.response.data.message; + this.errorMessage = error.response.data.message; this.disableButton = false; }); @@ -109,7 +109,7 @@ .then(function(response) { self.$emit('onRemoveCoupon') - self.applied_coupon = ''; + self.appliedCoupon = ''; self.disableButton = false; @@ -136,7 +136,7 @@ }, redirectIfCartPage: function() { - if (this.route_name != 'shop.checkout.cart.index') return; + if (this.routeName != 'shop.checkout.cart.index') return; setTimeout(function() { window.location.reload();