ACPT-1467: Import downloadable product

Author: adifucan

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

@@ -1157,7 +1157,7 @@ protected function _isReadyForSaving(array &$options, array &$titles, array $typ
     protected function _getMultiRowFormat($rowData)
     {
         if (is_array($rowData['custom_options'])) {
-            $rowData = $this->parseJsonCustomOptions($rowData);
+            $rowData = $this->parseStructuredCustomOptions($rowData);
         } else {
             $rowData = $this->_parseCustomOptions($rowData);
         }
@@ -2089,12 +2089,12 @@ protected function _parseCustomOptions($rowData)
     }
 
     /**
-     * Parse JSON custom options to inner format.
+     * Parse structured custom options to inner format.
      *
      * @param array $rowData
      * @return array
      */
-    private function parseJsonCustomOptions(array $rowData): array
+    private function parseStructuredCustomOptions(array $rowData): array
     {
         if (empty($rowData['custom_options'])) {
             return $rowData;

app/code/Magento/DownloadableImportExport/Helper/Data.php

@@ -20,11 +20,10 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      */
     public function isRowDownloadableEmptyOptions(array $rowData)
     {
-        $result = isset($rowData[Downloadable::COL_DOWNLOADABLE_LINKS])
-            && $rowData[Downloadable::COL_DOWNLOADABLE_LINKS] == ''
-            && isset($rowData[Downloadable::COL_DOWNLOADABLE_SAMPLES])
-            && $rowData[Downloadable::COL_DOWNLOADABLE_SAMPLES] == '';
-        return $result;
+        $links = $rowData[Downloadable::COL_DOWNLOADABLE_LINKS] ?? '';
+        $samples = $rowData[Downloadable::COL_DOWNLOADABLE_SAMPLES] ?? '';
+
+        return empty($links) && empty($samples);
     }
 
     /**