AC-2044::Cart Price Rule with shipping method set as condition is not working Magento - Reverted Js Changes apply other fix

Author: mahesh-singh-rajawat

app/code/Magento/Checkout/Model/TotalsInformationManagement.php

@@ -6,32 +6,34 @@
 namespace Magento\Checkout\Model;
 
 use Magento\Checkout\Api\Data\TotalsInformationInterface;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Api\CartTotalRepositoryInterface;
 
 /**
  * Class for management of totals information.
  */
 class TotalsInformationManagement implements \Magento\Checkout\Api\TotalsInformationManagementInterface
 {
     /**
-     * @var \Magento\Quote\Api\CartTotalRepositoryInterface
+     * @var CartTotalRepositoryInterface
      */
     protected $cartTotalRepository;
 
     /**
      * Quote repository.
      *
-     * @var \Magento\Quote\Api\CartRepositoryInterface
+     * @var CartRepositoryInterface
      */
     protected $cartRepository;
 
     /**
-     * @param \Magento\Quote\Api\CartRepositoryInterface $cartRepository
-     * @param \Magento\Quote\Api\CartTotalRepositoryInterface $cartTotalRepository
+     * @param CartRepositoryInterface $cartRepository
+     * @param CartTotalRepositoryInterface $cartTotalRepository
      * @codeCoverageIgnore
      */
     public function __construct(
-        \Magento\Quote\Api\CartRepositoryInterface $cartRepository,
-        \Magento\Quote\Api\CartTotalRepositoryInterface $cartTotalRepository
+        CartRepositoryInterface $cartRepository,
+        CartTotalRepositoryInterface $cartTotalRepository
     ) {
         $this->cartRepository = $cartRepository;
         $this->cartTotalRepository = $cartTotalRepository;
@@ -66,6 +68,8 @@ public function calculate(
                 }
                 $quoteShippingAddress->setCollectShippingRates(true)
                     ->setShippingMethod($shippingMethod);
+
+                $this->cartRepository->save($quote);
             }
         }
         $quote->collectTotals();

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

@@ -11,21 +11,8 @@ define([
     'Magento_Catalog/js/price-utils',
     'Magento_Checkout/js/model/quote',
     'Magento_Checkout/js/action/select-shipping-method',
-    'Magento_Checkout/js/model/shipping-save-processor',
-    'Magento_Checkout/js/model/cart/shipping-save-processor/default',
     'Magento_Checkout/js/checkout-data'
-], function (
-    ko,
-    _,
-    Component,
-    shippingService,
-    priceUtils,
-    quote,
-    selectShippingMethodAction,
-    shippingSaveProcessor,
-    cartShippingProcessor,
-    checkoutData
-) {
+], function (ko, _, Component, shippingService, priceUtils, quote, selectShippingMethodAction, checkoutData) {
     'use strict';
 
     return Component.extend({
@@ -50,12 +37,6 @@ define([
 
             this._super();
 
-            shippingSaveProcessor.registerProcessor('cart', cartShippingProcessor);
-            this.selectedShippingMethod.subscribe(function () {
-                if (quote.shippingMethod()) {
-                    shippingSaveProcessor.saveShippingInformation('cart');
-                }
-            });
             this.shippingRates.subscribe(function (rates) {
                 self.shippingRateGroups([]);
                 _.each(rates, function (rate) {
@@ -96,6 +77,7 @@ define([
         selectShippingMethod: function (methodData) {
             selectShippingMethodAction(methodData);
             checkoutData.setSelectedShippingRate(methodData['carrier_code'] + '_' + methodData['method_code']);
+
             return true;
         }
     });