Magento\Quote\Model\Quote::assignCustomerWithAddressChange() incorrectly rewrites an already chosen shipping address with the default one

dmitrii_fediuk · December 14, 2017, 4:24am

magento/magento2/blob/2.2.2/app/code/Magento/Quote/Model/Quote.php#L916-L966


/**
 * Assign customer model to quote with billing and shipping address change
 *
 * @param \Magento\Customer\Api\Data\CustomerInterface $customer
 * @param Address $billingAddress Quote billing address
 * @param Address $shippingAddress Quote shipping address
 * @return $this
 */
public function assignCustomerWithAddressChange(
    \Magento\Customer\Api\Data\CustomerInterface $customer,
    Address $billingAddress = null,
    Address $shippingAddress = null
) {
    if ($customer->getId()) {
        $this->setCustomer($customer);


        if (null !== $billingAddress) {
            $this->setBillingAddress($billingAddress);
        } else {
            try {
                $defaultBillingAddress = $this->addressRepository->getById($customer->getDefaultBilling());
            } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
                //
            }
            if (isset($defaultBillingAddress)) {
                /** @var \Magento\Quote\Model\Quote\Address $billingAddress */
                $billingAddress = $this->_quoteAddressFactory->create();
                $billingAddress->importCustomerAddressData($defaultBillingAddress);
                $this->setBillingAddress($billingAddress);
            }
        }


        if (null === $shippingAddress) {
            try {
                $defaultShippingAddress = $this->addressRepository->getById($customer->getDefaultShipping());
            } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
                //
            }
            if (isset($defaultShippingAddress)) {
                /** @var \Magento\Quote\Model\Quote\Address $shippingAddress */
                $shippingAddress = $this->_quoteAddressFactory->create();
                $shippingAddress->importCustomerAddressData($defaultShippingAddress);
            } else {
                $shippingAddress = $this->_quoteAddressFactory->create();
            }
        }
        $this->setShippingAddress($shippingAddress);
    }


    return $this;
}

Magento 2.0.0 (as all other currently released Magento 2 versions) has the same bug: 2.0.0/app/code/Magento/Quote/Model/Quote.php#L896-L946

dmitrii_fediuk · December 14, 2017, 4:27am

I have implemented a workaround in the 3.5.1 version of the mage2pro/core package: