Skip to content

Commit b4ce314

Browse files
committed
magento-engcom/import-export-improvements#30: Refactoring for readability.
1 parent 0832e29 commit b4ce314

File tree

1 file changed

+9
-3
lines changed
  • app/code/Magento/CustomerImportExport/Model/Import

1 file changed

+9
-3
lines changed

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -593,12 +593,18 @@ protected function _validateRowForUpdate(array $rowData, $rowNumber)
593593
if (in_array($attributeCode, $this->_ignoredAttributes)) {
594594
continue;
595595
}
596-
if ($attributeParams['is_required']
597-
&& ((!isset($rowData[$attributeCode]) && !$this->_getCustomerId($email, $website))
598-
|| (isset($rowData[$attributeCode]) && '' === trim($rowData[$attributeCode])))) {
596+
597+
$isFieldRequired = $attributeParams['is_required'];
598+
$isFieldNotSetAndCustomerDoesNotExist =
599+
!isset($rowData[$attributeCode]) && !$this->_getCustomerId($email, $website);
600+
$isFieldSetAndTrimmedValueIsEmpty
601+
= isset($rowData[$attributeCode]) && '' === trim($rowData[$attributeCode]);
602+
603+
if ($isFieldRequired && ($isFieldNotSetAndCustomerDoesNotExist || $isFieldSetAndTrimmedValueIsEmpty)) {
599604
$this->addRowError(self::ERROR_VALUE_IS_REQUIRED, $rowNumber, $attributeCode);
600605
continue;
601606
}
607+
602608
if (isset($rowData[$attributeCode]) && strlen($rowData[$attributeCode])) {
603609
$this->isAttributeValid(
604610
$attributeCode,

0 commit comments

Comments
 (0)