RetailCRM-Mirror/bitrix-module
1
0
Fork 0
mirror of synced 2024-11-25 23:06:08 +03:00
Code Issues Projects Releases Wiki Activity

Исправление передачи корпоративных клиентов (#260)

Browse Source
This commit is contained in:
Vlad 2022-07-01 15:47:59 +03:00 committed by GitHub
parent 5c6ac38b12
commit d52974c7d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -1,3 +1,6 @@
## 2022-07-01 v.6.1.2
- Исправление передачи корпоративных клиентов
## 2022-06-28 v.6.1.1 ## 2022-06-28 v.6.1.1
- Исправлена ошибка при удалении модуля - Исправлена ошибка при удалении модуля

2
intaro.retailcrm/description.ru
View File

@ -1 +1 @@
- Исправлена ошибка при удалении модуля - Исправление передачи корпоративных клиентов

4
intaro.retailcrm/install/version.php
View File

@ -1,6 +1,6 @@
<?php <?php
$arModuleVersion = [ $arModuleVersion = [
'VERSION' => '6.1.1', 'VERSION' => '6.1.2',
'VERSION_DATE' => '2022-06-28 17:00:00' 'VERSION_DATE' => '2022-07-01 15:00:00'
]; ];

4
intaro.retailcrm/lib/component/configprovider.php
View File

@ -279,7 +279,7 @@ class ConfigProvider
public static function getCorporateClientName() public static function getCorporateClientName()
{ {
if (self::isEmptyNotZero(static::$corporateClientName)) { if (self::isEmptyNotZero(static::$corporateClientName)) {
static::$corporateClientName = static::getUnserializedOption(Constants::CRM_CORP_NAME); static::$corporateClientName = static::getOption(Constants::CRM_CORP_NAME);
} }
return static::$corporateClientName; return static::$corporateClientName;
@ -293,7 +293,7 @@ class ConfigProvider
public static function getCorporateClientAddress() public static function getCorporateClientAddress()
{ {
if (self::isEmptyNotZero(static::$corporateClientAddress)) { if (self::isEmptyNotZero(static::$corporateClientAddress)) {
static::$corporateClientAddress = static::getUnserializedOption(Constants::CRM_CORP_ADDRESS); static::$corporateClientAddress = static::getOption(Constants::CRM_CORP_ADDRESS);
} }
return static::$corporateClientAddress; return static::$corporateClientAddress;

8
intaro.retailcrm/options.php
View File

@ -798,12 +798,12 @@ if (isset($_POST['Update']) && ($_POST['Update'] === 'Y')) {
COption::SetOptionString( COption::SetOptionString(
$mid, $mid,
$CRM_CORP_NAME, $CRM_CORP_NAME,
serialize(RCrmActions::clearArr(is_array($bitrixCorpName) ? $bitrixCorpName : [])) $bitrixCorpName
); );
COption::SetOptionString( COption::SetOptionString(
$mid, $mid,
$CRM_CORP_ADRES, $CRM_CORP_ADRES,
serialize(RCrmActions::clearArr(is_array($bitrixCorpAdres) ? $bitrixCorpAdres : [])) $bitrixCorpAdres
); );
$request = Application::getInstance()->getContext()->getRequest(); $request = Application::getInstance()->getContext()->getRequest();
@ -931,8 +931,8 @@ if (isset($_POST['Update']) && ($_POST['Update'] === 'Y')) {
//corporate-cliente //corporate-cliente
$optionCorpClient = COption::GetOptionString($mid, $CRM_CC, 0); $optionCorpClient = COption::GetOptionString($mid, $CRM_CC, 0);
$optionCorpShops = unserialize(COption::GetOptionString($mid, $CRM_CORP_SHOPS, 0)); $optionCorpShops = unserialize(COption::GetOptionString($mid, $CRM_CORP_SHOPS, 0));
$optionsCorpComName = unserialize(COption::GetOptionString($mid, $CRM_CORP_NAME, 0)); $optionsCorpComName = COption::GetOptionString($mid, $CRM_CORP_NAME, 0);
$optionsCorpAdres = unserialize(COption::GetOptionString($mid, $CRM_CORP_ADRES, 0)); $optionsCorpAdres = COption::GetOptionString($mid, $CRM_CORP_ADRES, 0);
$version = COption::GetOptionString($mid, $CRM_API_VERSION, 0); $version = COption::GetOptionString($mid, $CRM_API_VERSION, 0);