Merge pull request #7686 from magento-cia/cia-2.4.5-bugfixes-05262022

Bugfixes

Author: dvoskoboinikov

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

@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Quote\Model;
 
 use Magento\Customer\Api\AddressRepositoryInterface;
@@ -25,6 +27,7 @@
 use Magento\Quote\Model\Quote\Address\Rate;
 use Magento\Quote\Model\Quote\TotalsCollector;
 use Magento\Quote\Model\ResourceModel\Quote\Address as QuoteAddressResource;
+use Magento\Customer\Model\Data\Address as CustomerAddress;
 
 /**
  * Shipping method read service
@@ -38,7 +41,7 @@ class ShippingMethodManagement implements
     ShipmentEstimationInterface
 {
     /**
-     * Quote repository.
+     * Quote repository model
      *
      * @var CartRepositoryInterface
      */
@@ -226,7 +229,7 @@ public function apply($cartId, $carrierCode, $methodCode)
         }
         $shippingMethod = $carrierCode . '_' . $methodCode;
         $shippingAddress->setShippingMethod($shippingMethod);
-        $shippingAssignments = $quote->getExtensionAttributes()->getShippingAssignments();
+        $shippingAssignments = (array)$quote->getExtensionAttributes()->getShippingAssignments();
         if (!empty($shippingAssignments)) {
             $shippingAssignment = $shippingAssignments[0];
             $shipping = $shippingAssignment->getShipping();
@@ -268,6 +271,8 @@ public function estimateByExtendedAddress($cartId, AddressInterface $address)
 
     /**
      * @inheritDoc
+     * @throws InputException
+     * @throws NoSuchEntityException
      */
     public function estimateByAddressId($cartId, $addressId)
     {
@@ -278,7 +283,7 @@ public function estimateByAddressId($cartId, $addressId)
         if ($quote->isVirtual() || 0 == $quote->getItemsCount()) {
             return [];
         }
-        $address = $this->addressRepository->getById($addressId);
+        $address = $this->getAddress($addressId, $quote);
 
         return $this->getShippingMethods($quote, $address);
     }
@@ -384,4 +389,24 @@ private function getDataObjectProcessor()
         }
         return $this->dataProcessor;
     }
+
+    /**
+     * Gets the address if exists for customer
+     *
+     * @param int $addressId
+     * @param Quote $quote
+     * @return CustomerAddress
+     * @throws InputException The shipping address is incorrect.
+     */
+    private function getAddress(int $addressId, Quote $quote): CustomerAddress
+    {
+        $addresses = $quote->getCustomer()->getAddresses();
+        foreach ($addresses as $address) {
+            if ($addressId === (int)$address->getId()) {
+                return $address;
+            }
+        }
+
+        throw new InputException(__('The shipping address is missing. Set the address and try again.'));
+    }
 }