Merge remote-tracking branch 'magento-l3/ACP2E-44' into L3_PR_21-12-13

Author: veloraven

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

@@ -5,14 +5,14 @@
  */
 namespace Magento\Checkout\Model;
 
+use Magento\Checkout\Api\Data\TotalsInformationInterface;
+
 /**
  * Class for management of totals information.
  */
 class TotalsInformationManagement implements \Magento\Checkout\Api\TotalsInformationManagementInterface
 {
     /**
-     * Cart total repository.
-     *
      * @var \Magento\Quote\Api\CartTotalRepositoryInterface
      */
     protected $cartTotalRepository;
@@ -42,7 +42,7 @@ public function __construct(
      */
     public function calculate(
         $cartId,
-        \Magento\Checkout\Api\Data\TotalsInformationInterface $addressInformation
+        TotalsInformationInterface $addressInformation
     ) {
         /** @var \Magento\Quote\Model\Quote $quote */
         $quote = $this->cartRepository->get($cartId);
@@ -53,9 +53,19 @@ public function calculate(
         } else {
             $quote->setShippingAddress($addressInformation->getAddress());
             if ($addressInformation->getShippingCarrierCode() && $addressInformation->getShippingMethodCode()) {
-                $quote->getShippingAddress()->setCollectShippingRates(true)->setShippingMethod(
-                    $addressInformation->getShippingCarrierCode().'_'.$addressInformation->getShippingMethodCode()
+                $shippingMethod = implode(
+                    '_',
+                    [$addressInformation->getShippingCarrierCode(), $addressInformation->getShippingMethodCode()]
                 );
+                $quoteShippingAddress = $quote->getShippingAddress();
+                if ($quoteShippingAddress->getShippingMethod() &&
+                    $quoteShippingAddress->getShippingMethod() !== $shippingMethod
+                ) {
+                    $quoteShippingAddress->setShippingAmount(0);
+                    $quoteShippingAddress->setBaseShippingAmount(0);
+                }
+                $quoteShippingAddress->setCollectShippingRates(true)
+                    ->setShippingMethod($shippingMethod);
             }
         }
         $quote->collectTotals();

app/code/Magento/Checkout/Test/Unit/Model/TotalsInformationManagementTest.php

@@ -12,6 +12,7 @@
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Quote\Api\CartTotalRepositoryInterface;
+use Magento\Quote\Model\Quote;
 use Magento\Quote\Model\Quote\Address;
 
 class TotalsInformationManagementTest extends \PHPUnit\Framework\TestCase
@@ -67,7 +68,7 @@ public function testCalculate(?string $carrierCode, ?string $carrierMethod, int
     {
         $cartId = 1;
         $cartMock = $this->createMock(
-            \Magento\Quote\Model\Quote::class
+            Quote::class
         );
         $cartMock->expects($this->once())->method('getItemsCount')->willReturn(1);
         $cartMock->expects($this->once())->method('getIsVirtual')->willReturn(false);
@@ -101,6 +102,72 @@ public function testCalculate(?string $carrierCode, ?string $carrierMethod, int
         $this->totalsInformationManagement->calculate($cartId, $addressInformationMock);
     }
 
+    /**
+     * Test case when shipping amount must be reset to 0 because of changed shipping method.
+     */
+    public function testResetShippingAmount()
+    {
+        $cartId = 1;
+        $carrierCode = 'carrier_code';
+        $carrierMethod = 'carrier_method';
+
+        $cartMock = $this->createMock(Quote::class);
+        $cartMock->method('getItemsCount')
+            ->willReturn(1);
+        $cartMock->method('getIsVirtual')
+            ->willReturn(false);
+        $this->cartRepositoryMock->method('get')->with($cartId)->willReturn($cartMock);
+        $this->cartTotalRepositoryMock->method('get')->with($cartId);
+
+        $addressInformationMock = $this->createMock(TotalsInformationInterface::class);
+        $addressMock = $this->getMockBuilder(Address::class)
+            ->addMethods(
+                [
+                    'setShippingMethod',
+                    'setCollectShippingRates'
+                ]
+            )->onlyMethods(
+                [
+                    'getShippingMethod',
+                    'setShippingAmount',
+                    'setBaseShippingAmount',
+                ]
+            )
+            ->disableOriginalConstructor()
+            ->getMock();
+        $addressMock->method('getShippingMethod')
+            ->willReturn('flatrate_flatrate');
+        $addressInformationMock->method('getAddress')
+            ->willReturn($addressMock);
+        $addressInformationMock->method('getShippingCarrierCode')
+            ->willReturn($carrierCode);
+        $addressInformationMock->method('getShippingMethodCode')
+            ->willReturn($carrierMethod);
+        $cartMock->method('setShippingAddress')
+            ->with($addressMock);
+        $cartMock->method('getShippingAddress')
+            ->willReturn($addressMock);
+        $addressMock->expects($this->once())
+            ->method('setCollectShippingRates')
+            ->with(true)
+            ->willReturn($addressMock);
+        $addressMock->expects($this->once())
+            ->method('setShippingAmount')
+            ->with(0)
+            ->willReturn($addressMock);
+        $addressMock->expects($this->once())
+            ->method('setBaseShippingAmount')
+            ->with(0)
+            ->willReturn($addressMock);
+        $addressMock->expects($this->once())
+            ->method('setShippingMethod')
+            ->with($carrierCode . '_' . $carrierMethod);
+        $cartMock->expects($this->once())
+            ->method('collectTotals');
+
+        $this->totalsInformationManagement->calculate($cartId, $addressInformationMock);
+    }
+
     /**
      * Data provider for testCalculate.
      *

app/code/Magento/SalesRule/Helper/CartFixedDiscount.php

@@ -51,6 +51,8 @@ public function calculateShippingAmountWhenAppliedToShipping(
     ): float {
         $shippingAmount = (float) $address->getShippingAmount();
         if ($shippingAmount == 0.0) {
+            $addressQty = $this->getAddressQty($address);
+            $address->setItemQty($addressQty);
             $address->setCollectShippingRates(true);
             $address->collectShippingRates();
             $shippingRates = $address->getAllShippingRates();
@@ -241,4 +243,35 @@ public function getAvailableDiscountAmount(
         }
         return $availableDiscountAmount;
     }
+
+    /**
+     * Get address quantity.
+     *
+     * @param AddressInterface $address
+     * @return float
+     */
+    private function getAddressQty(AddressInterface $address): float
+    {
+        $addressQty = 0;
+        $items = array_filter(
+            $address->getAllItems(),
+            function ($item) {
+                return !$item->getProduct()->isVirtual() && !$item->getParentItem();
+            }
+        );
+        foreach ($items as $item) {
+            if ($item->getHasChildren() && $item->isShipSeparately()) {
+                foreach ($item->getChildren() as $child) {
+                    if ($child->getProduct()->isVirtual()) {
+                        continue;
+                    }
+                    $addressQty += $child->getTotalQty();
+                }
+            } else {
+                $addressQty += (float)$item->getQty();
+            }
+        }
+
+        return (float)$addressQty;
+    }
 }