Merge remote-tracking branch 'origin/MC-17201' into 2.3-develop-pr29

Author: serhii-balko

app/code/Magento/Customer/Model/Delegation/Storage.php

@@ -19,6 +19,7 @@
 use Magento\Customer\Model\Delegation\Data\NewOperationFactory;
 use Magento\Customer\Api\Data\CustomerInterfaceFactory;
 use Magento\Customer\Api\Data\AddressInterfaceFactory;
+use Magento\Framework\Api\CustomAttributesDataInterface;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -100,11 +101,13 @@ public function storeNewOperation(CustomerInterface $customer, array $delegatedD
             }
         }
         $this->session->setCustomerFormData($customerData);
-        $this->session->setDelegatedNewCustomerData([
-            'customer' => $customerData,
-            'addresses' => $addressesData,
-            'delegated_data' => $delegatedData,
-        ]);
+        $this->session->setDelegatedNewCustomerData(
+            [
+                'customer' => $customerData,
+                'addresses' => $addressesData,
+                'delegated_data' => $delegatedData,
+            ]
+        );
     }
 
     /**
@@ -134,18 +137,31 @@ public function consumeNewOperation()
                 );
                 $addressData['region'] = $region;
             }
-            $addresses[] = $this->addressFactory->create(
+
+            $customAttributes = [];
+            if (!empty($addressData[CustomAttributesDataInterface::CUSTOM_ATTRIBUTES])) {
+                $customAttributes = $addressData[CustomAttributesDataInterface::CUSTOM_ATTRIBUTES];
+                unset($addressData[CustomAttributesDataInterface::CUSTOM_ATTRIBUTES]);
+            }
+
+            $address = $this->addressFactory->create(
                 ['data' => $addressData]
             );
+
+            foreach ($customAttributes as $attributeCode => $attributeValue) {
+                $address->setCustomAttribute($attributeCode, $attributeValue);
+            }
+
+            $addresses[] = $address;
         }
         $customerData = $serialized['customer'];
         $customerData['addresses'] = $addresses;
 
-        return $this->newFactory->create([
-            'customer' => $this->customerFactory->create(
-                ['data' => $customerData]
-            ),
-            'additionalData' => $serialized['delegated_data'],
-        ]);
+        return $this->newFactory->create(
+            [
+                'customer' => $this->customerFactory->create(['data' => $customerData]),
+                'additionalData' => $serialized['delegated_data'],
+            ]
+        );
     }
 }

dev/tests/integration/testsuite/Magento/Sales/Api/OrderCustomerDelegateInterfaceTest.php

@@ -11,6 +11,7 @@
 use Magento\Customer\Api\Data\AddressInterface;
 use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Customer\Api\Data\CustomerInterfaceFactory;
+use Magento\Framework\Api\AttributeInterface;
 use Magento\Sales\Api\Data\OrderAddressInterface;
 use Magento\Sales\Model\Order;
 use Magento\Sales\Model\OrderFactory;
@@ -126,6 +127,7 @@ private function compareAddresses(
     /**
      * @magentoDbIsolation enabled
      * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/Customer/_files/attribute_user_defined_address.php
      * @magentoDataFixture Magento/Sales/_files/order.php
      * @return void
      */