From d52974c7d156f3b7725850d4dfa9b35abb2a56ff Mon Sep 17 00:00:00 2001
From: Vlad <48670792+Mozgito@users.noreply.github.com>
Date: Fri, 1 Jul 2022 15:47:59 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B4=D0=B0?=
 =?UTF-8?q?=D1=87=D0=B8=20=D0=BA=D0=BE=D1=80=D0=BF=D0=BE=D1=80=D0=B0=D1=82?=
 =?UTF-8?q?=D0=B8=D0=B2=D0=BD=D1=8B=D1=85=20=D0=BA=D0=BB=D0=B8=D0=B5=D0=BD?=
 =?UTF-8?q?=D1=82=D0=BE=D0=B2=20(#260)?=
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/lib/component/configprovider.php | 4 ++--
 intaro.retailcrm/options.php                      | 8 ++++----
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ce1be4cf..cccb834a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 2022-07-01 v.6.1.2
+- Исправление передачи корпоративных клиентов
+
 ## 2022-06-28 v.6.1.1
 - Исправлена ошибка при удалении модуля
 
diff --git a/intaro.retailcrm/description.ru b/intaro.retailcrm/description.ru
index ed223332..23f37f91 100644
--- a/intaro.retailcrm/description.ru
+++ b/intaro.retailcrm/description.ru
@@ -1 +1 @@
-- Исправлена ошибка при удалении модуля
\ No newline at end of file
+- Исправление передачи корпоративных клиентов
\ No newline at end of file
diff --git a/intaro.retailcrm/install/version.php b/intaro.retailcrm/install/version.php
index 69e40396..ac51fb0b 100644
--- a/intaro.retailcrm/install/version.php
+++ b/intaro.retailcrm/install/version.php
@@ -1,6 +1,6 @@
 <?php
 
 $arModuleVersion = [
-    'VERSION'      => '6.1.1',
-    'VERSION_DATE' => '2022-06-28 17:00:00'
+    'VERSION'      => '6.1.2',
+    'VERSION_DATE' => '2022-07-01 15:00:00'
 ];
diff --git a/intaro.retailcrm/lib/component/configprovider.php b/intaro.retailcrm/lib/component/configprovider.php
index bf5b941d..3a9c4cf1 100644
--- a/intaro.retailcrm/lib/component/configprovider.php
+++ b/intaro.retailcrm/lib/component/configprovider.php
@@ -279,7 +279,7 @@ class ConfigProvider
     public static function getCorporateClientName()
     {
         if (self::isEmptyNotZero(static::$corporateClientName)) {
-            static::$corporateClientName = static::getUnserializedOption(Constants::CRM_CORP_NAME);
+            static::$corporateClientName = static::getOption(Constants::CRM_CORP_NAME);
         }
 
         return static::$corporateClientName;
@@ -293,7 +293,7 @@ class ConfigProvider
     public static function getCorporateClientAddress()
     {
         if (self::isEmptyNotZero(static::$corporateClientAddress)) {
-            static::$corporateClientAddress = static::getUnserializedOption(Constants::CRM_CORP_ADDRESS);
+            static::$corporateClientAddress = static::getOption(Constants::CRM_CORP_ADDRESS);
         }
 
         return static::$corporateClientAddress;
diff --git a/intaro.retailcrm/options.php b/intaro.retailcrm/options.php
index f9e05b3c..555daad6 100644
--- a/intaro.retailcrm/options.php
+++ b/intaro.retailcrm/options.php
@@ -798,12 +798,12 @@ if (isset($_POST['Update']) && ($_POST['Update'] === 'Y')) {
     COption::SetOptionString(
         $mid,
         $CRM_CORP_NAME,
-        serialize(RCrmActions::clearArr(is_array($bitrixCorpName) ? $bitrixCorpName : []))
+        $bitrixCorpName
     );
     COption::SetOptionString(
         $mid,
         $CRM_CORP_ADRES,
-        serialize(RCrmActions::clearArr(is_array($bitrixCorpAdres) ? $bitrixCorpAdres : []))
+        $bitrixCorpAdres
     );
 
     $request = Application::getInstance()->getContext()->getRequest();
@@ -931,8 +931,8 @@ if (isset($_POST['Update']) && ($_POST['Update'] === 'Y')) {
     //corporate-cliente
     $optionCorpClient = COption::GetOptionString($mid, $CRM_CC, 0);
     $optionCorpShops = unserialize(COption::GetOptionString($mid, $CRM_CORP_SHOPS, 0));
-    $optionsCorpComName = unserialize(COption::GetOptionString($mid, $CRM_CORP_NAME, 0));
-    $optionsCorpAdres = unserialize(COption::GetOptionString($mid, $CRM_CORP_ADRES, 0));
+    $optionsCorpComName = COption::GetOptionString($mid, $CRM_CORP_NAME, 0);
+    $optionsCorpAdres = COption::GetOptionString($mid, $CRM_CORP_ADRES, 0);
 
     $version = COption::GetOptionString($mid, $CRM_API_VERSION, 0);