Merge branch 'MAGNIMEX-195-' into 'master'

Magnimex 195

See merge request !152

Author: kalashnikau-uladzimir

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

@@ -238,6 +238,7 @@ protected function parseOption($values)
     protected function populateOptionTemplate($option, $entityId, $index = null)
     {
         $populatedOption = [
+            'option_id' => null,
             'parent_id' => $entityId,
             'required' => isset($option['required']) ? $option['required'] : 1,
             'position' => ($index === null ? 0 : $index),

app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php

@@ -817,6 +817,10 @@ public function saveData()
         }
 
         while ($bunch = $this->_entityModel->getNextBunch()) {
+            if (!$this->configurableInBunch($bunch)) {
+                continue;
+            }
+
             $this->_superAttributesData = [
                 'attributes' => [],
                 'labels' => [],
@@ -860,6 +864,24 @@ public function saveData()
         return $this;
     }
 
+    /**
+     * @param $bunch
+     * @return bool
+     */
+    protected function configurableInBunch($bunch)
+    {
+        $newSku = $this->_entityModel->getNewSku();
+        foreach ($bunch as $rowNum => $rowData) {
+            $productData = $newSku[$rowData[\Magento\CatalogImportExport\Model\Import\Product::COL_SKU]];
+            if (($this->_type == $productData['type_id']) &&
+                ($rowData == $this->_entityModel->isRowAllowedToImport($rowData, $rowNum))
+            ) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     /**
      * Validate row attributes. Pass VALID row data ONLY as argument.
      *