From 1a91ef116f3e24c383863e9688ebfa6120381be2 Mon Sep 17 00:00:00 2001
From: Shubham Mehrotra <shubh0896m@gmail.com>
Date: Mon, 18 May 2020 12:59:23 +0530
Subject: [PATCH] #3076

---
 .../Resources/views/shop/checkout/onepage.blade.php    | 10 ++++++----
 .../shop/checkout/onepage/customer-info.blade.php      |  4 ++--
 .../shop/checkout/onepage/customer-new-form.blade.php  |  4 ++--
 3 files changed, 10 insertions(+), 8 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 ab5d50756..059a51832 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,17 +499,19 @@
 
                     backToSavedBillingAddress: function () {
                         this.new_billing_address = false;
-                        setTimeout(() => {
-                            this.validateForm('address-form');
-                        }, 0);
+                        this.validateFormAfterAction()
                     },
 
                     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 87ca1c3ef..7ebc9b9a9 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,11 +79,11 @@
                     <div class="mt10 mb10" v-if="address.billing.address_id">
                         <span class="checkbox fs16 display-inbl">
                             <input
-                                type="checkbox"
                                 class="ml0"
+                                type="checkbox"
                                 id="billing[use_for_shipping]"
                                 name="billing[use_for_shipping]"
-                                @change="setTimeout(() => validateForm('address-form'), 0)"
+                                @change="validateFormAfterAction"
                                 v-model="address.billing.use_for_shipping" />
 
                             <span class="ml-5">
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..0761cafab 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,8 +514,8 @@
                         type="checkbox"
                         id="billing[use_for_shipping]"
                         name="billing[use_for_shipping]"
-                        v-model="address.billing.use_for_shipping"
-                        @change="setTimeout(() => validateForm('address-form'), 0)" />
+                        @change="validateFormAfterAction"
+                        v-model="address.billing.use_for_shipping" />
 
                     <span class="ml-5">
                         {{ __('shop::app.checkout.onepage.use_for_shipping') }}