From be644f613451c7e3bcae5f8857e19eb2e6ece101 Mon Sep 17 00:00:00 2001 From: Shubham Mehrotra Date: Mon, 18 May 2020 14:35:16 +0530 Subject: [PATCH 1/5] decoded uri in search --- .../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 5d3c3dc7e..188cfdca1 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 @@ -281,7 +281,7 @@ searchedItem.forEach(item => { let splitedItem = item.split('='); - updatedSearchedCollection[splitedItem[0]] = splitedItem[1]; + updatedSearchedCollection[splitedItem[0]] = decodeURI(splitedItem[1]); }); this.searchedQuery = updatedSearchedCollection; From 7cf09f56acfadf53bed6d2b12ecbf83b235b864a Mon Sep 17 00:00:00 2001 From: Shubham Mehrotra Date: Mon, 18 May 2020 14:44:13 +0530 Subject: [PATCH 2/5] remove extra changes --- .../src/Resources/views/shop/checkout/onepage.blade.php | 8 +++----- .../views/shop/checkout/onepage/customer-info.blade.php | 2 +- .../shop/checkout/onepage/customer-new-form.blade.php | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage.blade.php index 059a51832..249aa9983 100644 --- a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage.blade.php @@ -499,15 +499,13 @@ backToSavedBillingAddress: function () { this.new_billing_address = false; - this.validateFormAfterAction() + setTimeout(() => { + this.validateForm('address-form'); + }, 0); }, backToSavedShippingAddress: function () { this.new_shipping_address = false; - this.validateFormAfterAction() - }, - - validateFormAfterAction: function () { setTimeout(() => { this.validateForm('address-form'); }, 0); diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/customer-info.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/customer-info.blade.php index 7ebc9b9a9..755ad7be9 100644 --- a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/customer-info.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/customer-info.blade.php @@ -83,7 +83,7 @@ type="checkbox" id="billing[use_for_shipping]" name="billing[use_for_shipping]" - @change="validateFormAfterAction" + @change="setTimeout(() => validateForm('address-form'), 0)" v-model="address.billing.use_for_shipping" /> diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/customer-new-form.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/customer-new-form.blade.php index 0761cafab..f2331ccb7 100644 --- a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/customer-new-form.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/customer-new-form.blade.php @@ -514,7 +514,7 @@ type="checkbox" id="billing[use_for_shipping]" name="billing[use_for_shipping]" - @change="validateFormAfterAction" + @change="setTimeout(() => validateForm('address-form'), 0)" v-model="address.billing.use_for_shipping" /> From 77db0f6a481a17998754e777680b350cf4564046 Mon Sep 17 00:00:00 2001 From: Shubham Mehrotra Date: Mon, 18 May 2020 14:46:19 +0530 Subject: [PATCH 3/5] remove extra changes --- .../src/Resources/views/shop/checkout/onepage.blade.php | 2 +- .../views/shop/checkout/onepage/customer-info.blade.php | 2 +- .../views/shop/checkout/onepage/customer-new-form.blade.php | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage.blade.php index 249aa9983..ab5d50756 100644 --- a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage.blade.php @@ -509,7 +509,7 @@ setTimeout(() => { this.validateForm('address-form'); }, 0); - } + }, } }); diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/customer-info.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/customer-info.blade.php index 755ad7be9..87ca1c3ef 100644 --- a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/customer-info.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/customer-info.blade.php @@ -79,8 +79,8 @@
+ v-model="address.billing.use_for_shipping" + @change="setTimeout(() => validateForm('address-form'), 0)" /> {{ __('shop::app.checkout.onepage.use_for_shipping') }} From 258009e050b7f2afc2f4582726b812f685373efc Mon Sep 17 00:00:00 2001 From: Shubham Mehrotra Date: Mon, 18 May 2020 15:25:03 +0530 Subject: [PATCH 4/5] remove previous changes --- .../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 188cfdca1..5d3c3dc7e 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 @@ -281,7 +281,7 @@ searchedItem.forEach(item => { let splitedItem = item.split('='); - updatedSearchedCollection[splitedItem[0]] = decodeURI(splitedItem[1]); + updatedSearchedCollection[splitedItem[0]] = splitedItem[1]; }); this.searchedQuery = updatedSearchedCollection; From 2f481e402283e188dd4482efea26bcfe2a8e696b Mon Sep 17 00:00:00 2001 From: Shubham Mehrotra Date: Mon, 18 May 2020 17:11:52 +0530 Subject: [PATCH 5/5] #2994 #2973 --- .../views/shop/checkout/onepage/customer-new-form.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/customer-new-form.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/customer-new-form.blade.php index 1baa7ad50..964726891 100644 --- a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/customer-new-form.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/customer-new-form.blade.php @@ -206,7 +206,7 @@ v-validate="'required'" name="shipping[postcode]" v-model="address.shipping.postcode" - @change="validateForm('address-form')" + @keyup="validateForm('address-form')" data-vv-as=""{{ __('shop::app.checkout.onepage.postcode') }}"" /> @@ -498,7 +498,7 @@ name="billing[phone]" v-validate="'required'" v-model="address.billing.phone" - @change="validateForm('address-form')" + @keyup="validateForm('address-form')" data-vv-as=""{{ __('shop::app.checkout.onepage.phone') }}"" />