MAGETWO-50912: Custom Customer Attributes not saving at checkout

reverted fix

Author: Serhiy Shkolyarenko

app/code/Magento/Checkout/view/frontend/web/js/model/new-customer-address.js

@@ -4,19 +4,18 @@
  */
 /*jshint browser:true jquery:true*/
 /*global alert*/
-define([], function () {
+define([], function() {
     /**
-     * @param {Object} addressData
+     * @param addressData
      * Returns new address object
      */
     return function (addressData) {
         var identifier = Date.now();
-
         return {
             email: addressData.email,
             countryId: (addressData.country_id) ? addressData.country_id : window.checkoutConfig.defaultCountryId,
-            regionId: (addressData.region && addressData.region.region_id) ?
-                addressData.region.region_id
+            regionId: (addressData.region && addressData.region.region_id)
+                ? addressData.region.region_id
                 : window.checkoutConfig.defaultRegionId,
             regionCode: (addressData.region) ? addressData.region.region_code : null,
             region: (addressData.region) ? addressData.region.region : null,
@@ -34,26 +33,25 @@ define([], function () {
             suffix: addressData.suffix,
             vatId: addressData.vat_id,
             saveInAddressBook: addressData.save_in_address_book,
-            customAttributes: addressData.custom_attributes,
-            isDefaultShipping: function () {
+            isDefaultShipping: function() {
                 return addressData.default_shipping;
             },
-            isDefaultBilling: function () {
+            isDefaultBilling: function() {
                 return addressData.default_billing;
             },
-            getType: function () {
+            getType: function() {
                 return 'new-customer-address';
             },
-            getKey: function () {
+            getKey: function() {
                 return this.getType();
             },
-            getCacheKey: function () {
+            getCacheKey: function() {
                 return this.getType() + identifier;
             },
-            isEditable: function () {
+            isEditable: function() {
                 return true;
             },
-            canUseForBilling: function () {
+            canUseForBilling: function() {
                 return true;
             }
         }

app/code/Magento/Customer/Model/Address.php

@@ -47,11 +47,6 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress
      */
     protected $indexerRegistry;
 
-    /**
-     * @var \Magento\Customer\Model\Address\CustomAttributeListInterface
-     */
-    private $attributeList;
-
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -352,27 +347,4 @@ public function reindex()
         $indexer = $this->indexerRegistry->get(Customer::CUSTOMER_GRID_INDEXER_ID);
         $indexer->reindexRow($this->getCustomerId());
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function getCustomAttributesCodes()
-    {
-        return array_keys($this->getAttributeList()->getAttributes());
-    }
-
-    /**
-     * Get new AttributeList dependency for application code.
-     * @return \Magento\Customer\Model\Address\CustomAttributeListInterface
-     * @deprecated
-     */
-    private function getAttributeList()
-    {
-        if (!$this->attributeList) {
-            $this->attributeList = \Magento\Framework\App\ObjectManager::getInstance()->get(
-                \Magento\Customer\Model\Address\CustomAttributeListInterface::class
-            );
-        }
-        return $this->attributeList;
-    }
 }

app/code/Magento/Customer/Model/Address/CustomAttributeList.php

@@ -49,8 +49,6 @@
                 type="Magento\Customer\Model\EmailNotification" />
     <preference for="Magento\Customer\Api\CustomerNameGenerationInterface"
                 type="Magento\Customer\Helper\View" />
-    <preference for="Magento\Customer\Model\Address\CustomAttributeListInterface"
-                type="Magento\Customer\Model\Address\CustomAttributeList" />
     <type name="Magento\Customer\Model\Session">
         <arguments>
             <argument name="configShare" xsi:type="object">Magento\Customer\Model\Config\Share\Proxy</argument>

app/code/Magento/Customer/Model/Address/CustomAttributeListInterface.php

@@ -32,7 +32,6 @@ define([], function() {
             vatId: addressData.vat_id,
             sameAsBilling: addressData.same_as_billing,
             saveInAddressBook: addressData.save_in_address_book,
-            customAttributes: addressData.custom_attributes,
             isDefaultShipping: function() {
                 return addressData.default_shipping;
             },