From e259d6b8bf61df863c253d6f0201aa39e60d8e9e Mon Sep 17 00:00:00 2001
From: Shubham Mehrotra <shubh0896m@gmail.com>
Date: Wed, 1 Apr 2020 17:58:10 +0530
Subject: [PATCH] #2785

---
 .../src/Resources/views/checkout/onepage.blade.php     | 10 ++++++++++
 .../Resources/views/shop/checkout/onepage.blade.php    | 10 ++++++++++
 .../views/shop/checkout/onepage/payment.blade.php      |  6 +++---
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php
index a133d353c..52e30c564 100755
--- a/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php
@@ -289,6 +289,16 @@
 
                     this.disable_button = true;
 
+                    let address = this.allAddress.forEach(address => {
+                        if (address.id == this.address.billing.address_id) {
+                            this.address.billing.address1 = [address.address1];
+                        }
+
+                        if (address.id == this.address.shipping.address_id) {
+                            this.address.shipping.address1 = [address.address1];
+                        }
+                    });
+
                     this.$http.post("{{ route('shop.checkout.save-address') }}", this.address)
                         .then(function(response) {
                             this_this.disable_button = false;
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 6239fa4ea..0fcd38972 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
@@ -337,6 +337,16 @@
                     saveAddress: function() {
                         this.disable_button = true;
 
+                        let address = this.allAddress.forEach(address => {
+                            if (address.id == this.address.billing.address_id) {
+                                this.address.billing.address1 = [address.address1];
+                            }
+
+                            if (address.id == this.address.shipping.address_id) {
+                                this.address.shipping.address1 = [address.address1];
+                            }
+                        });
+
                         this.$http.post("{{ route('shop.checkout.save-address') }}", this.address)
                             .then(response => {
                                 this.disable_button = false;
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/payment.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/payment.blade.php
index c1dca5f76..8b31499d3 100755
--- a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/payment.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/payment.blade.php
@@ -17,13 +17,13 @@
                         <div>
                             <label class="radio-container">
                                 <input
-                                    v-validate="'required'"
                                     type="radio"
-                                    id="{{ $payment['method'] }}"
                                     name="payment[method]"
-                                    value="{{ $payment['method'] }}"
+                                    v-validate="'required'"
                                     v-model="payment.method"
                                     @change="methodSelected()"
+                                    id="{{ $payment['method'] }}"
+                                    value="{{ $payment['method'] }}"
                                     data-vv-as="&quot;{{ __('shop::app.checkout.onepage.payment-method') }}&quot;" />
 
                                 <span class="checkmark"></span>