Подержка типа свойства "Файл" (resolve #5)

sukhikh18 · Mar 30, 2020 · 5188a1f · 5188a1f
1 parent 427a503
commit 5188a1f
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 2 deletions.
diff --git a/install/components/opensource/order/class.php b/install/components/opensource/order/class.php
@@ -133,6 +133,26 @@ public function createVirtualOrder(int $personTypeId)
         return $this->order;
     }
 
+    public function getPropertiesFromRequest()
+    {
+        $properties = $this->request['properties'] ?? [];
+        $arFileProperties = $this->request->getFileList()->get('properties');
+
+        if (is_array($arFileProperties)) {
+            foreach ($arFileProperties  as $fileKey => $arFileField) {
+                foreach ($arFileField as $fieldCode => $arFileFieldValue) {
+                    if( ! isset($properties[$fieldCode])) {
+                        $properties[$fieldCode] = array("ID" => '');
+                    }
+                    // @todo Multiple property
+                    $properties[$fieldCode][$fileKey] = current($arFileFieldValue);
+                }
+            }
+        }
+
+        return $properties;
+    }
+
     /**
      * @param array $propertyValues
      * @throws Exception
@@ -374,7 +394,7 @@ public function executeComponent()
         try {
             $this->createVirtualOrder($this->arParams['PERSON_TYPE_ID']);
 
-            $propertiesList = $this->request['properties'] ?? $this->arParams['DEFAULT_PROPERTIES'] ?? [];
+            $propertiesList = $this->getPropertiesFromRequest() ?: $this->arParams['DEFAULT_PROPERTIES'] ?? [];
             if (!empty($propertiesList)) {
                 $this->setOrderProperties($propertiesList);
             }

diff --git a/install/components/opensource/order/templates/.default/form.php b/install/components/opensource/order/templates/.default/form.php
@@ -19,7 +19,7 @@
 /** @var OpenSourceOrderComponent $component */
 
 ?>
-<form action="" method="post" name="os-order-form" id="os-order-form">
+<form action="" method="post" name="os-order-form" id="os-order-form" enctype="multipart/form-data">
 
     <input type="hidden" name="person_type_id" value="<?=$arParams['PERSON_TYPE_ID']?>">
 
@@ -90,6 +90,14 @@
                             <?
                             break;
 
+                        case 'FILE':
+                            ?>
+                            <input id="<?= $arProp['FORM_LABEL'] ?>" type="file"
+                                   name="<?= $arProp['FORM_NAME'] ?>"
+                                   value="<?= $arProp['VALUE'] ?>">
+                            <?
+                            break;
+
                         default:
                             ?>
                             <input id="<?= $arProp['FORM_LABEL'] ?>" type="text"