Skip to content

Commit a8134cd

Browse files
author
Leonid Poluyanov
committed
Merge remote-tracking branch 'origin/MAGETWO-44009' into develop
2 parents 3792689 + 4ec17e2 commit a8134cd

File tree

10 files changed

+62
-48
lines changed

10 files changed

+62
-48
lines changed

‎app/code/Magento/BundleImportExport/Model/Export/RowCustomizer.php

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
use Magento\CatalogImportExport\Model\Import\Product as ImportProductModel;
1111
use Magento\Bundle\Model\ResourceModel\Selection\Collection as SelectionCollection;
1212
use Magento\ImportExport\Controller\Adminhtml\Import;
13+
use Magento\ImportExport\Model\Import as ImportModel;
1314

1415
/**
1516
* Class RowCustomizer
@@ -215,9 +216,9 @@ protected function getFormattedBundleSelections($optionValues, SelectionCollecti
215216
'price_type' => $this->getPriceTypeValue($selection->getSelectionPriceType())
216217
];
217218
$bundleData .= $optionValues
218-
. ImportProductModel::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR
219+
. ImportModel::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR
219220
. implode(
220-
ImportProductModel::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR,
221+
ImportModel::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR,
221222
array_map(
222223
function ($value, $key) {
223224
return $key . ImportProductModel::PAIR_NAME_VALUE_SEPARATOR . $value;
@@ -241,9 +242,9 @@ function ($value, $key) {
241242
protected function getFormattedOptionValues($option)
242243
{
243244
return 'name' . ImportProductModel::PAIR_NAME_VALUE_SEPARATOR
244-
. $option->getTitle() . ImportProductModel::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR
245+
. $option->getTitle() . ImportModel::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR
245246
. 'type' . ImportProductModel::PAIR_NAME_VALUE_SEPARATOR
246-
. $option->getType() . ImportProductModel::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR
247+
. $option->getType() . ImportModel::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR
247248
. 'required' . ImportProductModel::PAIR_NAME_VALUE_SEPARATOR
248249
. $option->getRequired();
249250
}
@@ -291,7 +292,7 @@ protected function cleanNotBundleAdditionalAttributes($dataRow)
291292
{
292293
if (!empty($dataRow['additional_attributes'])) {
293294
$additionalAttributes = explode(
294-
ImportProductModel::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR,
295+
ImportModel::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR,
295296
$dataRow['additional_attributes']
296297
);
297298
$dataRow['additional_attributes'] = $this->getNotBundleAttributes($additionalAttributes);
@@ -315,10 +316,10 @@ protected function getNotBundleAttributes($additionalAttributes)
315316
$cleanedAdditionalAttributes .= $attributeCode
316317
. ImportProductModel::PAIR_NAME_VALUE_SEPARATOR
317318
. $attributeValue
318-
. ImportProductModel::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR;
319+
. ImportModel::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR;
319320
}
320321
}
321322

322-
return rtrim($cleanedAdditionalAttributes, ImportProductModel::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR);
323+
return rtrim($cleanedAdditionalAttributes, ImportModel::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR);
323324
}
324325
}

‎app/code/Magento/CatalogImportExport/Model/Export/Product.php

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*/
66
namespace Magento\CatalogImportExport\Model\Export;
77

8+
use Magento\ImportExport\Model\Import;
89
use \Magento\Store\Model\Store;
910
use \Magento\CatalogImportExport\Model\Import\Product as ImportProduct;
1011

@@ -901,7 +902,7 @@ protected function collectRawData()
901902

902903
if (!empty($additionalAttributes)) {
903904
$data[$itemId][$storeId][self::COL_ADDITIONAL_ATTRIBUTES] =
904-
implode(ImportProduct::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR, $additionalAttributes);
905+
implode(Import::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR, $additionalAttributes);
905906
} else {
906907
unset($data[$itemId][$storeId][self::COL_ADDITIONAL_ATTRIBUTES]);
907908
}
@@ -981,7 +982,7 @@ protected function hasMultiselectData($item, $storeId)
981982
protected function collectMultiselectValues($item, $attrCode, $storeId)
982983
{
983984
$attrValue = $item->getData($attrCode);
984-
$optionIds = explode(ImportProduct::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR, $attrValue);
985+
$optionIds = explode(Import::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR, $attrValue);
985986
$options = array_intersect_key(
986987
$this->_attributeValues[$attrCode],
987988
array_flip($optionIds)
@@ -1041,7 +1042,7 @@ protected function addMultirowData($dataRow, $multiRawData)
10411042
$websiteCodes[] = $this->_websiteIdToCode[$productWebsite];
10421043
}
10431044
$dataRow['_product_websites'] =
1044-
implode(ImportProduct::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR, $websiteCodes);
1045+
implode(Import::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR, $websiteCodes);
10451046
$multiRawData['rowWebsites'][$productId] = [];
10461047
}
10471048
if (!empty($multiRawData['mediaGalery'][$productId])) {
@@ -1052,9 +1053,9 @@ protected function addMultirowData($dataRow, $multiRawData)
10521053
$additionalImageLabels[] = $mediaItem['_media_label'];
10531054
}
10541055
$dataRow['additional_images'] =
1055-
implode(ImportProduct::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR, $additionalImages);
1056+
implode(Import::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR, $additionalImages);
10561057
$dataRow['additional_image_labels'] =
1057-
implode(ImportProduct::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR, $additionalImageLabels);
1058+
implode(Import::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR, $additionalImageLabels);
10581059
$multiRawData['mediaGalery'][$productId] = [];
10591060
}
10601061
foreach ($this->_linkTypeProvider->getLinkTypes() as $linkTypeName => $linkId) {
@@ -1074,7 +1075,7 @@ protected function addMultirowData($dataRow, $multiRawData)
10741075
$multiRawData['linksRows'][$productId][$linkId] = [];
10751076
asort($associations);
10761077
$dataRow[$colPrefix . 'skus'] =
1077-
implode(ImportProduct::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR, array_keys($associations));
1078+
implode(Import::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR, array_keys($associations));
10781079
}
10791080
}
10801081
$dataRow = $this->rowCustomizer->addData($dataRow, $productId);
@@ -1085,7 +1086,7 @@ protected function addMultirowData($dataRow, $multiRawData)
10851086
foreach (array_keys($this->collectedMultiselectsData[$storeId][$productId]) as $attrKey) {
10861087
if (!empty($this->collectedMultiselectsData[$storeId][$productId][$attrKey])) {
10871088
$dataRow[$attrKey] = implode(
1088-
ImportProduct::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR,
1089+
Import::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR,
10891090
$this->collectedMultiselectsData[$storeId][$productId][$attrKey]
10901091
);
10911092
}
@@ -1161,7 +1162,7 @@ protected function optionRowToCellString($option)
11611162
$result[] = $key . ImportProduct::PAIR_NAME_VALUE_SEPARATOR . $value;
11621163
}
11631164

1164-
return implode(ImportProduct::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR, $result);
1165+
return implode(Import::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR, $result);
11651166
}
11661167

11671168
/**

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

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
use Magento\Framework\Model\ResourceModel\Db\TransactionManagerInterface;
1414
use Magento\Framework\Model\ResourceModel\Db\ObjectRelationProcessor;
1515
use Magento\Framework\Stdlib\DateTime;
16+
use Magento\ImportExport\Model\Import;
1617
use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingError;
1718
use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
1819

@@ -36,11 +37,6 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
3637
*/
3738
const ATTRIBUTE_DELETE_BUNCH = 1000;
3839

39-
/**
40-
* default delimiter for several values in one cell
41-
*/
42-
const DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR = ',';
43-
4440
/**
4541
* Pseudo multi line separator in one cell.
4642
*
@@ -727,10 +723,10 @@ public function getOptionEntity()
727723
*/
728724
public function getMultipleValueSeparator()
729725
{
730-
if (!empty($this->_parameters[\Magento\ImportExport\Model\Import::FIELD_FIELD_MULTIPLE_VALUE_SEPARATOR])) {
731-
return $this->_parameters[\Magento\ImportExport\Model\Import::FIELD_FIELD_MULTIPLE_VALUE_SEPARATOR];
726+
if (!empty($this->_parameters[Import::FIELD_FIELD_MULTIPLE_VALUE_SEPARATOR])) {
727+
return $this->_parameters[Import::FIELD_FIELD_MULTIPLE_VALUE_SEPARATOR];
732728
}
733-
return self::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR;
729+
return Import::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR;
734730
}
735731

736732
/**
@@ -781,7 +777,7 @@ public function setParameters(array $params)
781777
*/
782778
public function deleteProductsForReplacement()
783779
{
784-
$this->setParameters(array('behavior' => \Magento\ImportExport\Model\Import::BEHAVIOR_DELETE));
780+
$this->setParameters(array('behavior' => Import::BEHAVIOR_DELETE));
785781
$this->_deleteProducts();
786782

787783
return $this;
@@ -837,9 +833,9 @@ protected function _deleteProducts()
837833
protected function _importData()
838834
{
839835
$this->_validatedRows = null;
840-
if (\Magento\ImportExport\Model\Import::BEHAVIOR_DELETE == $this->getBehavior()) {
836+
if (Import::BEHAVIOR_DELETE == $this->getBehavior()) {
841837
$this->_deleteProducts();
842-
} elseif (\Magento\ImportExport\Model\Import::BEHAVIOR_REPLACE == $this->getBehavior()) {
838+
} elseif (Import::BEHAVIOR_REPLACE == $this->getBehavior()) {
843839
$this->_replaceFlag = true;
844840
$this->_replaceProducts();
845841
} else {
@@ -859,7 +855,7 @@ protected function _replaceProducts()
859855
$this->deleteProductsForReplacement();
860856
$this->_oldSku = $this->skuProcessor->reloadOldSkus()->getOldSkus();
861857
$this->_validatedRows = null;
862-
$this->setParameters(array('behavior' => \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND));
858+
$this->setParameters(array('behavior' => Import::BEHAVIOR_APPEND));
863859
$this->_saveProductsData();
864860

865861
return $this;
@@ -975,7 +971,7 @@ protected function _prepareRowForDb(array $rowData)
975971

976972
static $lastSku = null;
977973

978-
if (\Magento\ImportExport\Model\Import::BEHAVIOR_DELETE == $this->getBehavior()) {
974+
if (Import::BEHAVIOR_DELETE == $this->getBehavior()) {
979975
return $rowData;
980976
}
981977

@@ -1092,7 +1088,7 @@ protected function _saveLinks()
10921088
}
10931089
}
10941090
}
1095-
if (\Magento\ImportExport\Model\Import::BEHAVIOR_APPEND != $this->getBehavior() && $productIds) {
1091+
if (Import::BEHAVIOR_APPEND != $this->getBehavior() && $productIds) {
10961092
$this->_connection->delete(
10971093
$mainTable,
10981094
$this->_connection->quoteInto('product_id IN (?)', array_unique($productIds))
@@ -1186,7 +1182,7 @@ protected function _saveProductCategories(array $categoriesData)
11861182
$categoriesIn[] = ['product_id' => $productId, 'category_id' => $categoryId, 'position' => 1];
11871183
}
11881184
}
1189-
if (\Magento\ImportExport\Model\Import::BEHAVIOR_APPEND != $this->getBehavior()) {
1185+
if (Import::BEHAVIOR_APPEND != $this->getBehavior()) {
11901186
$this->_connection->delete(
11911187
$tableName,
11921188
$this->_connection->quoteInto('product_id IN (?)', $delProductId)
@@ -1547,7 +1543,7 @@ protected function _saveProducts()
15471543
$this->taxClassProcessor->upsertTaxClass($rowData['tax_class_name'], $productTypeModel);
15481544
}
15491545

1550-
if ($this->getBehavior() == \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND ||
1546+
if ($this->getBehavior() == Import::BEHAVIOR_APPEND ||
15511547
empty($rowData[self::COL_SKU])
15521548
) {
15531549
$rowData = $productTypeModel->clearEmptyData($rowData);
@@ -1678,7 +1674,7 @@ protected function _saveProductTierPrices(array $tierPriceData)
16781674
$tierPriceIn[] = $row;
16791675
}
16801676
}
1681-
if (\Magento\ImportExport\Model\Import::BEHAVIOR_APPEND != $this->getBehavior()) {
1677+
if (Import::BEHAVIOR_APPEND != $this->getBehavior()) {
16821678
$this->_connection->delete(
16831679
$tableName,
16841680
$this->_connection->quoteInto('entity_id IN (?)', $delProductId)
@@ -1709,8 +1705,8 @@ protected function _getUploader()
17091705

17101706
$DS = DIRECTORY_SEPARATOR;
17111707

1712-
if (!empty($this->_parameters[\Magento\ImportExport\Model\Import::FIELD_NAME_IMG_FILE_DIR])) {
1713-
$tmpPath = $this->_parameters[\Magento\ImportExport\Model\Import::FIELD_NAME_IMG_FILE_DIR];
1708+
if (!empty($this->_parameters[Import::FIELD_NAME_IMG_FILE_DIR])) {
1709+
$tmpPath = $this->_parameters[Import::FIELD_NAME_IMG_FILE_DIR];
17141710
} else {
17151711
$tmpPath = $dirAddon . $DS . $this->_mediaDirectory->getRelativePath('import');
17161712
}
@@ -1790,7 +1786,7 @@ protected function _saveMediaGallery(array $mediaGalleryData)
17901786
$productId = $this->skuProcessor->getNewSku($productSku)['entity_id'];
17911787
$productIds[] = $productId;
17921788
$insertedGalleryImgs = [];
1793-
if (\Magento\ImportExport\Model\Import::BEHAVIOR_APPEND != $this->getBehavior()) {
1789+
if (Import::BEHAVIOR_APPEND != $this->getBehavior()) {
17941790
$this->_connection->delete(
17951791
$mediaGalleryTableName,
17961792
$this->_connection->quoteInto('entity_id IN (?)', $productId)
@@ -1881,7 +1877,7 @@ protected function _saveProductWebsites(array $websiteData)
18811877
$websitesData[] = ['product_id' => $productId, 'website_id' => $websiteId];
18821878
}
18831879
}
1884-
if (\Magento\ImportExport\Model\Import::BEHAVIOR_APPEND != $this->getBehavior()) {
1880+
if (Import::BEHAVIOR_APPEND != $this->getBehavior()) {
18851881
$this->_connection->delete(
18861882
$tableName,
18871883
$this->_connection->quoteInto('product_id IN (?)', $delProductId)
@@ -2084,7 +2080,7 @@ public function validateRow(array $rowData, $rowNum)
20842080
$rowScope = $this->getRowScope($rowData);
20852081

20862082
// BEHAVIOR_DELETE use specific validation logic
2087-
if (\Magento\ImportExport\Model\Import::BEHAVIOR_DELETE == $this->getBehavior()) {
2083+
if (Import::BEHAVIOR_DELETE == $this->getBehavior()) {
20882084
if (self::SCOPE_DEFAULT == $rowScope && !isset($this->_oldSku[$rowData[self::COL_SKU]])) {
20892085
$this->addRowError(ValidatorInterface::ERROR_SKU_NOT_FOUND_FOR_DELETE, $rowNum);
20902086
return false;

‎app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use Magento\CatalogImportExport\Model\Import\Product;
99
use Magento\Framework\App\Filesystem\DirectoryList;
1010
use Magento\Framework\Stdlib\DateTime;
11+
use Magento\ImportExport\Model\Import;
1112

1213
/**
1314
* Class ProductTest
@@ -567,7 +568,7 @@ public function testGetMultipleValueSeparatorDefault()
567568
{
568569
$this->setPropertyValue($this->importProduct, '_parameters', null);
569570
$this->assertEquals(
570-
\Magento\CatalogImportExport\Model\Import\Product::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR,
571+
Import::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR,
571572
$this->importProduct->getMultipleValueSeparator()
572573
);
573574
}

‎app/code/Magento/ConfigurableImportExport/Model/Export/RowCustomizer.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
use Magento\CatalogImportExport\Model\Export\RowCustomizerInterface;
99
use \Magento\CatalogImportExport\Model\Import\Product as ImportProduct;
10+
use Magento\ImportExport\Model\Import;
1011

1112
class RowCustomizer implements RowCustomizerInterface
1213
{
@@ -52,11 +53,11 @@ public function prepareData($collection, $productIds)
5253

5354
foreach ($variations as $sku => $values) {
5455
$variations[$sku] =
55-
'sku=' . $sku . ImportProduct::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR
56-
. implode(ImportProduct::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR, $values);
56+
'sku=' . $sku . Import::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR
57+
. implode(Import::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR, $values);
5758
}
5859
$variations = implode(ImportProduct::PSEUDO_MULTI_LINE_SEPARATOR, $variations);
59-
$variationsLabels = implode(ImportProduct::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR, $variationsLabels);
60+
$variationsLabels = implode(Import::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR, $variationsLabels);
6061

6162
$this->configurableData[$product->getId()] = [
6263
'configurable_variations' => $variations,

‎app/code/Magento/ConfigurableImportExport/Test/Unit/Model/Export/RowCustomizerTest.php

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
namespace Magento\ConfigurableImportExport\Test\Unit\Model\Export;
88

99
use \Magento\CatalogImportExport\Model\Import\Product as ImportProduct;
10+
use Magento\ImportExport\Model\Import;
1011

1112
class RowCustomizerTest extends \PHPUnit_Framework_TestCase
1213
{
@@ -256,17 +257,17 @@ protected function getExpectedConfigurableData()
256257
return [
257258
$this->initiatedProductId => [
258259
'configurable_variations' => implode(ImportProduct::PSEUDO_MULTI_LINE_SEPARATOR, [
259-
'_sku_' => 'sku=_sku_' . ImportProduct::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR
260-
. implode(ImportProduct::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR, [
260+
'_sku_' => 'sku=_sku_' . Import::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR
261+
. implode(Import::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR, [
261262
'code_of_attribute=Option Title',
262263
'code_of_attribute=Option Title',
263264
]),
264-
'_sku_2' => 'sku=_sku_2' . ImportProduct::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR
265-
. implode(ImportProduct::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR, [
265+
'_sku_2' => 'sku=_sku_2' . Import::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR
266+
. implode(Import::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR, [
266267
'code_of_attribute_2=Option Title 2',
267268
])
268269
]),
269-
'configurable_variation_labels' => implode(ImportProduct::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR, [
270+
'configurable_variation_labels' => implode(Import::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR, [
270271
'code_of_attribute' => 'code_of_attribute=Super attribute label',
271272
'code_of_attribute_2' => 'code_of_attribute_2=Super attribute label 2',
272273
]),
@@ -291,6 +292,7 @@ protected function setPropertyValue(&$object, $property, $value)
291292
/**
292293
* @param $object
293294
* @param $property
295+
* @return mixed
294296
*/
295297
protected function getPropertyValue(&$object, $property)
296298
{

‎app/code/Magento/GroupedImportExport/Model/Import/Product/Type/Grouped.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
namespace Magento\GroupedImportExport\Model\Import\Product\Type;
99

1010
use Magento\CatalogImportExport\Model\Import\Product;
11+
use Magento\ImportExport\Model\Import;
1112

1213
class Grouped extends \Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType
1314
{
@@ -76,7 +77,7 @@ public function saveData()
7677
if (!$this->_entityModel->isRowAllowedToImport($rowData, $rowNum) || empty($associatedSkusQty)) {
7778
continue;
7879
}
79-
$associatedSkusAndQtyPairs = explode(Product::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR, $associatedSkusQty);
80+
$associatedSkusAndQtyPairs = explode(Import::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR, $associatedSkusQty);
8081
$position = 0;
8182
foreach ($associatedSkusAndQtyPairs as $associatedSkuAndQty) {
8283
++$position;

‎app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit/Form.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*/
66
namespace Magento\ImportExport\Block\Adminhtml\Import\Edit;
77

8+
use Magento\ImportExport\Model\Import;
89
use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
910

1011
/**
@@ -170,7 +171,7 @@ protected function _prepareForm()
170171
'required' => true,
171172
'disabled' => true,
172173
'class' => $behaviorCode,
173-
'value' => ',',
174+
'value' => Import::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR,
174175
]
175176
);
176177
}

0 commit comments

Comments
 (0)