Merge remote-tracking branch 'origin/MAGETWO-91283' into 2.2-develop-pr47

Author: zakdma

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

@@ -336,6 +336,11 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      */
     private $optionTypeTitles;
 
+    /**
+     * @var array
+     */
+    private $lastOptionTitle;
+
     /**
      * @param \Magento\ImportExport\Model\ResourceModel\Import\Data $importData
      * @param ResourceConnection $resource
@@ -1119,6 +1124,8 @@ protected function _getMultiRowFormat($rowData)
     }
 
     /**
+     * Process option row.
+     *
      * @param string $name
      * @param array $optionRow
      * @return array
@@ -1185,6 +1192,7 @@ private function addFileOptions($result, $optionRow)
 
     /**
      * Import data rows.
+     *
      * Additional store view data (option titles) will be sought in store view specified import file rows
      *
      * @return boolean
@@ -1212,7 +1220,6 @@ protected function _importData()
             $parentCount = [];
             $childCount = [];
             $optionsToRemove = [];
-
             foreach ($bunch as $rowNumber => $rowData) {
                 if (isset($optionId, $valueId) && empty($rowData[Product::COL_STORE_VIEW_CODE])) {
                     $nextOptionId = $optionId;
@@ -1257,9 +1264,17 @@ protected function _importData()
                         $childCount
                     );
                     $this->_collectOptionTitle($combinedData, $prevOptionId, $titles);
+                    $this->checkOptionTitles(
+                        $options,
+                        $titles,
+                        $combinedData,
+                        $prevOptionId,
+                        $optionId,
+                        $products,
+                        $prices
+                    );
                 }
             }
-
             // Remove all existing options if import behaviour is APPEND
             // in other case remove options for products with empty "custom_options" row only
             if ($this->getBehavior() != \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND) {
@@ -1268,21 +1283,80 @@ protected function _importData()
                 // Remove options for products with empty "custom_options" row
                 $this->_deleteEntities($optionsToRemove);
             }
-
             // Save prepared custom options data
             if ($this->_isReadyForSaving($options, $titles, $typeValues)) {
                 $types = [
                     'values' => $typeValues,
                     'prices' => $typePrices,
                     'titles' => $typeTitles
                 ];
+                $this->setLastOptionTitle($titles);
                 $this->savePreparedCustomOptions($products, $options, $titles, $prices, $types);
             }
         }
 
         return true;
     }
 
+    /**
+     * Check options titles.
+     *
+     * If products were split up between bunches,
+     * this function will add needed option for option titles.
+     *
+     * @param array $options
+     * @param array $titles
+     * @param array $combinedData
+     * @param int $prevOptionId
+     * @param int $optionId
+     * @param array $products
+     * @param array $prices
+     * @return void
+     */
+    private function checkOptionTitles(
+        array &$options,
+        array &$titles,
+        array $combinedData,
+        int &$prevOptionId,
+        int &$optionId,
+        array $products,
+        array $prices
+    ) {
+        $titlesCount = count($titles);
+        if ($titlesCount > 0 && count($options) !== $titlesCount) {
+            $combinedData[Product::COL_STORE_VIEW_CODE] = '';
+            $optionId--;
+            $option = $this->_collectOptionMainData(
+                $combinedData,
+                $prevOptionId,
+                $optionId,
+                $products,
+                $prices
+            );
+            if ($option) {
+                $options[] = $option;
+            }
+        }
+    }
+
+    /**
+     * Setting last Custom Option Title
+     * to use it later in _collectOptionTitle
+     * to set correct title for default store view.
+     *
+     * @param array $titles
+     * @return void
+     */
+    private function setLastOptionTitle(array &$titles)
+    {
+        if (count($titles) > 0) {
+            end($titles);
+            $key = key($titles);
+            $this->lastOptionTitle[$key] = $titles[$key];
+        }
+    }
+
+
     /**
      * Load data of existed products
      *
@@ -1413,8 +1487,12 @@ protected function _collectOptionTitle(array $rowData, $prevOptionId, array &$ti
         $defaultStoreId = Store::DEFAULT_STORE_ID;
         if (!empty($rowData[self::COLUMN_TITLE])) {
             if (!isset($titles[$prevOptionId][$defaultStoreId])) {
-                // ensure default title is set
-                $titles[$prevOptionId][$defaultStoreId] = $rowData[self::COLUMN_TITLE];
+                if (isset($this->lastOptionTitle[$prevOptionId])) {
+                     $titles[$prevOptionId] = $this->lastOptionTitle[$prevOptionId];
+                     unset($this->lastOptionTitle);
+                } else {
+                    $titles[$prevOptionId][$defaultStoreId] = $rowData[self::COLUMN_TITLE];
+                }
             }
             $titles[$prevOptionId][$this->_rowStoreId] = $rowData[self::COLUMN_TITLE];
         }