ACP2E-279: Customer details are lost after editing an order.

Author: glo23503

app/code/Magento/Sales/Controller/Adminhtml/Order/AddressSave.php

@@ -41,7 +41,7 @@ class AddressSave extends Order implements HttpPostActionInterface
      *
      * @see _isAllowed()
      */
-    public const ADMIN_RESOURCE = 'Magento_Sales::actions_edit';
+    const ADMIN_RESOURCE = 'Magento_Sales::actions_edit';
 
     /**
      * @var RegionFactory
@@ -72,7 +72,6 @@ class AddressSave extends Order implements HttpPostActionInterface
      * @param LoggerInterface $logger
      * @param RegionFactory|null $regionFactory
      * @param OrderAddressRepositoryInterface|null $orderAddressRepository
-     * @param AttributeMetadataDataProvider|null $attributeMetadataDataProvider
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -138,26 +137,6 @@ public function execute()
                         'order_id' => $address->getParentId()
                     ]
                 );
-                if ($address->getAddressType() === AddressModel::TYPE_BILLING) {
-                    $order = $address->getOrder();
-                    $quote = $this->_objectManager->create(
-                        \Magento\Quote\Model\Quote::class
-                    )->load(
-                        $order->getQuoteId()
-                    );
-                    $quote->setCustomerSuffix($address->getSuffix())
-                        ->setCustomerFirstname($address->getFirstname())
-                        ->setCustomerLastname($address->getLastname())
-                        ->setCustomerMiddlename($address->getMiddlename())
-                        ->setCustomerPrefix($address->getPrefix())
-                        ->save();
-                    $order->setCustomerSuffix($address->getSuffix())
-                        ->setCustomerFirstname($address->getFirstname())
-                        ->setCustomerLastname($address->getLastname())
-                        ->setCustomerMiddlename($address->getMiddlename())
-                        ->setCustomerPrefix($address->getPrefix())
-                        ->save();
-                }
                 $this->messageManager->addSuccessMessage(__('You updated the order address.'));
                 return $resultRedirect->setPath('sales/*/view', ['order_id' => $address->getParentId()]);
             } catch (LocalizedException $e) {

app/code/Magento/Sales/Model/AdminOrder/Create.php

@@ -1842,18 +1842,20 @@ public function _prepareCustomer()
                 ->setStoreId($store->getId())
                 ->setWebsiteId($store->getWebsiteId())
                 ->setCreatedAt(null);
+            $customer = $this->_validateCustomerData($customer);
+        } elseif (!$customer->getId()) {
+            /** Create new customer */
+            $customerBillingAddressDataObject = $this->getBillingAddress()->exportCustomerAddress();
+            $customer->setSuffix($customerBillingAddressDataObject->getSuffix())
+                ->setFirstname($customerBillingAddressDataObject->getFirstname())
+                ->setLastname($customerBillingAddressDataObject->getLastname())
+                ->setMiddlename($customerBillingAddressDataObject->getMiddlename())
+                ->setPrefix($customerBillingAddressDataObject->getPrefix())
+                ->setStoreId($store->getId())
+                ->setWebsiteId($store->getWebsiteId())
+                ->setEmail($this->_getNewCustomerEmail());
+            $customer = $this->_validateCustomerData($customer);
         }
-
-        $customerBillingAddressDataObject = $this->getBillingAddress()->exportCustomerAddress();
-        $customer->setSuffix($customerBillingAddressDataObject->getSuffix())
-            ->setFirstname($customerBillingAddressDataObject->getFirstname())
-            ->setLastname($customerBillingAddressDataObject->getLastname())
-            ->setMiddlename($customerBillingAddressDataObject->getMiddlename())
-            ->setPrefix($customerBillingAddressDataObject->getPrefix())
-            ->setStoreId($store->getId())
-            ->setWebsiteId($store->getWebsiteId())
-            ->setEmail($this->_getNewCustomerEmail());
-        $customer = $this->_validateCustomerData($customer);
         $this->getQuote()->setCustomer($customer);
 
         if ($this->getBillingAddress()->getSaveInAddressBook()) {

dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/AddressSaveTest.php

@@ -10,11 +10,8 @@
 use Magento\Framework\App\Request\Http as HttpRequest;
 use Magento\Sales\Api\Data\OrderAddressInterface;
 use Magento\Sales\Api\Data\OrderInterface;
-use Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\Sales\Api\Data\OrderInterfaceFactory;
 use Magento\Sales\Api\OrderAddressRepositoryInterface;
-use Magento\Sales\Model\Order as Order;
-use Magento\Quote\Model\Quote as Quote;
 use Magento\Sales\Model\Order\Address as AddressType;
 use Magento\TestFramework\TestCase\AbstractBackendController;
 
@@ -49,7 +46,6 @@ protected function setUp(): void
      * @dataProvider addressTypeProvider
      *
      * @magentoDataFixture Magento/Sales/_files/order.php
-     * @magentoDataFixture Magento/Sales/_files/quote.php
      *
      * @param string $type
      * @return void
@@ -66,14 +62,7 @@ public function testSave(string $type): void
             OrderAddressInterface::POSTCODE => '97203',
             OrderAddressInterface::TELEPHONE => '5555555555',
         ];
-        $quote = $this->_objectManager->create(Quote::class);
-        $quote->load('test01', 'reserved_order_id');
-
         $order = $this->orderFactory->create()->loadByIncrementId(100000001);
-        $order->setQuoteId($quote->getId());
-        $orderRepository = $this->_objectManager->create(OrderRepositoryInterface::class);
-        $orderRepository->save($order);
-
         $addressId = $this->getAddressIdByType($order, $type);
         $this->dispatchWithParams(
             ['address_id' => $addressId],
@@ -146,14 +135,6 @@ private function assertAddressData(int $addressId, array $expectedData): void
                 ? $this->assertEquals(reset($value), $address->getData($key))
                 : $this->assertEquals($value, $address->getData($key));
         }
-        if ($address->getAddressType() === 'billing') {
-            $order = $this->_objectManager->create(Order::class)->load($address->getParentId());
-            $quote = $this->_objectManager->create(Quote::class)->load($order->getQuoteId());
-            $this->assertEquals('New test name', $quote->getCustomerFirstname());
-            $this->assertEquals('New test lastname', $quote->getCustomerLastname());
-            $this->assertEquals($quote->getCustomerFirstname(), $order->getCustomerFirstname());
-            $this->assertEquals($quote->getCustomerLastname(), $order->getCustomerLastname());
-        }
     }
 
     /**