File tree 3 files changed +10
-6
lines changed
code/Magento/Checkout/view/frontend/web
design/frontend/Magento/luma/Magento_Checkout/web/css/source/module
3 files changed +10
-6
lines changed Original file line number Diff line number Diff line change @@ -14,6 +14,7 @@ define(
14
14
'uiRegistry' ,
15
15
'Magento_Checkout/js/model/quote' ,
16
16
'Magento_Checkout/js/model/checkout-data-resolver' ,
17
+ 'Magento_Checkout/js/model/shipping-service' ,
17
18
'mage/validation'
18
19
] ,
19
20
function (
@@ -26,7 +27,8 @@ define(
26
27
shippingRatesValidator ,
27
28
registry ,
28
29
quote ,
29
- checkoutDataResolver
30
+ checkoutDataResolver ,
31
+ shippingService
30
32
) {
31
33
'use strict' ;
32
34
@@ -41,9 +43,15 @@ define(
41
43
*/
42
44
initialize : function ( ) {
43
45
this . _super ( ) ;
46
+
47
+ // Prevent shipping methods showing none available whilst we resolve
48
+ shippingService . isLoading ( true ) ;
49
+
44
50
registry . async ( 'checkoutProvider' ) ( function ( checkoutProvider ) {
45
51
var address , estimatedAddress ;
46
52
53
+ shippingService . isLoading ( false ) ;
54
+
47
55
checkoutDataResolver . resolveEstimationAddress ( ) ;
48
56
address = quote . isVirtual ( ) ? quote . billingAddress ( ) : quote . shippingAddress ( ) ;
49
57
Original file line number Diff line number Diff line change 5
5
*/
6
6
-->
7
7
< form id ="co-shipping-method-form " data-bind ="blockLoader: isLoading, visible: isVisible() ">
8
- < p class ="field note " data-bind ="visible: (shippingRates().length <= 0) ">
8
+ < p class ="field note " data-bind ="visible: (!isLoading() && shippingRates().length <= 0) ">
9
9
<!-- ko text: $t('Sorry, no quotes are available for this order at this time')--> <!-- /ko -->
10
10
</ p >
11
11
< fieldset class ="fieldset rate " data-bind ="visible: (shippingRates().length > 0) ">
Original file line number Diff line number Diff line change 63
63
64
64
.field {
65
65
margin : 0 0 16px ;
66
-
67
- & .note {
68
- display : none ;
69
- }
70
66
}
71
67
72
68
.actions-toolbar {
You can’t perform that action at this time.
0 commit comments