@@ -71,7 +71,7 @@ protected function textValidation($attrCode, $type)
7171 if ($ type == 'text ' ) {
7272 $ valid = $ this ->string ->strlen ($ val ) < Product::DB_MAX_TEXT_LENGTH ;
7373 } else if ($ attrCode == Product::COL_SKU ) {
74- $ valid = $ this ->string ->strlen ($ val ) < SKU ::SKU_MAX_LENGTH ;
74+ $ valid = $ this ->string ->strlen ($ val ) <= SKU ::SKU_MAX_LENGTH ;
7575 } else {
7676 $ valid = $ this ->string ->strlen ($ val ) < Product::DB_MAX_VARCHAR_LENGTH ;
7777 }
@@ -153,12 +153,7 @@ public function isRequiredAttributeValid($attrCode, array $attributeParams, arra
153153 $ doCheck = true ;
154154 }
155155
156- if ($ doCheck === true ) {
157- return isset ($ rowData [$ attrCode ])
158- && strlen (trim ($ rowData [$ attrCode ]))
159- && trim ($ rowData [$ attrCode ]) !== $ this ->context ->getEmptyAttributeValueConstant ();
160- }
161- return true ;
156+ return $ doCheck ? isset ($ rowData [$ attrCode ]) && strlen (trim ($ rowData [$ attrCode ])) : true ;
162157 }
163158
164159 /**
@@ -196,11 +191,6 @@ public function isAttributeValid($attrCode, array $attrParams, array $rowData)
196191 if (!strlen (trim ($ rowData [$ attrCode ]))) {
197192 return true ;
198193 }
199-
200- if ($ rowData [$ attrCode ] === $ this ->context ->getEmptyAttributeValueConstant () && !$ attrParams ['is_required ' ]) {
201- return true ;
202- }
203-
204194 switch ($ attrParams ['type ' ]) {
205195 case 'varchar ' :
206196 case 'text ' :
@@ -222,12 +212,6 @@ public function isAttributeValid($attrCode, array $attrParams, array $rowData)
222212 break ;
223213 }
224214 }
225-
226- $ uniqueValues = array_unique ($ values );
227- if (count ($ uniqueValues ) != count ($ values )) {
228- $ valid = false ;
229- $ this ->_addMessages ([RowValidatorInterface::ERROR_DUPLICATE_MULTISELECT_VALUES ]);
230- }
231215 break ;
232216 case 'datetime ' :
233217 $ val = trim ($ rowData [$ attrCode ]);
0 commit comments