From 2724bc1bd3d25f40c199f12a9783b31a89d9907e Mon Sep 17 00:00:00 2001
From: nikolays93 <nikolays93@ya.ru>
Date: Thu, 5 Mar 2020 22:49:02 +0400
Subject: [PATCH 1/4] =?UTF-8?q?=D0=9F=D0=BE=D0=BB=D1=8F=20"=D0=BF=D0=BE=20?=
 =?UTF-8?q?=D1=83=D0=BC=D0=BE=D0=BB=D1=87=D0=B0=D0=BD=D0=B8=D1=8E"=20?=
 =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D1=83=D0=B4=D0=BE=D0=B1=D0=BD=D0=BE=D0=B9?=
 =?UTF-8?q?=20=D1=81=D0=B5=D1=80=D0=B8=D0=B0=D0=BB=D0=B8=D0=B7=D0=B0=D1=86?=
 =?UTF-8?q?=D0=B8=D0=B8=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20=D1=84?=
 =?UTF-8?q?=D0=BE=D1=80=D0=BC=D1=8B.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../opensource/order/templates/.default/form.php       | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/install/components/opensource/order/templates/.default/form.php b/install/components/opensource/order/templates/.default/form.php
index 194c9ba..2519344 100644
--- a/install/components/opensource/order/templates/.default/form.php
+++ b/install/components/opensource/order/templates/.default/form.php
@@ -99,8 +99,9 @@
         /** @var Error $error */
         ?>
         <div class="error"><?= $error->getMessage() ?></div>
-    <? endforeach;
-    foreach ($arResult['DELIVERY_LIST'] as $arDelivery):?>
+    <? endforeach; ?>
+    <input type="hidden" name="delivery_id" value="0">
+    <? foreach ($arResult['DELIVERY_LIST'] as $arDelivery):?>
         <label>
             <input type="radio" name="delivery_id"
                    value="<?= $arDelivery['ID'] ?>"
@@ -117,8 +118,9 @@
         /** @var Error $error */
         ?>
         <div class="error"><?= $error->getMessage() ?></div>
-    <? endforeach;
-    foreach ($arResult['PAY_SYSTEM_LIST'] as $arPaySystem): ?>
+    <? endforeach; ?>
+    <input type="hidden" name="pay_system_id" value="0">
+    <? foreach ($arResult['PAY_SYSTEM_LIST'] as $arPaySystem): ?>
         <label>
             <input type="radio" name="pay_system_id"
                    value="<?= $arPaySystem['ID'] ?>"

From c74cd3edc24a472f891de95b0347d9f795a16171 Mon Sep 17 00:00:00 2001
From: nikolays93 <nikolays93@ya.ru>
Date: Thu, 5 Mar 2020 22:51:34 +0400
Subject: [PATCH 2/4] =?UTF-8?q?=D0=9F=D1=80=D0=B8=D0=BC=D0=B5=D1=80=20Ajax?=
 =?UTF-8?q?=20=D0=BE=D1=82=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=B7?=
 =?UTF-8?q?=D0=B0=D0=BA=D0=B0=D0=B7=D0=B0.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/templates/.default/script.js        | 28 +++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/install/components/opensource/order/templates/.default/script.js b/install/components/opensource/order/templates/.default/script.js
index b13cb6a..700bfdc 100644
--- a/install/components/opensource/order/templates/.default/script.js
+++ b/install/components/opensource/order/templates/.default/script.js
@@ -1,5 +1,29 @@
-$(document).ready(function () {
-    $('.location-search').selectize({
+jQuery(document).ready(function($) {
+    var $orderForm = $('[name="os-order-form"]'),
+        $location = $('.location-search', $orderForm);
+
+    $orderForm.on('submit', function(e) {
+        e.preventDefault();
+
+        var query = {
+            c: 'opensource:order',
+            action: 'saveOrder',
+            mode: 'ajax'
+        };
+
+        $.ajax({
+            url: '/bitrix/services/main/ajax.php?' + $.param(query, true),
+            type: 'POST',
+            dataType: 'json',
+            data: $orderForm.serialize(),
+            success: function (res) {
+                console.log(res)
+                alert('Check request results in console!');
+            }
+        });
+    });
+
+    $location.selectize({
         valueField: 'code',
         labelField: 'label',
         searchField: 'label',

From b8e349cf2c4d0ced1b846ad3565d65f9087fec73 Mon Sep 17 00:00:00 2001
From: nikolays93 <nikolays93@ya.ru>
Date: Fri, 6 Mar 2020 15:26:54 +0400
Subject: [PATCH 3/4] =?UTF-8?q?=D0=97=D0=BD=D0=B0=D1=87=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F=20"=D0=A1=D0=BB=D1=83=D0=B6=D0=B1=D1=8B=20=D0=B4=D0=BE?=
 =?UTF-8?q?=D1=81=D1=82=D0=B0=D0=B2=D0=BA=D0=B8"=20=D0=B8=20"=D0=9F=D0=BB?=
 =?UTF-8?q?=D0=B0=D1=82=D0=B5=D0=B6=D0=BD=D1=8B=D0=B5=20=D1=81=D0=B8=D1=81?=
 =?UTF-8?q?=D1=82=D0=B5=D0=BC=D1=8B"=20=D0=BF=D0=BE=20=D1=83=D0=BC=D0=BE?=
 =?UTF-8?q?=D0=BB=D1=87=D0=B0=D0=BD=D0=B8=D1=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/opensource/order/templates/.default/form.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install/components/opensource/order/templates/.default/form.php b/install/components/opensource/order/templates/.default/form.php
index 2519344..6183639 100644
--- a/install/components/opensource/order/templates/.default/form.php
+++ b/install/components/opensource/order/templates/.default/form.php
@@ -100,7 +100,7 @@
         ?>
         <div class="error"><?= $error->getMessage() ?></div>
     <? endforeach; ?>
-    <input type="hidden" name="delivery_id" value="0">
+    <input type="hidden" name="delivery_id" value="<?= $arParams['DEFAULT_DELIVERY_ID'] ?>">
     <? foreach ($arResult['DELIVERY_LIST'] as $arDelivery):?>
         <label>
             <input type="radio" name="delivery_id"
@@ -119,7 +119,7 @@
         ?>
         <div class="error"><?= $error->getMessage() ?></div>
     <? endforeach; ?>
-    <input type="hidden" name="pay_system_id" value="0">
+    <input type="hidden" name="pay_system_id" value="<?= $arParams['DEFAULT_PAY_SYSTEM_ID'] ?>">
     <? foreach ($arResult['PAY_SYSTEM_LIST'] as $arPaySystem): ?>
         <label>
             <input type="radio" name="pay_system_id"

From ac5d76b281b36fdb302a39207f3bb9218cf78234 Mon Sep 17 00:00:00 2001
From: nikolays93 <nikolays93@ya.ru>
Date: Mon, 30 Mar 2020 13:49:14 +0400
Subject: [PATCH 4/4] =?UTF-8?q?=D0=A0=D0=B0=D0=B7=D0=B3=D1=80=D1=83=D0=B7?=
 =?UTF-8?q?=D0=BA=D0=B0=20=D0=BF=D1=80=D0=B5=D0=B4=D1=81=D1=82=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/opensource/order/templates/.default/form.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install/components/opensource/order/templates/.default/form.php b/install/components/opensource/order/templates/.default/form.php
index 6183639..bac7748 100644
--- a/install/components/opensource/order/templates/.default/form.php
+++ b/install/components/opensource/order/templates/.default/form.php
@@ -21,6 +21,8 @@
 <form action="" method="post" name="os-order-form" id="os-order-form">
 
     <input type="hidden" name="person_type_id" value="<?=$arParams['PERSON_TYPE_ID']?>">
+    <input type="hidden" name="delivery_id" value="<?= $arParams['DEFAULT_DELIVERY_ID'] ?>">
+    <input type="hidden" name="pay_system_id" value="<?= $arParams['DEFAULT_PAY_SYSTEM_ID'] ?>">
 
     <h2><?= Loc::getMessage('OPEN_SOURCE_ORDER_TEMPLATE_PROPERTIES_TITLE')?>:</h2>
     <table>
@@ -100,7 +102,6 @@
         ?>
         <div class="error"><?= $error->getMessage() ?></div>
     <? endforeach; ?>
-    <input type="hidden" name="delivery_id" value="<?= $arParams['DEFAULT_DELIVERY_ID'] ?>">
     <? foreach ($arResult['DELIVERY_LIST'] as $arDelivery):?>
         <label>
             <input type="radio" name="delivery_id"
@@ -119,7 +120,6 @@
         ?>
         <div class="error"><?= $error->getMessage() ?></div>
     <? endforeach; ?>
-    <input type="hidden" name="pay_system_id" value="<?= $arParams['DEFAULT_PAY_SYSTEM_ID'] ?>">
     <? foreach ($arResult['PAY_SYSTEM_LIST'] as $arPaySystem): ?>
         <label>
             <input type="radio" name="pay_system_id"