From 3d3326018aa0ca7f10080cb777a42f65895e1930 Mon Sep 17 00:00:00 2001
From: Kocmonavtik <61938582+Kocmonavtik@users.noreply.github.com>
Date: Thu, 21 Dec 2023 15:09:31 +0300
Subject: [PATCH] =?UTF-8?q?ref=20#92774=20=D0=98=D1=81=D0=BF=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=BE=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80?=
 =?UTF-8?q?=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=B0=D1=81=D1=82?=
 =?UTF-8?q?=D1=80=D0=BE=D0=B9=D0=BA=D0=B8=20=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D1=8C=D1=81=D0=BA=D0=B8?=
 =?UTF-8?q?=D1=85=20=D0=BF=D0=BE=D0=BB=D0=B5=D0=B9=20(#329)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                         |  3 +++
 intaro.retailcrm/description.ru      |  2 +-
 intaro.retailcrm/install/version.php |  4 ++--
 intaro.retailcrm/options.php         | 18 ++++++------------
 4 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 45b77ce6..7048c162 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 2023-12-21 v.6.5.1
+- Исправлено отображение настройки пользовательских полей
+
 ## 2023-12-18 v.6.5.0
 - Добавлена поддержка функционала пользовательских полей
 
diff --git a/intaro.retailcrm/description.ru b/intaro.retailcrm/description.ru
index 7216b5f5..f2a70663 100644
--- a/intaro.retailcrm/description.ru
+++ b/intaro.retailcrm/description.ru
@@ -1 +1 @@
-- Добавлена поддержка функционала пользовательских полей
+- Исправлено отображение настройки пользовательских полей
diff --git a/intaro.retailcrm/install/version.php b/intaro.retailcrm/install/version.php
index 85150f47..863033da 100644
--- a/intaro.retailcrm/install/version.php
+++ b/intaro.retailcrm/install/version.php
@@ -1,6 +1,6 @@
 <?php
 
 $arModuleVersion = [
-    'VERSION'      => '6.5.0',
-    'VERSION_DATE' => '2023-12-18 13:00:00'
+    'VERSION'      => '6.5.1',
+    'VERSION_DATE' => '2023-12-21 15:00:00'
 ];
diff --git a/intaro.retailcrm/options.php b/intaro.retailcrm/options.php
index 39365c1c..2d0a7f0e 100644
--- a/intaro.retailcrm/options.php
+++ b/intaro.retailcrm/options.php
@@ -2434,14 +2434,11 @@ if (isset($_POST['Update']) && ($_POST['Update'] === 'Y')) {
                         name="bitrixOrderFields"
                         onchange="changeSelectBitrixValue(this, 'bitrixOrderFields_', 'crmOrderFields_');"
                 >
-                    <option value=""></option>
+                    <option value="" selected></option>
                     <?php foreach ($arResult['bitrixOrdersCustomProp'] as $type => $mass) {?>
                         <optgroup label="<?php echo GetMessage($type); ?>">
                             <?php foreach ($mass as $code => $prop) {?>
-                                <option
-                                        value="<?php echo $code ?>"
-                                    <?php if ($bitrixProp === $code) echo 'selected'; ?>
-                                >
+                                <option value="<?php echo $code ?>">
                                     <?php echo $prop ?>
                                 </option>
                             <?php } ?>
@@ -2457,14 +2454,11 @@ if (isset($_POST['Update']) && ($_POST['Update'] === 'Y')) {
                         name="crmOrderFields"
                         onchange="changeSelectCrmValue(this, 'crmOrder_')"
                 >
-                    <option value=""></option>
+                    <option value="" selected></option>
                     <?php foreach ($arResult['crmCustomOrderFields'] as $type => $mass) {?>
                         <optgroup label="<?php echo GetMessage($type); ?>">
                             <?php foreach ($mass as $crmProp) {?>
-                                <option
-                                        value="<?php echo $crmProp['code'] ?>"
-                                    <?php if ($crmField === $crmProp['code']) echo 'selected'; ?>
-                                >
+                                <option value="<?php echo $crmProp['code'] ?>">
                                     <?php echo $crmProp['name'] ?>
                                 </option>
                             <?php } ?>
@@ -2483,7 +2477,7 @@ if (isset($_POST['Update']) && ($_POST['Update'] === 'Y')) {
                         name="bitrixUserFields"
                         onchange="changeSelectBitrixValue(this, 'bitrixUserFields_', 'crmUserFields_');"
                 >
-                    <option value=""></option>
+                    <option value="" selected></option>
                     <?php foreach ($arResult['bitrixCustomUserFields'] as $type => $mass) {?>
                         <optgroup label="<?php echo GetMessage($type); ?>">
                             <?php foreach ($mass as $code => $prop) {?>
@@ -2502,7 +2496,7 @@ if (isset($_POST['Update']) && ($_POST['Update'] === 'Y')) {
                         name="crmUserFields"
                         onchange="changeSelectCrmValue(this, 'crmClient_')"
                 >
-                    <option value=""></option>
+                    <option value="" selected></option>
                     <?php foreach ($arResult['crmCustomUserFields'] as $type => $mass) {?>
                         <optgroup label="<?php echo GetMessage($type); ?>">
                             <?php foreach ($mass as $crmProp) {?>