Merge branch 'ACP2E-94' of https://github.com/magento-l3/magento2ce into PR1-21-01-2022

Author: chittima

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

@@ -112,7 +112,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
     /**
      * Checkout login method key
      */
-    const CHECKOUT_METHOD_LOGIN_IN = 'login_in';
+    public const CHECKOUT_METHOD_LOGIN_IN = 'login_in';
 
     /**
      * @var string
@@ -172,14 +172,14 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
     protected $_preventSaving = false;
 
     /**
-     * Catalog product
+     * Product of the catalog
      *
      * @var \Magento\Catalog\Helper\Product
      */
     protected $_catalogProduct;
 
     /**
-     * Quote validator
+     * To perform validation on the quote
      *
      * @var \Magento\Quote\Model\QuoteValidator
      */
@@ -213,7 +213,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
     protected $_customerFactory;
 
     /**
-     * Group repository
+     * Repository for group to perform CRUD operations
      *
      * @var \Magento\Customer\Api\GroupRepositoryInterface
      */
@@ -260,21 +260,21 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
     protected $_objectCopyService;
 
     /**
-     * Address repository
+     * Repository for customer address to perform crud operations
      *
      * @var \Magento\Customer\Api\AddressRepositoryInterface
      */
     protected $addressRepository;
 
     /**
-     * Search criteria builder
+     * It is used for building search criteria
      *
      * @var \Magento\Framework\Api\SearchCriteriaBuilder
      */
     protected $searchCriteriaBuilder;
 
     /**
-     * Filter builder
+     * This is used for holding  builder object for filter service
      *
      * @var \Magento\Framework\Api\FilterBuilder
      */
@@ -1356,7 +1356,7 @@ public function setBillingAddress(\Magento\Quote\Api\Data\AddressInterface $addr
     {
         $old = $this->getAddressesCollection()->getItemById($address->getId())
             ?? $this->getBillingAddress();
-        if (!empty($old)) {
+        if ($old !== null) {
             $old->addData($address->getData());
         } else {
             $this->addAddress($address->setAddressType(Address::TYPE_BILLING));
@@ -1378,7 +1378,7 @@ public function setShippingAddress(\Magento\Quote\Api\Data\AddressInterface $add
         } else {
             $old = $this->getAddressesCollection()->getItemById($address->getId())
                 ?? $this->getShippingAddress();
-            if (!empty($old)) {
+            if ($old !== null) {
                 $old->addData($address->getData());
             } else {
                 $this->addAddress($address->setAddressType(Address::TYPE_SHIPPING));
@@ -1557,10 +1557,6 @@ public function removeItem($itemId)
 
         if ($item) {
             $item->setQuote($this);
-            /**
-             * If we remove item from quote - we can't use multishipping mode
-             */
-            $this->setIsMultiShipping(false);
             $item->isDeleted(true);
             if ($item->getHasChildren()) {
                 foreach ($item->getChildren() as $child) {

dev/tests/integration/testsuite/Magento/Quote/Model/QuoteTest.php

@@ -8,6 +8,7 @@
 namespace Magento\Quote\Model;
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Checkout\Model\Session as CheckoutSession;
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Customer\Api\Data\CustomerInterfaceFactory;
@@ -761,4 +762,51 @@ public function testValidateMinimumAmountWithPriceInclTaxAndDiscount()
         $this->assertEquals(5, $quote->getShippingAddress()->getBaseGrandTotal());
         $this->assertTrue($quote->validateMinimumAmount());
     }
+
+    /**
+     * @magentoConfigFixture current_store multishipping/options/checkout_multiple 1
+     * @magentoAppIsolation enabled
+     * @magentoDbIsolation enabled
+     * @magentoDataFixture Magento/Multishipping/Fixtures/quote_with_split_items.php
+     * @return void
+     */
+    public function testIsMultiShippingModeEnabledAfterQuoteItemRemoved(): void
+    {
+        $quote = $this->getQuoteByReservedOrderId->execute('multishipping_quote_id');
+        /** @var CheckoutSession $session */
+        $session = $this->objectManager->get(CheckoutSession::class);
+        $session->replaceQuote($quote);
+        $items = $quote->getAllItems();
+        $idToDelete = null;
+        foreach ($items as $item) {
+            if (!$item->getProduct()->isVirtual() && $item->getQty() == 1) {
+                $idToDelete = $item->getId();
+            }
+        }
+
+        if (!is_null($idToDelete)) {
+            $quoteShippingAddresses = $quote->getAllShippingAddresses();
+            foreach ($quoteShippingAddresses as $shippingAddress) {
+                if ($shippingAddress->getItemById($idToDelete)) {
+                    $shippingAddress->removeItem($idToDelete);
+                    $shippingAddress->setCollectShippingRates(true);
+
+                    if (count($shippingAddress->getAllItems()) == 0) {
+                        $shippingAddress->isDeleted(true);
+                    }
+                }
+            }
+            $quote->removeItem($idToDelete);
+            $this->assertEquals(
+                1,
+                $quote->getIsMultiShipping(),
+                "Multi-shipping mode is disabled after quote item removal"
+            );
+        } else {
+            $this->assertTrue(
+                !is_null($idToDelete),
+                "No Simple Product item with qty 1 to delete exists"
+            );
+        }
+    }
 }