Merge branch 'MAGETWO-28011' of https://github.corp.ebay.com/magento-firedrakes/magento2ce into MAGETWO-28011

Author: Dmytro Voskoboinikov

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

@@ -202,21 +202,15 @@ protected function _saveAddresses(\Magento\Customer\Model\Customer $customer)
                 }
             }
         }
-        //@TODO: find appropriate place
         $changedAddresses = [];
-        if ($defaultBillingId != $customer->getData('default_billing')) {
-            $changedAddresses['default_billing'] = $customer->getData('default_billing');
-        }
-        if ($defaultShippingId != $customer->getData('default_shipping')) {
-            $changedAddresses['default_shipping'] = $customer->getData('default_shipping');
-        }
-        if ($changedAddresses) {
-            $this->_getWriteAdapter()->update(
-                $this->getTable('customer_entity'),
-                $changedAddresses,
-                $this->_getWriteAdapter()->quoteInto('entity_id = ?', $customer->getId())
-            );
-        }
+
+        $changedAddresses['default_billing'] = $customer->getData('default_billing');
+        $changedAddresses['default_shipping'] = $customer->getData('default_shipping');
+        $this->_getWriteAdapter()->update(
+            $this->getTable('customer_entity'),
+            $changedAddresses,
+            $this->_getWriteAdapter()->quoteInto('entity_id = ?', $customer->getId())
+        );
 
         return $this;
     }

app/code/Magento/CustomerImportExport/Model/Import/Address.php

@@ -517,8 +517,8 @@ protected function _prepareDataForUpdate(array $rowData)
         foreach (self::getDefaultAddressAttributeMapping() as $columnName => $attributeCode) {
             if (!empty($rowData[$columnName])) {
                 /** @var $attribute \Magento\Eav\Model\Entity\Attribute\AbstractAttribute */
-                $attribute = $this->_getCustomerEntity()->getAttribute($attributeCode);
-                $defaults[$attribute->getBackend()->getTable()][$customerId][$attribute->getId()] = $addressId;
+                $table = $this->_getCustomerEntity()->getResource()->getTable('customer_entity');
+                $defaults[$table][$customerId][$attributeCode] = $addressId;
             }
         }
 
@@ -586,21 +586,15 @@ protected function _saveAddressAttributes(array $attributesData)
      */
     protected function _saveCustomerDefaults(array $defaults)
     {
-        /** @var $entity \Magento\Customer\Model\Customer */
-        $entity = $this->_customerFactory->create();
-
         foreach ($defaults as $tableName => $data) {
-            $tableData = [];
-            foreach ($data as $customerId => $attributeData) {
-                foreach ($attributeData as $attributeId => $value) {
-                    $tableData[] = [
-                        'entity_id' => $customerId,
-                        'attribute_id' => $attributeId,
-                        'value' => $value,
-                    ];
-                }
+            foreach ($data as $customerId => $defaultsData) {
+                $data = array_merge(
+                    ['entity_id' => $customerId],
+                    $defaultsData
+                );
+                $this->_connection->insertOnDuplicate($tableName, $data, array_keys($defaultsData));
             }
-            $this->_connection->insertOnDuplicate($tableName, $tableData, ['value']);
+
         }
         return $this;
     }

app/code/Magento/CustomerImportExport/Model/Import/Customer.php

@@ -298,33 +298,36 @@ protected function _prepareDataForUpdate(array $rowData)
         } else {
             $createdAt = (new \DateTime())->setTimestamp(strtotime($rowData['created_at']));
         }
+
+        $emailInLowercase = strtolower($rowData[self::COLUMN_EMAIL]);
+        $newCustomer = false;
+        $entityId = $this->_getCustomerId($emailInLowercase, $rowData[self::COLUMN_WEBSITE]);
+        if (!$entityId) {
+            // create
+            $newCustomer = true;
+            $entityId = $this->_getNextEntityId();
+            $this->_newCustomers[$emailInLowercase][$rowData[self::COLUMN_WEBSITE]] = $entityId;
+        }
+
         $entityRow = [
             'group_id' => empty($rowData['group_id']) ? self::DEFAULT_GROUP_ID : $rowData['group_id'],
             'store_id' => empty($rowData[self::COLUMN_STORE]) ? 0 : $this->_storeCodeToId[$rowData[self::COLUMN_STORE]],
             'created_at' => $createdAt->format(\Magento\Framework\Stdlib\DateTime::DATETIME_PHP_FORMAT),
             'updated_at' => $now->format(\Magento\Framework\Stdlib\DateTime::DATETIME_PHP_FORMAT),
+            'entity_id' => $entityId,
         ];
 
-        $emailInLowercase = strtolower($rowData[self::COLUMN_EMAIL]);
-        if ($entityId = $this->_getCustomerId($emailInLowercase, $rowData[self::COLUMN_WEBSITE])) {
-            // edit
-            $entityRow['entity_id'] = $entityId;
-            $entitiesToUpdate[] = $entityRow;
-        } else {
-            // create
-            $entityId = $this->_getNextEntityId();
-            $entityRow['entity_id'] = $entityId;
-            $entityRow['website_id'] = $this->_websiteCodeToId[$rowData[self::COLUMN_WEBSITE]];
-            $entityRow['email'] = $emailInLowercase;
-            $entityRow['is_active'] = 1;
-            $entitiesToCreate[] = $entityRow;
-
-            $this->_newCustomers[$emailInLowercase][$rowData[self::COLUMN_WEBSITE]] = $entityId;
+        // password change/set
+        if (isset($rowData['password']) && strlen($rowData['password'])) {
+            $entityRow['password_hash'] = $this->_customerModel->hashPassword($rowData['password']);
         }
 
         // attribute values
         foreach (array_intersect_key($rowData, $this->_attributes) as $attributeCode => $value) {
-            if (!$this->_attributes[$attributeCode]['is_static'] && strlen($value)) {
+            if ($newCustomer && !strlen($value)) {
+                continue;
+            }
+            if (!$this->_attributes[$attributeCode]['is_static']) {
                 /** @var $attribute \Magento\Customer\Model\Attribute */
                 $attribute = $this->_customerModel->getAttribute($attributeCode);
                 $backendModel = $attribute->getBackendModel();
@@ -344,15 +347,20 @@ protected function _prepareDataForUpdate(array $rowData)
 
                 // restore 'backend_model' to avoid default setting
                 $attribute->setBackendModel($backendModel);
+            } else {
+                $entityRow[$attributeCode] = $value;
             }
         }
 
-        // password change/set
-        if (isset($rowData['password']) && strlen($rowData['password'])) {
-            $attributesToSave[$passwordStorageTable][$entityId][$passwordAttributeId] = $this->_customerModel
-                ->hashPassword(
-                    $rowData['password']
-                );
+        if ($newCustomer) {
+            // create
+            $entityRow['website_id'] = $this->_websiteCodeToId[$rowData[self::COLUMN_WEBSITE]];
+            $entityRow['email'] = $emailInLowercase;
+            $entityRow['is_active'] = 1;
+            $entitiesToCreate[] = $entityRow;
+        } else {
+            // edit
+            $entitiesToUpdate[] = $entityRow;
         }
 
         return [