File tree Expand file tree Collapse file tree 1 file changed +8
-3
lines changed
app/code/Magento/Checkout/view/frontend/web/js/view Expand file tree Collapse file tree 1 file changed +8
-3
lines changed Original file line number Diff line number Diff line change @@ -126,7 +126,7 @@ function (
126
126
if ( this . isAddressSameAsShipping ( ) ) {
127
127
selectBillingAddress ( quote . shippingAddress ( ) ) ;
128
128
129
- this . updateAddresses ( ) ;
129
+ this . updateAddress ( ) ;
130
130
this . isAddressDetailsVisible ( true ) ;
131
131
} else {
132
132
lastSelectedBillingAddress = quote . billingAddress ( ) ;
@@ -147,8 +147,13 @@ function (
147
147
addressUpadated = true ;
148
148
149
149
if ( this . selectedAddress ( ) && ! this . isAddressFormVisible ( ) ) {
150
- selectBillingAddress ( this . selectedAddress ( ) ) ;
151
- checkoutData . setSelectedBillingAddress ( this . selectedAddress ( ) . getKey ( ) ) ;
150
+ if ( this . isAddressDetailsVisible ( ) ) {
151
+ selectBillingAddress ( quote . shippingAddress ( ) ) ;
152
+ checkoutData . setSelectedBillingAddress ( quote . shippingAddress ( ) . getKey ( ) ) ;
153
+ } else {
154
+ selectBillingAddress ( this . selectedAddress ( ) ) ;
155
+ checkoutData . setSelectedBillingAddress ( this . selectedAddress ( ) . getKey ( ) ) ;
156
+ }
152
157
} else {
153
158
this . source . set ( 'params.invalid' , false ) ;
154
159
this . source . trigger ( this . dataScopePrefix + '.data.validate' ) ;
You can’t perform that action at this time.
0 commit comments