From a76e3a3e8cd545b16fda1bd56c5db5d6cf687d56 Mon Sep 17 00:00:00 2001 From: Tadhg Bowe Date: Fri, 29 Jun 2018 20:28:07 +0100 Subject: [PATCH] import-export-improvements #82 : configurable variations - not a super attribute error message improvements - travis ci build code style fixes --- .../Model/Import/Product/Type/Configurable.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php b/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php index 07468c429a234..4f3308ff3d6e1 100644 --- a/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php +++ b/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php @@ -342,8 +342,7 @@ protected function _identifySuperAttributeError($superAttrCode, $rowNum) if ($attributeRow['is_global'] !== '1') { $codeNotGlobal = true; - } - elseif ($attributeRow['type'] !== 'select') { + } elseif ($attributeRow['type'] !== 'select') { $codeNotTypeSelect = true; } @@ -354,12 +353,10 @@ protected function _identifySuperAttributeError($superAttrCode, $rowNum) if ($codeExists == false) { $this->_entityModel->addRowError(self::ERROR_ATTRIBUTE_CODE_DOES_NOT_EXIST, $rowNum, $superAttrCode); $reasonFound = true; - } - elseif ($codeNotGlobal == true) { + } elseif ($codeNotGlobal == true) { $this->_entityModel->addRowError(self::ERROR_ATTRIBUTE_CODE_NOT_GLOBAL_SCOPE, $rowNum, $superAttrCode); $reasonFound = true; - } - elseif ($codeNotTypeSelect == true) { + } elseif ($codeNotTypeSelect == true) { $this->_entityModel->addRowError(self::ERROR_ATTRIBUTE_CODE_NOT_TYPE_SELECT, $rowNum, $superAttrCode); $reasonFound = true; }