ACP2E-3472: [CLOUD] Shipping calculation is not considering the shopping cart rule

Author: aplapana

app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php

@@ -1,32 +1,35 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\Tax\Model\Sales\Total\Quote;
 
 use Magento\Customer\Api\AccountManagementInterface as CustomerAccountManagement;
 use Magento\Customer\Api\Data\AddressInterfaceFactory as CustomerAddressFactory;
 use Magento\Customer\Api\Data\AddressInterface as CustomerAddress;
+use Magento\Customer\Api\Data\RegionInterfaceFactory;
 use Magento\Customer\Api\Data\RegionInterfaceFactory as CustomerAddressRegionFactory;
-use Magento\Framework\DataObject;
 use Magento\Quote\Model\Quote\Address as QuoteAddress;
 use Magento\Quote\Model\Quote\Address\Total\AbstractTotal;
 use Magento\Quote\Model\Quote\Item\AbstractItem;
 use Magento\Store\Model\Store;
 use Magento\Tax\Api\Data\QuoteDetailsInterfaceFactory;
 use Magento\Tax\Api\Data\QuoteDetailsItemInterface;
+use Magento\Tax\Api\Data\QuoteDetailsItemInterfaceFactory;
 use Magento\Tax\Api\Data\TaxClassKeyInterfaceFactory;
 use Magento\Tax\Api\Data\TaxClassKeyInterface;
 use Magento\Tax\Api\Data\TaxDetailsInterface;
 use Magento\Tax\Api\Data\TaxDetailsItemInterface;
 use Magento\Tax\Api\Data\QuoteDetailsInterface;
 use Magento\Quote\Api\Data\ShippingAssignmentInterface;
+use Magento\Tax\Api\TaxCalculationInterface;
 use Magento\Tax\Helper\Data as TaxHelper;
 use Magento\Framework\App\ObjectManager;
 use Magento\Tax\Api\Data\QuoteDetailsItemExtensionInterface;
 use Magento\Tax\Api\Data\QuoteDetailsItemExtensionInterfaceFactory;
+use Magento\Tax\Model\Config;
 
 /**
  * Tax totals calculation model
@@ -127,6 +130,11 @@ class CommonTaxCollector extends AbstractTotal
      */
     protected $customerAddressRegionFactory;
 
+    /**
+     * @var RegionInterfaceFactory
+     */
+    private RegionInterfaceFactory $regionFactory;
+
     /**
      * @var \Magento\Tax\Api\Data\TaxClassKeyInterfaceFactory
      */
@@ -155,13 +163,14 @@ class CommonTaxCollector extends AbstractTotal
     /**
      * Class constructor
      *
-     * @param \Magento\Tax\Model\Config $taxConfig
-     * @param \Magento\Tax\Api\TaxCalculationInterface $taxCalculationService
+     * @param Config $taxConfig
+     * @param TaxCalculationInterface $taxCalculationService
      * @param QuoteDetailsInterfaceFactory $quoteDetailsDataObjectFactory
-     * @param \Magento\Tax\Api\Data\QuoteDetailsItemInterfaceFactory $quoteDetailsItemDataObjectFactory
-     * @param \Magento\Tax\Api\Data\TaxClassKeyInterfaceFactory $taxClassKeyDataObjectFactory
+     * @param QuoteDetailsItemInterfaceFactory $quoteDetailsItemDataObjectFactory
+     * @param TaxClassKeyInterfaceFactory $taxClassKeyDataObjectFactory
      * @param CustomerAddressFactory $customerAddressFactory
      * @param CustomerAddressRegionFactory $customerAddressRegionFactory
+     * @param RegionInterfaceFactory $regionInterfaceFactory
      * @param TaxHelper|null $taxHelper
      * @param QuoteDetailsItemExtensionInterfaceFactory|null $quoteDetailsItemExtensionInterfaceFactory
      * @param CustomerAccountManagement|null $customerAccountManagement
@@ -175,6 +184,7 @@ public function __construct(
         \Magento\Tax\Api\Data\TaxClassKeyInterfaceFactory $taxClassKeyDataObjectFactory,
         CustomerAddressFactory $customerAddressFactory,
         CustomerAddressRegionFactory $customerAddressRegionFactory,
+        RegionInterfaceFactory $regionInterfaceFactory,
         TaxHelper $taxHelper = null,
         QuoteDetailsItemExtensionInterfaceFactory $quoteDetailsItemExtensionInterfaceFactory = null,
         ?CustomerAccountManagement $customerAccountManagement = null
@@ -186,6 +196,7 @@ public function __construct(
         $this->quoteDetailsItemDataObjectFactory = $quoteDetailsItemDataObjectFactory;
         $this->customerAddressFactory = $customerAddressFactory;
         $this->customerAddressRegionFactory = $customerAddressRegionFactory;
+        $this->regionFactory = $regionInterfaceFactory;
         $this->taxHelper = $taxHelper ?: ObjectManager::getInstance()->get(TaxHelper::class);
         $this->quoteDetailsItemExtensionFactory = $quoteDetailsItemExtensionInterfaceFactory ?:
             ObjectManager::getInstance()->get(QuoteDetailsItemExtensionInterfaceFactory::class);
@@ -215,6 +226,9 @@ public function mapAddress(QuoteAddress $address)
         $customerAddress->setRegion(
             $this->customerAddressRegionFactory->create()->setRegionId($address->getRegionId())
         );
+        $region = $this->regionFactory->create()->setRegionCode($address->getRegionCode());
+        $region->setRegion($address->getRegion());
+        $customerAddress->setRegion($region);
         $customerAddress->setPostcode($address->getPostcode());
         $customerAddress->setCity($address->getCity());
         $customerAddress->setStreet($address->getStreet());

app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php

@@ -6,13 +6,20 @@
 namespace Magento\Tax\Model\Sales\Total\Quote;
 
 use Magento\Customer\Api\Data\AddressInterfaceFactory as CustomerAddressFactory;
+use Magento\Customer\Api\Data\RegionInterfaceFactory;
 use Magento\Customer\Api\Data\RegionInterfaceFactory as CustomerAddressRegionFactory;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Quote\Api\Data\ShippingAssignmentInterface;
 use Magento\Quote\Model\Quote\Address;
+use Magento\Tax\Api\Data\QuoteDetailsInterfaceFactory;
+use Magento\Tax\Api\Data\QuoteDetailsItemInterfaceFactory;
 use Magento\Tax\Api\Data\TaxClassKeyInterface;
+use Magento\Tax\Api\Data\TaxClassKeyInterfaceFactory;
+use Magento\Tax\Api\TaxCalculationInterface;
+use Magento\Tax\Helper\Data;
 use Magento\Tax\Model\Calculation;
+use Magento\Tax\Model\Config;
 
 /**
  * Tax totals calculation model
@@ -52,15 +59,16 @@ class Tax extends CommonTaxCollector
     /**
      * Class constructor
      *
-     * @param \Magento\Tax\Model\Config $taxConfig
-     * @param \Magento\Tax\Api\TaxCalculationInterface $taxCalculationService
-     * @param \Magento\Tax\Api\Data\QuoteDetailsInterfaceFactory $quoteDetailsDataObjectFactory
-     * @param \Magento\Tax\Api\Data\QuoteDetailsItemInterfaceFactory $quoteDetailsItemDataObjectFactory
-     * @param \Magento\Tax\Api\Data\TaxClassKeyInterfaceFactory $taxClassKeyDataObjectFactory
+     * @param Config $taxConfig
+     * @param TaxCalculationInterface $taxCalculationService
+     * @param QuoteDetailsInterfaceFactory $quoteDetailsDataObjectFactory
+     * @param QuoteDetailsItemInterfaceFactory $quoteDetailsItemDataObjectFactory
+     * @param TaxClassKeyInterfaceFactory $taxClassKeyDataObjectFactory
      * @param CustomerAddressFactory $customerAddressFactory
      * @param CustomerAddressRegionFactory $customerAddressRegionFactory
-     * @param \Magento\Tax\Helper\Data $taxData
-     * @param Json $serializer
+     * @param CustomerAddressRegionFactory $regionInterfaceFactory
+     * @param Data $taxData
+     * @param Json|null $serializer
      */
     public function __construct(
         \Magento\Tax\Model\Config $taxConfig,
@@ -70,6 +78,7 @@ public function __construct(
         \Magento\Tax\Api\Data\TaxClassKeyInterfaceFactory $taxClassKeyDataObjectFactory,
         CustomerAddressFactory $customerAddressFactory,
         CustomerAddressRegionFactory $customerAddressRegionFactory,
+        RegionInterfaceFactory $regionInterfaceFactory,
         \Magento\Tax\Helper\Data $taxData,
         Json $serializer = null
     ) {
@@ -83,7 +92,8 @@ public function __construct(
             $quoteDetailsItemDataObjectFactory,
             $taxClassKeyDataObjectFactory,
             $customerAddressFactory,
-            $customerAddressRegionFactory
+            $customerAddressRegionFactory,
+            $regionInterfaceFactory
         );
     }