Skip to content

Commit 51f4ac8

Browse files
committed
magento-engcom/import-export-improvements#49: Add failure if sku is empty value constant
1 parent 73e9343 commit 51f4ac8

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,11 @@ public function isRowValid(array $rowData, $rowNum, $isNewProduct = true)
444444
$error = false;
445445
$rowScope = $this->_entityModel->getRowScope($rowData);
446446
if (\Magento\CatalogImportExport\Model\Import\Product::SCOPE_NULL != $rowScope
447-
&& !empty($rowData[\Magento\CatalogImportExport\Model\Import\Product::COL_SKU])
447+
&& (
448+
!empty($rowData[\Magento\CatalogImportExport\Model\Import\Product::COL_SKU])
449+
|| $rowData[\Magento\CatalogImportExport\Model\Import\Product::COL_SKU]
450+
!== $this->_entityModel->getEmptyAttributeValueConstant()
451+
)
448452
) {
449453
foreach ($this->_getProductAttributes($rowData) as $attrCode => $attrParams) {
450454
// check value for non-empty in the case of required attribute?

app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,12 @@ public function isRequiredAttributeValid($attrCode, array $attributeParams, arra
150150
$doCheck = true;
151151
}
152152

153-
return $doCheck ? isset($rowData[$attrCode]) && strlen(trim($rowData[$attrCode])) : true;
153+
if ($doCheck === true) {
154+
return isset($rowData[$attrCode])
155+
&& strlen(trim($rowData[$attrCode]))
156+
&& trim($rowData[$attrCode]) !== $this->context->getEmptyAttributeValueConstant();
157+
}
158+
return true;
154159
}
155160

156161
/**

0 commit comments

Comments
 (0)