MC-18472: Product with different custom option prices in different scope overrides to default on import

Author: rostyslav-hymon

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

@@ -669,6 +669,7 @@ protected function _findNewOptionsWithTheSameTitles()
      *
      * @param array $sourceProductData
      * @return array
+     * phpcs:disable Generic.Metrics.NestingLevel
      */
     protected function _getNewOptionsWithTheSameTitlesErrorRows(array $sourceProductData)
     {
@@ -697,6 +698,7 @@ protected function _getNewOptionsWithTheSameTitlesErrorRows(array $sourceProduct
      * Find options with the same titles in DB
      *
      * @return array
+     * phpcs:disable Generic.Metrics.NestingLevel
      */
     protected function _findOldOptionsWithTheSameTitles()
     {
@@ -730,6 +732,7 @@ protected function _findOldOptionsWithTheSameTitles()
      * Find source file options, which have analogs in DB with the same name, but with different type
      *
      * @return array
+     * phpcs:disable Generic.Metrics.NestingLevel
      */
     protected function _findNewOldOptionsTypeMismatch()
     {
@@ -1067,7 +1070,7 @@ protected function _isSecondaryOptionRow(array $rowData)
      *
      * @param array &$options
      * @param array &$titles
-     * @param array $typeValues
+     * @param array  $typeValues
      * @return bool
      */
     protected function _isReadyForSaving(array &$options, array &$titles, array $typeValues)
@@ -1414,9 +1417,9 @@ protected function _initProductsSku()
     /**
      * Collect custom option main data to import
      *
-     * @param array $rowData
-     * @param int &$prevOptionId
-     * @param int &$nextOptionId
+     * @param array  $rowData
+     * @param int   &$prevOptionId
+     * @param int   &$nextOptionId
      * @param array &$products
      * @param array &$prices
      * @return array|null
@@ -1454,9 +1457,9 @@ protected function _collectOptionMainData(
     /**
      * Collect custom option type data to import
      *
-     * @param array $rowData
-     * @param int &$prevOptionId
-     * @param int &$nextValueId
+     * @param array  $rowData
+     * @param int   &$prevOptionId
+     * @param int   &$nextValueId
      * @param array &$typeValues
      * @param array &$typePrices
      * @param array &$typeTitles
@@ -1504,7 +1507,9 @@ protected function _collectOptionTypeData(
             $specificTypeData = $this->_getSpecificTypeData($rowData, 0, false);
             //For others stores
             if ($specificTypeData) {
-                $typePrices[$nextValueId][$this->_rowStoreId] = $specificTypeData['price'];
+                if (isset($specificTypeData['price'])) {
+                    $typePrices[$nextValueId][$this->_rowStoreId] = $specificTypeData['price'];
+                }
                 $typeTitles[$nextValueId++][$this->_rowStoreId] = $specificTypeData['title'];
             }
         }
@@ -1513,8 +1518,8 @@ protected function _collectOptionTypeData(
     /**
      * Collect custom option title to import
      *
-     * @param array $rowData
-     * @param int $prevOptionId
+     * @param array  $rowData
+     * @param int    $prevOptionId
      * @param array &$titles
      * @return void
      */
@@ -1789,30 +1794,30 @@ protected function _getPriceData(array $rowData, $optionId, $type)
      */
     protected function _getSpecificTypeData(array $rowData, $optionTypeId, $defaultStore = true)
     {
-        $data = false;
-        $priceData = false;
+        $data = [];
+        $priceData = [];
         $customOptionRowPrice = $rowData[self::COLUMN_ROW_PRICE];
         if (!empty($customOptionRowPrice) || $customOptionRowPrice === '0') {
-            $priceData = [
-                'price' => (double)rtrim($rowData[self::COLUMN_ROW_PRICE], '%'),
-                'price_type' => 'fixed',
-            ];
-            if ('%' == substr($rowData[self::COLUMN_ROW_PRICE], -1)) {
-                $priceData['price_type'] = 'percent';
-            }
+            $priceData['price'] = (double)rtrim($rowData[self::COLUMN_ROW_PRICE], '%');
+            $priceData['price_type'] = ('%' == substr($rowData[self::COLUMN_ROW_PRICE], -1)) ? 'percent' : 'fixed';
         }
         if (!empty($rowData[self::COLUMN_ROW_TITLE]) && $defaultStore && empty($rowData[self::COLUMN_STORE])) {
             $valueData = [
                 'option_type_id' => $optionTypeId,
                 'sort_order' => empty($rowData[self::COLUMN_ROW_SORT]) ? 0 : abs($rowData[self::COLUMN_ROW_SORT]),
                 'sku' => !empty($rowData[self::COLUMN_ROW_SKU]) ? $rowData[self::COLUMN_ROW_SKU] : '',
             ];
-            $data =  ['value' => $valueData, 'title' => $rowData[self::COLUMN_ROW_TITLE], 'price' => $priceData];
+            $data['value'] = $valueData;
+            $data['title'] = $rowData[self::COLUMN_ROW_TITLE];
+            $data['price'] = $priceData;
         } elseif (!empty($rowData[self::COLUMN_ROW_TITLE]) && !$defaultStore && !empty($rowData[self::COLUMN_STORE])) {
-            $data =  ['title' => $rowData[self::COLUMN_ROW_TITLE], 'price' => $priceData];
+            if ($priceData) {
+                $data['price'] = $priceData;
+            }
+            $data['title'] = $rowData[self::COLUMN_ROW_TITLE];
         }
 
-        return $data;
+        return $data ?: false;
     }
 
     /**