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

@@ -1504,6 +1504,7 @@ protected function _collectOptionTypeData(
             $specificTypeData = $this->_getSpecificTypeData($rowData, 0, false);
             //For others stores
             if ($specificTypeData) {
+                $typePrices[$nextValueId][$this->_rowStoreId] = $specificTypeData['price'];
                 $typeTitles[$nextValueId++][$this->_rowStoreId] = $specificTypeData['title'];
             }
         }
@@ -1788,29 +1789,30 @@ protected function _getPriceData(array $rowData, $optionId, $type)
      */
     protected function _getSpecificTypeData(array $rowData, $optionTypeId, $defaultStore = true)
     {
+        $data = false;
+        $priceData = false;
+        $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';
+            }
+        }
         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] : '',
             ];
-
-            $priceData = false;
-            $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';
-                }
-            }
-            return ['value' => $valueData, 'title' => $rowData[self::COLUMN_ROW_TITLE], 'price' => $priceData];
+            $data =  ['value' => $valueData, 'title' => $rowData[self::COLUMN_ROW_TITLE], 'price' => $priceData];
         } elseif (!empty($rowData[self::COLUMN_ROW_TITLE]) && !$defaultStore && !empty($rowData[self::COLUMN_STORE])) {
-            return ['title' => $rowData[self::COLUMN_ROW_TITLE]];
+            $data =  ['title' => $rowData[self::COLUMN_ROW_TITLE], 'price' => $priceData];
         }
-        return false;
+
+        return $data;
     }
 
     /**
@@ -1868,7 +1870,9 @@ protected function _saveTitles(array $titles)
     {
         $titleRows = [];
         foreach ($titles as $optionId => $storeInfo) {
-            foreach ($storeInfo as $storeId => $title) {
+            //for use default
+            $uniqStoreInfo = array_unique($storeInfo);
+            foreach ($uniqStoreInfo as $storeId => $title) {
                 $titleRows[] = ['option_id' => $optionId, 'store_id' => $storeId, 'title' => $title];
             }
         }
@@ -1963,7 +1967,9 @@ protected function _saveSpecificTypeTitles(array $typeTitles)
     {
         $optionTypeTitleRows = [];
         foreach ($typeTitles as $optionTypeId => $storesData) {
-            foreach ($storesData as $storeId => $title) {
+            //for use default
+            $uniqStoresData = array_unique($storesData);
+            foreach ($uniqStoresData as $storeId => $title) {
                 $optionTypeTitleRows[] = [
                     'option_type_id' => $optionTypeId,
                     'store_id' => $storeId,