ACPT-1423: Import Customers Main File

Author: adifucan

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

@@ -402,9 +402,7 @@ public function validateData()
     protected function _prepareDataForUpdate(array $rowData)
     {
         $multiSeparator = $this->getMultipleValueSeparator();
-        $entitiesToCreate = [];
-        $entitiesToUpdate = [];
-        $attributesToSave = [];
+        $entitiesToCreate = $entitiesToUpdate = $attributesToSave = [];
 
         // entity table data
         $now = new \DateTime();
@@ -439,7 +437,11 @@ protected function _prepareDataForUpdate(array $rowData)
                 }
             } elseif ('multiselect' == $attributeParameters['type']) {
                 $ids = [];
-                $values = $value !== null ? explode($multiSeparator, mb_strtolower($value)) : [];
+                if (!is_array($value)) {
+                    $values = $value !== null ? explode($multiSeparator, mb_strtolower($value)) : [];
+                } else {
+                    $values = array_map('mb_strtolower', $value);
+                }
                 foreach ($values as $subValue) {
                     $ids[] = $this->getSelectAttrIdByValue($attributeParameters, $subValue);
                 }
@@ -615,27 +617,32 @@ protected function _validateRowForUpdate(array $rowData, $rowNumber)
                 $isFieldRequired = $attributeParams['is_required'];
                 $isFieldNotSetAndCustomerDoesNotExist =
                     !isset($rowData[$attributeCode]) && !$this->_getCustomerId($email, $website);
-                $isFieldSetAndTrimmedValueIsEmpty
-                    = isset($rowData[$attributeCode]) && '' === trim((string)$rowData[$attributeCode]);
+                $isFieldSetAndTrimmedValueIsEmpty = true;
+                $isFieldValueNotEmpty = false;
+
+                if (isset($rowData[$attributeCode])) {
+                    if (is_array($rowData[$attributeCode])) {
+                        $isFieldSetAndTrimmedValueIsEmpty = empty(array_filter($rowData[$attributeCode], 'trim'));
+                        $isFieldValueNotEmpty = count(array_filter($rowData[$attributeCode], 'strlen')) > 0;
+                    } else {
+                        $isFieldSetAndTrimmedValueIsEmpty = '' === trim((string)$rowData[$attributeCode]);
+                        $isFieldValueNotEmpty = strlen($rowData[$attributeCode]) > 0;
+                    }
+                }
 
                 if ($isFieldRequired && ($isFieldNotSetAndCustomerDoesNotExist || $isFieldSetAndTrimmedValueIsEmpty)) {
                     $this->addRowError(self::ERROR_VALUE_IS_REQUIRED, $rowNumber, $attributeCode);
                     continue;
                 }
 
-                if (isset($rowData[$attributeCode]) && strlen((string)$rowData[$attributeCode])) {
-                    if ($attributeParams['type'] == 'select') {
-                        continue;
-                    }
-
+                if (isset($rowData[$attributeCode]) && $isFieldValueNotEmpty && $attributeParams['type'] != 'select') {
                     $this->isAttributeValid(
                         $attributeCode,
                         $attributeParams,
                         $rowData,
                         $rowNumber,
-                        isset($this->_parameters[Import::FIELD_FIELD_MULTIPLE_VALUE_SEPARATOR])
-                            ? $this->_parameters[Import::FIELD_FIELD_MULTIPLE_VALUE_SEPARATOR]
-                            : Import::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR
+                        $this->_parameters[Import::FIELD_FIELD_MULTIPLE_VALUE_SEPARATOR]
+                        ?? Import::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR
                     );
                 }
             }

app/code/Magento/DownloadableImportExport/Model/Import/Product/Type/Downloadable.php

@@ -831,7 +831,7 @@ protected function prepareSampleData($rowCol, $entityId = null)
      * Prepare samples data in structured format.
      *
      * @param array $samples
-     * @param null $entityId
+     * @param $entityId
      * @return array
      */
     private function prepareStructuredSampleData(array $samples, $entityId = null): array
@@ -885,7 +885,7 @@ protected function prepareLinkData($rowCol, $entityId = null)
      * Prepare links data in structured format.
      *
      * @param array $links
-     * @param null $entityId
+     * @param $entityId
      * @return array
      */
     private function prepareStructuredLinkData(array $links, $entityId = null): array

app/code/Magento/ImportExport/Model/Import/AbstractEntity.php

@@ -693,12 +693,19 @@ public function isAttributeValid(
             case 'multiselect':
             case 'boolean':
                 $valid = true;
-                foreach (explode($multiSeparator, mb_strtolower($rowData[$attributeCode])) as $value) {
-                    $valid = isset($attributeParams['options'][$value]);
+                $values = $rowData[$attributeCode];
+
+                if (!is_array($values)) {
+                    $values = explode($multiSeparator, mb_strtolower($values));
+                }
+
+                foreach ($values as $value) {
+                    $valid = isset($attributeParams['options'][mb_strtolower($value)]);
                     if (!$valid) {
                         break;
                     }
                 }
+
                 $message = self::ERROR_INVALID_ATTRIBUTE_OPTION;
                 break;
             case 'int':