ACP2E-2028: [Cloud] Import of customizable options not working

Author: glo23503

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

@@ -1305,14 +1305,17 @@ protected function _importData()
                     ? mb_strtolower($rowData[self::COLUMN_SKU])
                     : '';
 
+                $multiRowData = $this->_getMultiRowFormat($rowData);
                 if ($rowSku !== $prevRowSku) {
                     $nextOptionId = $optionId ?? $nextOptionId;
                     $nextValueId = $valueId ?? $nextValueId;
                     $prevRowSku = $rowSku;
+                } elseif (count($multiRowData) === 0) {
+                    $nextOptionId += $optionCount;
+                    $nextValueId += $valueCount;
                 }
                 $optionId = $nextOptionId;
                 $valueId = $nextValueId;
-                $multiRowData = $this->_getMultiRowFormat($rowData);
                 if (!empty($rowData[self::COLUMN_SKU]) && isset($this->_productsSkuToId[$rowData[self::COLUMN_SKU]])) {
                     $this->_rowProductId = $this->_productsSkuToId[$rowData[self::COLUMN_SKU]];
                     if (array_key_exists('custom_options', $rowData)
@@ -1326,6 +1329,7 @@ protected function _importData()
                     }
                 }
 
+                $optionCount = $valueCount = 0;
                 foreach ($multiRowData as $combinedData) {
                     foreach ($rowData as $key => $field) {
                         $combinedData[$key] = $field;
@@ -1344,6 +1348,7 @@ protected function _importData()
                     );
                     if ($optionData) {
                         $options[$optionData['option_id']] = $optionData;
+                        $optionCount++;
                     }
                     $this->_collectOptionTypeData(
                         $combinedData,
@@ -1355,6 +1360,7 @@ protected function _importData()
                         $parentCount,
                         $childCount
                     );
+                    $valueCount++;
 
                     $this->_collectOptionTitle($combinedData, $prevOptionId, $titles);
                 }

dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest/ProductOptionsTest.php

@@ -816,7 +816,7 @@ function ($input) {
      */
     protected function mergeWithExistingData(
         array $expected,
-        $options
+              $options
     ) {
         $expectedOptionId = $expected['id'];
         $expectedOptions = $expected['options'];