ACP2E-94: When product is removed in Multiaddress checkout, the address dropdown value changes to default of all product.

Author: rajan-adobe

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';
+    protected 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));