Skip to content

Commit c11d05c

Browse files
MAGETWO-64834: Spinner is Always Displayed on Shopping Cart page in Summary block for virtual quote
1 parent 6e95f7f commit c11d05c

File tree

1 file changed

+19
-4
lines changed
  • app/code/Magento/Checkout/view/frontend/web/js/model/cart/totals-processor

1 file changed

+19
-4
lines changed

app/code/Magento/Checkout/view/frontend/web/js/model/cart/totals-processor/default.js

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,15 @@ define([
4545
totals: result,
4646
address: address,
4747
cartVersion: customerData.get('cart')()['data_id'],
48-
shippingMethodCode: quote.shippingMethod()['method_code'],
49-
shippingCarrierCode: quote.shippingMethod()['carrier_code']
48+
shippingMethodCode: null,
49+
shippingCarrierCode: null
5050
};
5151

52+
if (quote.shippingMethod()) {
53+
data.shippingMethodCode = quote.shippingMethod()['method_code'];
54+
data.shippingCarrierCode = quote.shippingMethod()['carrier_code'];
55+
}
56+
5257
quote.setTotals(result);
5358
cartCache.set('cart-data', data);
5459
}).fail(function (response) {
@@ -72,9 +77,19 @@ define([
7277
* @param {Object} address
7378
*/
7479
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+
7590
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) &&
7893
!cartCache.isChanged('address', address) &&
7994
cartCache.get('totals')
8095
) {

0 commit comments

Comments
 (0)