File tree Expand file tree Collapse file tree 3 files changed +4
-1
lines changed
app/code/Magento/Checkout/view/frontend/web/js/model
dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/model/cart Expand file tree Collapse file tree 3 files changed +4
-1
lines changed Original file line number Diff line number Diff line change @@ -41,7 +41,6 @@ define([
41
41
totalsProcessors [ type ] ?
42
42
totalsProcessors [ type ] . estimateTotals ( quote . shippingAddress ( ) ) :
43
43
totalsProcessors [ 'default' ] . estimateTotals ( quote . shippingAddress ( ) ) ;
44
- shippingService . isLoading ( false ) ;
45
44
} else {
46
45
// check if user data not changed -> load rates from cache
47
46
if ( ! cartCache . isChanged ( 'address' , quote . shippingAddress ( ) ) &&
@@ -73,6 +72,8 @@ define([
73
72
cartCache . set ( 'totals' , quote . getTotals ( ) ) ;
74
73
}
75
74
}
75
+ // unset loader on shipping rates list
76
+ shippingService . isLoading ( false ) ;
76
77
} ,
77
78
78
79
/**
Original file line number Diff line number Diff line change @@ -148,6 +148,7 @@ define([
148
148
} , delay ) ;
149
149
150
150
if ( ! formPopUpState . isVisible ( ) ) {
151
+ // Prevent shipping methods showing none available whilst we resolve
151
152
shippingService . isLoading ( true ) ;
152
153
clearTimeout ( self . validateAddressTimeout ) ;
153
154
self . validateAddressTimeout = setTimeout ( function ( ) {
Original file line number Diff line number Diff line change @@ -41,6 +41,7 @@ define([
41
41
} ,
42
42
'Magento_Checkout/js/model/shipping-service' : {
43
43
setShippingRates : function ( ) { } ,
44
+ isLoading : ko . observable ( ) ,
44
45
getShippingRates : function ( ) {
45
46
return ko . observable ( rates ) ;
46
47
}
You can’t perform that action at this time.
0 commit comments