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

Author: aplapana

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

@@ -3,13 +3,11 @@
  * 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\Quote\Model\Quote\Address as QuoteAddress;
 use Magento\Quote\Model\Quote\Address\Total\AbstractTotal;
@@ -27,7 +25,6 @@
 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;
 
@@ -130,11 +127,6 @@ class CommonTaxCollector extends AbstractTotal
      */
     protected $customerAddressRegionFactory;
 
-    /**
-     * @var RegionInterfaceFactory
-     */
-    private RegionInterfaceFactory $regionFactory;
-
     /**
      * @var \Magento\Tax\Api\Data\TaxClassKeyInterfaceFactory
      */
@@ -170,7 +162,6 @@ class CommonTaxCollector extends AbstractTotal
      * @param TaxClassKeyInterfaceFactory $taxClassKeyDataObjectFactory
      * @param CustomerAddressFactory $customerAddressFactory
      * @param CustomerAddressRegionFactory $customerAddressRegionFactory
-     * @param RegionInterfaceFactory $regionInterfaceFactory
      * @param TaxHelper|null $taxHelper
      * @param QuoteDetailsItemExtensionInterfaceFactory|null $quoteDetailsItemExtensionInterfaceFactory
      * @param CustomerAccountManagement|null $customerAccountManagement
@@ -184,7 +175,6 @@ public function __construct(
         \Magento\Tax\Api\Data\TaxClassKeyInterfaceFactory $taxClassKeyDataObjectFactory,
         CustomerAddressFactory $customerAddressFactory,
         CustomerAddressRegionFactory $customerAddressRegionFactory,
-        RegionInterfaceFactory $regionInterfaceFactory,
         TaxHelper $taxHelper = null,
         QuoteDetailsItemExtensionInterfaceFactory $quoteDetailsItemExtensionInterfaceFactory = null,
         ?CustomerAccountManagement $customerAccountManagement = null
@@ -196,7 +186,6 @@ 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);
@@ -223,11 +212,16 @@ public function mapAddress(QuoteAddress $address)
     {
         $customerAddress = $this->customerAddressFactory->create();
         $customerAddress->setCountryId($address->getCountryId());
-        $customerAddress->setRegion(
-            $this->customerAddressRegionFactory->create()->setRegionId($address->getRegionId())
+        $region = $this->customerAddressRegionFactory->create(
+            [
+                'data' =>
+                    [
+                        'region_id' => $address->getRegionId(),
+                        'region_code' => $address->getRegionCode(),
+                        'region' => $address->getRegion()
+                    ]
+            ]
         );
-        $region = $this->regionFactory->create()->setRegionCode($address->getRegionCode());
-        $region->setRegion($address->getRegion());
         $customerAddress->setRegion($region);
         $customerAddress->setPostcode($address->getPostcode());
         $customerAddress->setCity($address->getCity());

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

@@ -6,20 +6,13 @@
 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
@@ -59,16 +52,15 @@ class Tax extends CommonTaxCollector
     /**
      * Class constructor
      *
-     * @param Config $taxConfig
-     * @param TaxCalculationInterface $taxCalculationService
-     * @param QuoteDetailsInterfaceFactory $quoteDetailsDataObjectFactory
-     * @param QuoteDetailsItemInterfaceFactory $quoteDetailsItemDataObjectFactory
-     * @param TaxClassKeyInterfaceFactory $taxClassKeyDataObjectFactory
+     * @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 CustomerAddressFactory $customerAddressFactory
      * @param CustomerAddressRegionFactory $customerAddressRegionFactory
-     * @param CustomerAddressRegionFactory $regionInterfaceFactory
-     * @param Data $taxData
-     * @param Json|null $serializer
+     * @param \Magento\Tax\Helper\Data $taxData
+     * @param Json $serializer
      */
     public function __construct(
         \Magento\Tax\Model\Config $taxConfig,
@@ -78,7 +70,6 @@ public function __construct(
         \Magento\Tax\Api\Data\TaxClassKeyInterfaceFactory $taxClassKeyDataObjectFactory,
         CustomerAddressFactory $customerAddressFactory,
         CustomerAddressRegionFactory $customerAddressRegionFactory,
-        RegionInterfaceFactory $regionInterfaceFactory,
         \Magento\Tax\Helper\Data $taxData,
         Json $serializer = null
     ) {
@@ -92,8 +83,7 @@ public function __construct(
             $quoteDetailsItemDataObjectFactory,
             $taxClassKeyDataObjectFactory,
             $customerAddressFactory,
-            $customerAddressRegionFactory,
-            $regionInterfaceFactory
+            $customerAddressRegionFactory
         );
     }