MC-35717: Admin can not add a Product with a Customizable Option (File) to Order by SKU

Author: SmVladyslav

app/code/Magento/Catalog/Model/Product/Option/Type/File.php

@@ -6,10 +6,11 @@
 
 namespace Magento\Catalog\Model\Product\Option\Type;
 
+use Magento\Catalog\Model\Product\Exception as ProductException;
+use Magento\Catalog\Helper\Product as ProductHelper;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Catalog\Model\Product\Exception as ProductException;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Framework\App\ObjectManager;
 
@@ -91,6 +92,11 @@ class File extends \Magento\Catalog\Model\Product\Option\Type\DefaultType
      */
     private $filesystem;
 
+    /**
+     * @var ProductHelper
+     */
+    private $productHelper;
+
     /**
      * @param \Magento\Checkout\Model\Session $checkoutSession
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -103,6 +109,7 @@ class File extends \Magento\Catalog\Model\Product\Option\Type\DefaultType
      * @param array $data
      * @param Filesystem $filesystem
      * @param Json|null $serializer
+     * @param ProductHelper|null $productHelper
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -116,7 +123,8 @@ public function __construct(
         \Magento\Framework\Escaper $escaper,
         array $data = [],
         Filesystem $filesystem = null,
-        Json $serializer = null
+        Json $serializer = null,
+        ProductHelper $productHelper = null
     ) {
         $this->_itemOptionFactory = $itemOptionFactory;
         $this->_urlBuilder = $urlBuilder;
@@ -129,6 +137,7 @@ public function __construct(
         $this->validatorInfo = $validatorInfo;
         $this->validatorFile = $validatorFile;
         $this->serializer = $serializer ?: ObjectManager::getInstance()->get(Json::class);
+        $this->productHelper = $productHelper ?: ObjectManager::getInstance()->get(ProductHelper::class);
         parent::__construct($checkoutSession, $scopeConfig, $data);
     }
 
@@ -223,6 +232,12 @@ public function validateUserValue($values)
         $this->setIsValid(true);
         $option = $this->getOption();
 
+        if (isset($values['files_prefix'])) {
+            $processingParams = ['files_prefix' => $values['files_prefix']];
+            $processingParams = array_merge($this->_getProcessingParams()->getData(), $processingParams);
+            $this->productHelper->addParamsToBuyRequest($this->getRequest(), $processingParams);
+        }
+
         /*
          * Check whether we receive uploaded file or restore file by: reorder/edit configuration or
          * previous configuration with no newly uploaded file

app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml

@@ -581,6 +581,10 @@
         <var key="sku" entityType="product" entityKey="sku" />
         <requiredEntity type="product_option">ProductOptionValueDropdown</requiredEntity>
     </entity>
+    <entity name="productWithFileOption" type="product">
+        <var key="sku" entityType="product" entityKey="sku" />
+        <requiredEntity type="product_option">ProductOptionFile</requiredEntity>
+    </entity>
     <entity name="productWithDropdownAndFieldOptions" type="product">
         <var key="sku" entityType="product" entityKey="sku" />
         <requiredEntity type="product_option">ProductOptionValueDropdown</requiredEntity>

app/code/Magento/Catalog/view/adminhtml/web/catalog/product/composite/configure.js

@@ -607,6 +607,7 @@ define([
          * @param method can be 'item_confirm', 'item_restore', 'current_confirmed_to_form', 'form_confirmed_to_confirmed'
          */
         _processFieldsData: function (method) {
+            var self = this;
 
             /**
              * Internal function for rename fields names of some list type
@@ -652,6 +653,11 @@ define([
                     for (var i = 0; i < elms.length; i++) {
                         if (elms[i].name && elms[i].type == 'file') {
                             elms[i].name = elms[i].name.replace(patternFlat, replacementFlat);
+                            self.blockFormFields.insert(new Element('input', {
+                                type: 'hidden',
+                                name: 'options[files_prefix]'.replace(pattern, replacement),
+                                value: 'item_' + itemId + '_'
+                            }));
                         } else if (elms[i].name) {
                             elms[i].name = elms[i].name.replace(pattern, replacement);
                         }