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 @@ '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);