Merge remote-tracking branch 'origin/MC-34734' into 2.4-develop-pr29

Author: serhii-balko

app/code/Magento/Quote/Model/Quote/Address.php

@@ -1019,6 +1019,13 @@ public function collectShippingRates()
      */
     public function requestShippingRates(AbstractItem $item = null)
     {
+        $storeId = $this->getQuote()->getStoreId() ?: $this->storeManager->getStore()->getId();
+        $taxInclude = $this->_scopeConfig->getValue(
+            'tax/calculation/price_includes_tax',
+            ScopeInterface::SCOPE_STORE,
+            $storeId
+        );
+
         /** @var $request RateRequest */
         $request = $this->_rateRequestFactory->create();
         $request->setAllItems($item ? [$item] : $this->getAllItems());
@@ -1028,31 +1035,30 @@ public function requestShippingRates(AbstractItem $item = null)
         $request->setDestStreet($this->getStreetFull());
         $request->setDestCity($this->getCity());
         $request->setDestPostcode($this->getPostcode());
-        $request->setPackageValue($item ? $item->getBaseRowTotal() : $this->getBaseSubtotal());
+        $baseSubtotal = $taxInclude ? $this->getBaseSubtotalTotalInclTax() : $this->getBaseSubtotal();
+        $request->setPackageValue($item ? $item->getBaseRowTotal() : $baseSubtotal);
+        $baseSubtotalWithDiscount = $baseSubtotal + $this->getBaseDiscountAmount();
         $packageWithDiscount = $item ? $item->getBaseRowTotal() -
-            $item->getBaseDiscountAmount() : $this->getBaseSubtotalWithDiscount();
+            $item->getBaseDiscountAmount() : $baseSubtotalWithDiscount;
         $request->setPackageValueWithDiscount($packageWithDiscount);
         $request->setPackageWeight($item ? $item->getRowWeight() : $this->getWeight());
         $request->setPackageQty($item ? $item->getQty() : $this->getItemQty());
 
         /**
          * Need for shipping methods that use insurance based on price of physical products
          */
-        $packagePhysicalValue = $item ? $item->getBaseRowTotal() : $this->getBaseSubtotal() -
-            $this->getBaseVirtualAmount();
+        $packagePhysicalValue = $item ? $item->getBaseRowTotal() : $baseSubtotal - $this->getBaseVirtualAmount();
         $request->setPackagePhysicalValue($packagePhysicalValue);
 
         $request->setFreeMethodWeight($item ? 0 : $this->getFreeMethodWeight());
 
         /**
          * Store and website identifiers specified from StoreManager
          */
+        $request->setStoreId($storeId);
         if ($this->getQuote()->getStoreId()) {
-            $storeId = $this->getQuote()->getStoreId();
-            $request->setStoreId($storeId);
             $request->setWebsiteId($this->storeManager->getStore($storeId)->getWebsiteId());
         } else {
-            $request->setStoreId($this->storeManager->getStore()->getId());
             $request->setWebsiteId($this->storeManager->getWebsite()->getId());
         }
         $request->setFreeShipping($this->getFreeShipping());

app/code/Magento/Quote/Test/Unit/Model/Quote/AddressTest.php

@@ -352,10 +352,40 @@ public function testRequestShippingRates()
 
         $currentCurrencyCode = 'UAH';
 
+        $this->quote->expects($this->any())
+            ->method('getStoreId')
+            ->willReturn($storeId);
+
+        $this->storeManager->expects($this->at(0))
+            ->method('getStore')
+            ->with($storeId)
+            ->willReturn($this->store);
+        $this->store->expects($this->any())
+            ->method('getWebsiteId')
+            ->willReturn($webSiteId);
+
+        $this->scopeConfig->expects($this->exactly(1))
+            ->method('getValue')
+            ->with(
+                'tax/calculation/price_includes_tax',
+                ScopeInterface::SCOPE_STORE,
+                $storeId
+            )
+            ->willReturn(1);
+
         /** @var RateRequest */
         $request = $this->getMockBuilder(RateRequest::class)
             ->disableOriginalConstructor()
-            ->setMethods(['setStoreId', 'setWebsiteId', 'setBaseCurrency', 'setPackageCurrency'])
+            ->setMethods(
+                [
+                    'setStoreId',
+                    'setWebsiteId',
+                    'setBaseCurrency',
+                    'setPackageCurrency',
+                    'getBaseSubtotalTotalInclTax',
+                    'getBaseSubtotal'
+                ]
+            )
             ->getMock();
 
         /** @var Collection */
@@ -434,13 +464,6 @@ public function testRequestShippingRates()
         $this->storeManager->method('getStore')
             ->willReturn($this->store);
 
-        $this->storeManager->expects($this->once())
-            ->method('getWebsite')
-            ->willReturn($this->website);
-
-        $this->store->method('getId')
-            ->willReturn($storeId);
-
         $this->store->method('getBaseCurrency')
             ->willReturn($baseCurrency);
 
@@ -452,10 +475,6 @@ public function testRequestShippingRates()
             ->method('getCurrentCurrencyCode')
             ->willReturn($currentCurrencyCode);
 
-        $this->website->expects($this->once())
-            ->method('getId')
-            ->willReturn($webSiteId);
-
         $this->addressRateFactory->expects($this->once())
             ->method('create')
             ->willReturn($rate);