@@ -45,10 +45,15 @@ define([
45
45
totals : result ,
46
46
address : address ,
47
47
cartVersion : customerData . get ( 'cart' ) ( ) [ 'data_id' ] ,
48
- shippingMethodCode : quote . shippingMethod ( ) [ 'method_code' ] ,
49
- shippingCarrierCode : quote . shippingMethod ( ) [ 'carrier_code' ]
48
+ shippingMethodCode : null ,
49
+ shippingCarrierCode : null
50
50
} ;
51
51
52
+ if ( quote . shippingMethod ( ) ) {
53
+ data . shippingMethodCode = quote . shippingMethod ( ) [ 'method_code' ] ;
54
+ data . shippingCarrierCode = quote . shippingMethod ( ) [ 'carrier_code' ] ;
55
+ }
56
+
52
57
quote . setTotals ( result ) ;
53
58
cartCache . set ( 'cart-data' , data ) ;
54
59
} ) . fail ( function ( response ) {
@@ -72,9 +77,19 @@ define([
72
77
* @param {Object } address
73
78
*/
74
79
estimateTotals : function ( address ) {
80
+ var data = {
81
+ shippingMethodCode : null ,
82
+ shippingCarrierCode : null
83
+ } ;
84
+
85
+ if ( quote . shippingMethod ( ) ) {
86
+ data . shippingMethodCode = quote . shippingMethod ( ) [ 'method_code' ] ;
87
+ data . shippingCarrierCode = quote . shippingMethod ( ) [ 'carrier_code' ] ;
88
+ }
89
+
75
90
if ( ! cartCache . isChanged ( 'cartVersion' , customerData . get ( 'cart' ) ( ) [ 'data_id' ] ) &&
76
- ! cartCache . isChanged ( 'shippingMethodCode' , quote . shippingMethod ( ) [ 'method_code' ] ) &&
77
- ! cartCache . isChanged ( 'shippingCarrierCode' , quote . shippingMethod ( ) [ 'carrier_code' ] ) &&
91
+ ! cartCache . isChanged ( 'shippingMethodCode' , data . shippingMethodCode ) &&
92
+ ! cartCache . isChanged ( 'shippingCarrierCode' , data . shippingCarrierCode ) &&
78
93
! cartCache . isChanged ( 'address' , address ) &&
79
94
cartCache . get ( 'totals' )
80
95
) {
0 commit comments