Merge branch 'ACP2E-1143' of https://github.com/magento-l3/magento2ce into PR-02142023

Author: chittima

app/code/Magento/Checkout/view/frontend/web/js/model/cart/estimate-service.js

@@ -4,18 +4,28 @@
  */
 
 define([
+    'underscore',
     'Magento_Checkout/js/model/quote',
     'Magento_Checkout/js/model/shipping-rate-processor/new-address',
     'Magento_Checkout/js/model/cart/totals-processor/default',
     'Magento_Checkout/js/model/shipping-service',
     'Magento_Checkout/js/model/cart/cache',
     'Magento_Customer/js/customer-data'
-], function (quote, defaultProcessor, totalsDefaultProvider, shippingService, cartCache, customerData) {
+], function (_, quote, defaultProcessor, totalsDefaultProvider, shippingService, cartCache, customerData) {
     'use strict';
 
     var rateProcessors = {},
         totalsProcessors = {},
 
+        /**
+         * Cache shipping address until changed
+         */
+        setShippingAddress = function () {
+            var shippingAddress = _.pick(quote.shippingAddress(), cartCache.requiredFields);
+
+            cartCache.set('shipping-address', shippingAddress);
+        },
+
         /**
          * Estimate totals for shipping address and update shipping rates.
          */
@@ -35,10 +45,10 @@ define([
                 // check if user data not changed -> load rates from cache
                 if (!cartCache.isChanged('address', quote.shippingAddress()) &&
                     !cartCache.isChanged('cartVersion', customerData.get('cart')()['data_id']) &&
-                    cartCache.get('rates')
+                    cartCache.get('rates') && !cartCache.isChanged('totals', quote.getTotals())
                 ) {
                     shippingService.setShippingRates(cartCache.get('rates'));
-
+                    quote.setTotals(cartCache.get('totals'));
                     return;
                 }
 
@@ -51,7 +61,16 @@ define([
                 // save rates to cache after load
                 shippingService.getShippingRates().subscribe(function (rates) {
                     cartCache.set('rates', rates);
+                    setShippingAddress();
                 });
+
+                // update totals based on updated shipping address / rates changes
+                if (cartCache.get('shipping-address') && cartCache.get('shipping-address').countryId &&
+                    cartCache.isChanged('shipping-address',  quote.shippingAddress()) &&
+                    (!quote.shippingMethod() || !quote.shippingMethod()['method_code'])) {
+                    totalsDefaultProvider.estimateTotals(quote.shippingAddress());
+                    cartCache.set('totals', quote.getTotals());
+                }
             }
         },
 

app/code/Magento/Multishipping/Test/Mftf/Test/StorefrontDisableMultishippingModeCheckoutOnBackToCartTest.xml

@@ -56,6 +56,9 @@
         </actionGroup>
 
         <actionGroup ref="ClickViewAndEditCartFromMiniCartActionGroup" stepKey="goToShoppingCartFromMinicart"/>
+        <waitForElement time="30" selector="{{CheckoutCartSummarySection.estimateShippingAndTaxForm}}" stepKey="waitForEstimateShippingAndTaxForm"/>
+        <waitForElement time="30" selector="{{CheckoutCartSummarySection.shippingMethodForm}}" stepKey="waitForShippingMethodForm"/>
+        <waitForElementVisible time="30" selector="{{CheckoutCartSummarySection.total}}" stepKey="waitForTotalElement"/>
         <waitForPageLoad stepKey="waitForGrandTotalToLoad"/>
         <grabTextFrom selector="{{CheckoutPaymentSection.orderSummaryTotal}}" stepKey="grabTotal"/>
 

app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCategoryRulesShouldApplyToGroupedProductWithInvisibleIndividualProductTest.xml

@@ -106,6 +106,10 @@
             <argument name="linkedProduct2Name" value="$createSecondSimpleProduct.name$"/>
         </actionGroup>
         <actionGroup ref="ClickViewAndEditCartFromMiniCartActionGroup" stepKey="openTheCartWithFirstAndSecondGroupedProducts"/>
+        <waitForPageLoad stepKey="waitForGrandTotalToLoad"/>
+        <waitForElement time="30" selector="{{CheckoutCartSummarySection.estimateShippingAndTaxForm}}" stepKey="waitForEstimateShippingAndTaxForm"/>
+        <waitForElement time="30" selector="{{CheckoutCartSummarySection.shippingMethodForm}}" stepKey="waitForShippingMethodForm"/>
+        <waitForElementVisible time="30" selector="{{CheckoutCartSummarySection.total}}" stepKey="waitForTotalElement"/>
         <!-- Discount amount is applied for product from first category only -->
         <actionGroup ref="StorefrontCheckCartTotalWithDiscountCategoryActionGroup" stepKey="checkDiscountIsApplied">
             <argument name="subtotal" value="$1,000.00"/>

app/code/Magento/Tax/view/frontend/web/js/view/checkout/cart/totals/tax.js

@@ -21,7 +21,7 @@ define([
          * @override
          */
         ifShowValue: function () {
-            if (parseInt(this.getPureValue()) === 0) { //eslint-disable-line radix
+            if (this.isFullMode() && this.getPureValue() == 0) { //eslint-disable-line eqeqeq
                 return isZeroTaxDisplayed;
             }
 

dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/model/cart/estimate-service.test.js

@@ -20,13 +20,18 @@ define([
 
     var injector = new Squire(),
         rates = 'flatrate',
+        totals = {
+            tax: 0.1,
+            totals: 10
+        },
         mocks = {
             'Magento_Checkout/js/model/quote': {
                 shippingAddress: ko.observable(),
                 isVirtual: function () {},
                 billingAddress: ko.observable(),
-                shippingMethod: ko.observable()
-
+                shippingMethod: ko.observable(),
+                setTotals: function () {},
+                getTotals: function () {}
             },
             'Magento_Checkout/js/model/shipping-rate-processor/new-address': {
                 getRates: jasmine.createSpy()
@@ -42,7 +47,7 @@ define([
             },
             'Magento_Checkout/js/model/cart/cache': {
                 isChanged: function () {},
-                get: jasmine.createSpy().and.returnValue(rates),
+                get: jasmine.createSpy().and.returnValues(rates, rates, totals),
                 set: jasmine.createSpy()
             },
             'Magento_Customer/js/customer-data': {
@@ -88,19 +93,22 @@ define([
 
         it('test subscribe when shipping address wasn\'t changed for not virtual quote', function () {
             spyOn(mocks['Magento_Checkout/js/model/quote'], 'isVirtual').and.returnValue(false);
-            spyOn(mocks['Magento_Checkout/js/model/cart/cache'], 'isChanged').and.returnValue(false);
+            spyOn(mocks['Magento_Checkout/js/model/quote'], 'getTotals').and.returnValue(false);
+            spyOn(mocks['Magento_Checkout/js/model/cart/cache'], 'isChanged').and.returnValues(false, false);
             spyOn(mocks['Magento_Checkout/js/model/shipping-service'], 'setShippingRates');
+            spyOn(mocks['Magento_Checkout/js/model/quote'], 'setTotals');
             mocks['Magento_Checkout/js/model/quote'].shippingAddress({
                 id: 2,
                 getType: function () {
                     return 'address_type_test';
                 }
             });
             expect(mocks['Magento_Checkout/js/model/shipping-service'].setShippingRates).toHaveBeenCalledWith(rates);
-            expect(mocks['Magento_Checkout/js/model/cart/totals-processor/default'].estimateTotals).not
-                .toHaveBeenCalled();
-            expect(mocks['Magento_Checkout/js/model/shipping-rate-processor/new-address'].getRates)
+            expect(mocks['Magento_Checkout/js/model/quote'].setTotals).toHaveBeenCalledWith(totals);
+            expect(mocks['Magento_Checkout/js/model/cart/totals-processor/default'].estimateTotals)
                 .not.toHaveBeenCalled();
+            expect(mocks['Magento_Checkout/js/model/shipping-rate-processor/new-address'].getRates)
+                .toHaveBeenCalled();
         });
 
         it('test subscribe when shipping address was changed for virtual quote', function () {
@@ -114,7 +122,7 @@ define([
             expect(mocks['Magento_Checkout/js/model/cart/totals-processor/default'].estimateTotals)
                 .toHaveBeenCalled();
             expect(mocks['Magento_Checkout/js/model/shipping-rate-processor/new-address'].getRates)
-                .not.toHaveBeenCalled();
+                .toHaveBeenCalled();
         });
 
         it('test subscribe when shipping address was changed for not virtual quote', function () {
@@ -133,6 +141,8 @@ define([
                 .not.toHaveBeenCalledWith(rates);
             expect(mocks['Magento_Checkout/js/model/cart/cache'].set).not.toHaveBeenCalled();
             expect(mocks['Magento_Checkout/js/model/shipping-rate-processor/new-address'].getRates).toHaveBeenCalled();
+            expect(mocks['Magento_Checkout/js/model/cart/totals-processor/default'].estimateTotals)
+                .toHaveBeenCalled();
         });
 
         it('test subscribe when shipping method was changed', function () {