MAGETWO-99451: Custom customer address attribute values are empty when address is changed in admin checkout

Author: Oleksandr Iegorov

app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml

@@ -6,16 +6,6 @@
 
 // @codingStandardsIgnoreFile
 
-/**
- * @var \Magento\Customer\Model\ResourceModel\Address\Collection $addressCollection
- */
-$addressCollection = $block->getData('customerAddressCollection');
-
-$addressArray = [];
-if ($block->getCustomerId()) {
-    $addressArray = $addressCollection->setCustomerFilter([$block->getCustomerId()])->toArray();
-}
-
 /**
  * @var \Magento\Sales\ViewModel\Customer\AddressFormatter $customerAddressFormatter
  */
@@ -32,7 +22,7 @@ if ($block->getIsShipping()):
     require(["Magento_Sales/order/create/form"], function(){
 
         order.shippingAddressContainer = '<?= /* @escapeNotVerified */ $_fieldsContainerId ?>';
-        order.setAddresses(<?= /* @escapeNotVerified */ $customerAddressFormatter->getAddressesJson($addressArray) ?>);
+        order.setAddresses(<?= /* @escapeVerfied  */ $block->getAddressCollectionJson() ?>);
 
     });
     </script>

lib/internal/Magento/Framework/Api/ExtensibleDataObjectConverter.php

@@ -45,6 +45,28 @@ public function toNestedArray(
         }
         $dataObjectArray = $this->dataObjectProcessor->buildOutputDataArray($dataObject, $dataObjectType);
         //process custom attributes if present
+        $dataObjectArray = $this->processCustomAttributes($dataObjectArray, $skipAttributes);
+
+        if (!empty($dataObjectArray[ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY])) {
+            /** @var array $extensionAttributes */
+            $extensionAttributes = $dataObjectArray[ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY];
+            unset($dataObjectArray[ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY]);
+            foreach ($extensionAttributes as $attributeKey => $attributeValue) {
+                if (!in_array($attributeKey, $skipAttributes)) {
+                    $dataObjectArray[$attributeKey] = $attributeValue;
+                }
+            }
+        }
+        return $dataObjectArray;
+    }
+
+    /**
+     * @param array $dataObjectArray
+     * @param array $skipAttributes
+     * @return array
+     */
+    private function processCustomAttributes(array $dataObjectArray, array $skipAttributes): array
+    {
         if (!empty($dataObjectArray[AbstractExtensibleObject::CUSTOM_ATTRIBUTES_KEY])) {
             /** @var AttributeValue[] $customAttributes */
             $customAttributes = $dataObjectArray[AbstractExtensibleObject::CUSTOM_ATTRIBUTES_KEY];
@@ -56,14 +78,9 @@ public function toNestedArray(
                 }
             }
         }
-        if (!empty($dataObjectArray[ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY])) {
-            /** @var array $extensionAttributes */
-            $extensionAttributes = $dataObjectArray[ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY];
-            unset($dataObjectArray[ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY]);
-            foreach ($extensionAttributes as $attributeKey => $attributeValue) {
-                if (!in_array($attributeKey, $skipAttributes)) {
-                    $dataObjectArray[$attributeKey] = $attributeValue;
-                }
+        foreach ($dataObjectArray as $key => $value) {
+            if (is_array($value)) {
+                $dataObjectArray[$key] = $this->processCustomAttributes($value, $skipAttributes);
             }
         }
         return $dataObjectArray;