ACP2E-693: Addresses disappear from multi-shipping checkout after removing several items.

Author: pradeep1819

app/code/Magento/Multishipping/Test/Mftf/Test/StoreFrontRemoveItemFromMultishipmentCartTest.xml

@@ -68,12 +68,18 @@
         </actionGroup>
         <!-- Save updated addresses -->
         <actionGroup ref="StorefrontMultiShippingSaveAddressActionGroup" stepKey="saveThreeDifferentAddresses"/>
+        <!-- Verify there are 3 items available on cart page -->
+        <seeNumberOfElements userInput="3" selector="a.action.delete" stepKey="seeThreeItems"/>
         <!-- Remove first simple item from cart -->
         <actionGroup ref="StorefrontRemoveProductOnCheckoutActionGroup" stepKey="removeFirstItemFromCart"/>
         <waitForPageLoad time="30"  stepKey="waitForCartSummaryPageToLoadAfterRemovalOfFirstItem"/>
+        <!-- Verify there are 2 items still available after removal of first -->
+        <seeNumberOfElements userInput="2" selector="a.action.delete" stepKey="seeTwoItems"/>
         <!-- Remove second simple item from cart -->
         <actionGroup ref="StorefrontRemoveProductOnCheckoutActionGroup" stepKey="removeSecondItemFromCart"/>
         <waitForPageLoad time="30"  stepKey="waitForCartSummaryPageToLoadAfterRemovalOfSecondItem"/>
+        <!-- Verify there are 1 items still available after removal of second -->
+        <seeNumberOfElements userInput="1" selector="a.action.delete" stepKey="seeOneItems"/>
         <!-- Remove second simple item from cart -->
         <actionGroup ref="StorefrontRemoveProductOnCheckoutActionGroup" stepKey="removeThirdItemFromCart"/>
         <waitForPageLoad time="30"  stepKey="waitForCartSummaryPageToLoadAfterRemovalOfTestItem"/>

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

@@ -2544,12 +2544,13 @@ public function getShippingAddressesItems()
                 if ($item->getQty() > 1) {
                     //DB table `quote_item` qty value can not be set to 1, if having more than 1 child references
                     //in table `quote_address_item`.
-                    if (count($this->getQuoteShippingAddressItemsByQuoteItemId($item->getItemId())) > 1) {
+                    if ($item->getItemId() !== null
+                        && count($this->getQuoteShippingAddressItemsByQuoteItemId($item->getItemId())) > 1) {
                         continue;
                     }
 
                     for ($itemIndex = 0, $itemQty = $item->getQty(); $itemIndex < $itemQty; $itemIndex++) {
-                        if ($itemIndex == 0) {
+                        if ($itemIndex === 0) {
                             $addressItem = $item;
                         } else {
                             $addressItem = clone $item;
@@ -2679,10 +2680,7 @@ private function getQuoteShippingAddressItemsByQuoteItemId($itemId = null): arra
             $addresses = $this->getAllShippingAddresses();
             foreach ($addresses as $address) {
                 foreach ($address->getAllItems() as $item) {
-                    if ($item->getParentItemId()) {
-                        continue;
-                    }
-                    if ($item->getProduct()->getIsVirtual()) {
+                    if ($item->getParentItemId() || $item->getProduct()->getIsVirtual()) {
                         continue;
                     }
                     if ($item->getQuoteItemId() === $itemId) {