From e5c4cd828f1df4c6efb4768cc611ab41a1d0458c Mon Sep 17 00:00:00 2001 From: danila Date: Mon, 27 Jul 2026 15:43:22 +0500 Subject: [PATCH 1/3] =?UTF-8?q?=D0=92=D1=8B=D0=BF=D1=83=D1=81=D0=BA=20?= =?UTF-8?q?=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D0=B8=206.9.0=20=D1=81=20=D0=BF?= =?UTF-8?q?=D0=BE=D0=B4=D0=B4=D0=B5=D1=80=D0=B6=D0=BA=D0=BE=D0=B9=20=D0=BC?= =?UTF-8?q?=D1=83=D0=BB=D1=8C=D1=82=D0=B8=D1=81=D0=B0=D0=B9=D1=82=D0=BE?= =?UTF-8?q?=D0=B2=D0=BE=D1=81=D1=82=D0=B8=20=D0=B4=D0=BB=D1=8F=20=D1=82?= =?UTF-8?q?=D0=B8=D0=BF=D0=B0=20=D0=BA=D0=BE=D0=BD=D1=82=D1=80=D0=B0=D0=B3?= =?UTF-8?q?=D0=B5=D0=BD=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 6 ++---- intaro.retailcrm/description.ru | 2 +- intaro.retailcrm/install/index.php | 4 ++-- intaro.retailcrm/install/step3.php | 2 +- intaro.retailcrm/install/version.php | 4 ++-- intaro.retailcrm/lib/component/constants.php | 2 +- intaro.retailcrm/updater.php | 9 +++------ 7 files changed, 12 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bf271518..e61f8a56 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,6 @@ -## 2026-07-14 v6.8.5 -- Исправлена загрузка Constants при установке и обновлении модуля - -## 2026-07-01 v6.8.4 +## 2026-07-27 v6.9.0 - Добавлена поддержка мультисайтовости для типа контрагента +- Исправлена установка и обновление модуля ## 2026-06-30 v6.8.3 - Исправлено присвоение PERSON_TYPE_ID для $newOrder diff --git a/intaro.retailcrm/description.ru b/intaro.retailcrm/description.ru index 7967b047..09289a85 100644 --- a/intaro.retailcrm/description.ru +++ b/intaro.retailcrm/description.ru @@ -1 +1 @@ -- Исправлена загрузка Constants при установке и обновлении модуля +- Добавлена поддержка мультисайтовости для типа контрагента diff --git a/intaro.retailcrm/install/index.php b/intaro.retailcrm/install/index.php index 199a6ef3..be5b3db2 100644 --- a/intaro.retailcrm/install/index.php +++ b/intaro.retailcrm/install/index.php @@ -794,7 +794,7 @@ function DoInstall() COption::SetOptionString($this->MODULE_ID, Constants::CRM_ADDRESS_OPTIONS, serialize($addressDetailOptions)); COption::SetOptionString($this->MODULE_ID, Constants::CRM_ORDER_PROPS, serialize(RCrmActions::clearArr($orderPropsArr))); COption::SetOptionString($this->MODULE_ID, Constants::CRM_LEGAL_DETAILS, serialize(RCrmActions::clearArr($legalDetailsArr))); - COption::SetOptionString($this->MODULE_ID, Constants::CRM_CONTRAGENT_TYPE_SITE, serialize(RCrmActions::clearArr($contragentTypeArr))); + COption::SetOptionString($this->MODULE_ID, 'contragent_type_site', serialize(RCrmActions::clearArr($contragentTypeArr))); $APPLICATION->IncludeAdminFile( GetMessage('MODULE_INSTALL_TITLE'), $this->INSTALL_PATH . '/step4.php' @@ -1209,7 +1209,7 @@ public function DoUninstall() COption::RemoveOption($this->MODULE_ID, Constants::CRM_ORDER_TYPES_ARR); COption::RemoveOption($this->MODULE_ID, Constants::CRM_LEGAL_DETAILS); COption::RemoveOption($this->MODULE_ID, Constants::CRM_CONTRAGENT_TYPE); - COption::RemoveOption($this->MODULE_ID, Constants::CRM_CONTRAGENT_TYPE_SITE); + COption::RemoveOption($this->MODULE_ID, 'contragent_type_site'); COption::RemoveOption($this->MODULE_ID, Constants::CRM_SITES_LIST); COption::RemoveOption($this->MODULE_ID, Constants::CRM_ORDER_DISCHARGE); COption::RemoveOption($this->MODULE_ID, Constants::CRM_ORDER_FAILED_IDS); diff --git a/intaro.retailcrm/install/step3.php b/intaro.retailcrm/install/step3.php index 660dd8a5..87eb6845 100644 --- a/intaro.retailcrm/install/step3.php +++ b/intaro.retailcrm/install/step3.php @@ -43,7 +43,7 @@ if (!isset($arResult['CONTRAGENT_TYPES'])) { $arResult['CONTRAGENT_TYPES'] = unserialize( - (string) COption::GetOptionString(Constants::MODULE_ID, Constants::CRM_CONTRAGENT_TYPE_SITE, 0), + (string) COption::GetOptionString(Constants::MODULE_ID, 'contragent_type_site', 0), ['allowed_classes' => false] ); diff --git a/intaro.retailcrm/install/version.php b/intaro.retailcrm/install/version.php index fbbde235..3b59382e 100644 --- a/intaro.retailcrm/install/version.php +++ b/intaro.retailcrm/install/version.php @@ -1,6 +1,6 @@ '6.8.5', - 'VERSION_DATE' => '2026-07-14 12:00:00' + 'VERSION' => '6.9.0', + 'VERSION_DATE' => '2026-07-27 12:00:00' ]; diff --git a/intaro.retailcrm/lib/component/constants.php b/intaro.retailcrm/lib/component/constants.php index 120d4d2f..03b4d971 100644 --- a/intaro.retailcrm/lib/component/constants.php +++ b/intaro.retailcrm/lib/component/constants.php @@ -18,7 +18,7 @@ */ class Constants { - public const MODULE_VERSION = '6.8.5'; + public const MODULE_VERSION = '6.9.0'; public const CRM_PURCHASE_PRICE_NULL = 'purchasePrice_null'; public const BITRIX_USER_ID_PREFIX = 'bitrixUserId-'; public const CRM_USERS_MAP = 'crm_users_map'; diff --git a/intaro.retailcrm/updater.php b/intaro.retailcrm/updater.php index 7be39021..9529fff0 100755 --- a/intaro.retailcrm/updater.php +++ b/intaro.retailcrm/updater.php @@ -1,11 +1,8 @@ Date: Mon, 27 Jul 2026 16:25:39 +0500 Subject: [PATCH 2/3] =?UTF-8?q?=D0=92=D1=8B=D0=BF=D1=83=D1=81=D0=BA=20?= =?UTF-8?q?=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D0=B8=206.9.0=20=D1=81=20=D0=BF?= =?UTF-8?q?=D0=BE=D0=B4=D0=B4=D0=B5=D1=80=D0=B6=D0=BA=D0=BE=D0=B9=20=D0=BC?= =?UTF-8?q?=D1=83=D0=BB=D1=8C=D1=82=D0=B8=D1=81=D0=B0=D0=B9=D1=82=D0=BE?= =?UTF-8?q?=D0=B2=D0=BE=D1=81=D1=82=D0=B8=20=D0=B4=D0=BB=D1=8F=20=D1=82?= =?UTF-8?q?=D0=B8=D0=BF=D0=B0=20=D0=BA=D0=BE=D0=BD=D1=82=D1=80=D0=B0=D0=B3?= =?UTF-8?q?=D0=B5=D0=BD=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- intaro.retailcrm/classes/general/events/RetailCrmEvent.php | 1 + intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php | 1 + intaro.retailcrm/classes/general/order/RetailCrmOrder_v5.php | 1 + .../lib/component/builder/api/corporatecustomerbuilder.php | 1 + intaro.retailcrm/lib/component/builder/api/customerbuilder.php | 1 + intaro.retailcrm/lib/component/configprovider.php | 1 + intaro.retailcrm/lib/service/customerservice.php | 1 + intaro.retailcrm/lib/service/utils.php | 1 + intaro.retailcrm/options.php | 1 + tests/classes/general/order/RetailCrmOrder_v5Test.php | 1 + tests/lib/component/builder/api/CorporateCustomerBuilderTest.php | 1 + tests/lib/component/builder/api/CustomerBuilderTest.php | 1 + 12 files changed, 12 insertions(+) diff --git a/intaro.retailcrm/classes/general/events/RetailCrmEvent.php b/intaro.retailcrm/classes/general/events/RetailCrmEvent.php index 9d028efd..0f7f2414 100644 --- a/intaro.retailcrm/classes/general/events/RetailCrmEvent.php +++ b/intaro.retailcrm/classes/general/events/RetailCrmEvent.php @@ -1,5 +1,6 @@ Date: Mon, 27 Jul 2026 16:31:29 +0500 Subject: [PATCH 3/3] fix PR --- intaro.retailcrm/install/index.php | 1 - 1 file changed, 1 deletion(-) diff --git a/intaro.retailcrm/install/index.php b/intaro.retailcrm/install/index.php index be5b3db2..121c7787 100644 --- a/intaro.retailcrm/install/index.php +++ b/intaro.retailcrm/install/index.php @@ -31,7 +31,6 @@ return false; } -require_once(__DIR__ . '/../lib/component/constants.php'); require_once(__DIR__ . '/../lib/component/advanced/installertrait.php'); class intaro_retailcrm extends CModule