Merge branch '2.2-develop' into MAGETWO-67048

Author: nmalevanec

app/code/Magento/BundleImportExport/Model/Import/Product/Type/Bundle.php

@@ -11,6 +11,7 @@
 use \Magento\Framework\App\ObjectManager;
 use \Magento\Bundle\Model\Product\Price as BundlePrice;
 use \Magento\Catalog\Model\Product\Type\AbstractType;
+use Magento\CatalogImportExport\Model\Import\Product;
 
 /**
  * Class Bundle
@@ -173,7 +174,7 @@ protected function parseSelections($rowData, $entityId)
             $rowData['bundle_values']
         );
         $selections = explode(
-            \Magento\CatalogImportExport\Model\Import\Product::PSEUDO_MULTI_LINE_SEPARATOR,
+            Product::PSEUDO_MULTI_LINE_SEPARATOR,
             $rowData['bundle_values']
         );
         foreach ($selections as $selection) {
@@ -343,7 +344,7 @@ public function saveData()
             $newSku = $this->_entityModel->getNewSku();
             while ($bunch = $this->_entityModel->getNextBunch()) {
                 foreach ($bunch as $rowNum => $rowData) {
-                    $productData = $newSku[$rowData[\Magento\CatalogImportExport\Model\Import\Product::COL_SKU]];
+                    $productData = $newSku[strtolower($rowData[Product::COL_SKU])];
                     $productIds[] = $productData[$this->getProductEntityLinkField()];
                 }
                 $this->deleteOptionsAndSelections($productIds);
@@ -355,7 +356,7 @@ public function saveData()
                     if (!$this->_entityModel->isRowAllowedToImport($rowData, $rowNum)) {
                         continue;
                     }
-                    $productData = $newSku[$rowData[\Magento\CatalogImportExport\Model\Import\Product::COL_SKU]];
+                    $productData = $newSku[strtolower($rowData[Product::COL_SKU])];
                     if ($this->_type != $productData['type_id']) {
                         continue;
                     }

app/code/Magento/BundleImportExport/Test/Unit/Model/Import/Product/Type/BundleTest.php

@@ -299,6 +299,11 @@ public function testSaveDataProvider()
                 'bunch' => ['bundle_values' => 'value1', 'sku' => 'sku', 'name' => 'name'],
                 'allowImport' => true
             ],
+            [
+                'skus' => ['newSku' => ['sku' => ['sku' => 'SKU', 'entity_id' => 3, 'type_id' => 'bundle']]],
+                'bunch' => ['bundle_values' => 'value1', 'sku' => 'SKU', 'name' => 'name'],
+                'allowImport' => true
+            ],
             [
                 'skus' => ['newSku' => ['sku' => ['sku' => 'sku', 'entity_id' => 3, 'type_id' => 'simple']]],
                 'bunch' => ['bundle_values' => 'value1', 'sku' => 'sku', 'name' => 'name'],

app/code/Magento/Catalog/Api/Data/EavAttributeInterface.php

@@ -139,6 +139,30 @@ public function getIsVisibleInGrid();
      */
     public function getIsFilterableInGrid();
 
+    /**
+     * Set is attribute used in grid
+     *
+     * @param bool|null $isUsedInGrid
+     * @return $this
+     */
+    public function setIsUsedInGrid($isUsedInGrid);
+
+    /**
+     * Set is attribute visible in grid
+     *
+     * @param bool|null $isVisibleInGrid
+     * @return $this
+     */
+    public function setIsVisibleInGrid($isVisibleInGrid);
+
+    /**
+     * Set is attribute filterable in grid
+     *
+     * @param bool|null $isFilterableInGrid
+     * @return $this
+     */
+    public function setIsFilterableInGrid($isFilterableInGrid);
+
     /**
      * Set whether it is used in search results layered navigation
      *

app/code/Magento/Catalog/Model/Category/Attribute.php

@@ -361,4 +361,31 @@ public function setScope($scope)
             return $this;
         }
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function setIsUsedInGrid($isUsedInGrid)
+    {
+        $this->setData(self::IS_USED_IN_GRID, $isUsedInGrid);
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setIsVisibleInGrid($isVisibleInGrid)
+    {
+        $this->setData(self::IS_VISIBLE_IN_GRID, $isVisibleInGrid);
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setIsFilterableInGrid($isFilterableInGrid)
+    {
+        $this->setData(self::IS_FILTERABLE_IN_GRID, $isFilterableInGrid);
+        return $this;
+    }
 }

app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php

@@ -848,4 +848,31 @@ public function __wakeup()
         $this->_productFlatIndexerHelper = $objectManager->get(\Magento\Catalog\Helper\Product\Flat\Indexer::class);
         $this->attrLockValidator = $objectManager->get(LockValidatorInterface::class);
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function setIsUsedInGrid($isUsedInGrid)
+    {
+        $this->setData(self::IS_USED_IN_GRID, $isUsedInGrid);
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setIsVisibleInGrid($isVisibleInGrid)
+    {
+        $this->setData(self::IS_VISIBLE_IN_GRID, $isVisibleInGrid);
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setIsFilterableInGrid($isFilterableInGrid)
+    {
+        $this->setData(self::IS_FILTERABLE_IN_GRID, $isFilterableInGrid);
+        return $this;
+    }
 }