File tree Expand file tree Collapse file tree 3 files changed +5
-5
lines changed
app/code/Magento/Checkout
view/frontend/web/js/action Expand file tree Collapse file tree 3 files changed +5
-5
lines changed Original file line number Diff line number Diff line change @@ -48,7 +48,7 @@ public function process($jsLayout)
48
48
/** @var \Magento\Eav\Api\Data\AttributeInterface[] $attributes */
49
49
$ attributes = $ this ->attributeMetadataDataProvider ->loadAttributesCollection (
50
50
'customer_address ' ,
51
- 'customer_register_address '
51
+ 'customer_address_edit '
52
52
);
53
53
54
54
$ elements = [];
Original file line number Diff line number Diff line change @@ -180,14 +180,14 @@ protected function _expireAjax()
180
180
{
181
181
$ quote = $ this ->getOnepage ()->getQuote ();
182
182
if (!$ quote ->hasItems () || $ quote ->getHasError () || !$ quote ->validateMinimumAmount ()) {
183
- return false ;
183
+ return true ;
184
184
}
185
185
$ action = $ this ->getRequest ()->getActionName ();
186
186
if ($ this ->_objectManager ->get ('Magento\Checkout\Model\Session ' )->getCartWasUpdated (true )
187
187
&&
188
188
!in_array ($ action , ['index ' , 'progress ' ])
189
189
) {
190
- return false ;
190
+ return true ;
191
191
}
192
192
193
193
return false ;
Original file line number Diff line number Diff line change @@ -14,8 +14,8 @@ define(
14
14
} ) ;
15
15
return function ( shippingAddress ) {
16
16
quote . shippingAddress ( shippingAddress ) ;
17
- //set billing address same as shipping by default
18
- if ( shippingAddress . canUseForBilling ( ) ) {
17
+ //set billing address same as shipping by default if it is not empty
18
+ if ( shippingAddress . countryId != undefined && shippingAddress . canUseForBilling ( ) ) {
19
19
quote . billingAddress ( shippingAddress ) ;
20
20
}
21
21
} ;
You can’t perform that action at this time.
0 commit comments