retailcrm · gwinn · Jul 30, 2026 · Jul 27, 2026 · Jul 27, 2026 · Jul 27, 2026
diff --git 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/classes/general/events/RetailCrmEvent.php b/intaro.retailcrm/classes/general/events/RetailCrmEvent.php
@@ -1,5 +1,6 @@
 <?php
 
+
 /**
  * @category RetailCRM
  * @package  RetailCRM\Events

diff --git a/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php b/intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php
@@ -1,5 +1,6 @@
 <?php
 
+
 /**
  * @category RetailCRM
  * @package  RetailCRM\History

diff --git a/intaro.retailcrm/classes/general/order/RetailCrmOrder_v5.php b/intaro.retailcrm/classes/general/order/RetailCrmOrder_v5.php
@@ -1,5 +1,6 @@
 <?php
 
+
 /**
  * @category RetailCRM
  * @package  RetailCRM\Order

diff --git 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
@@ -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
@@ -794,7 +793,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 +1208,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
@@ -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
@@ -1,6 +1,6 @@
 <?php
 
 $arModuleVersion = [
-    'VERSION'      => '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/builder/api/corporatecustomerbuilder.php b/intaro.retailcrm/lib/component/builder/api/corporatecustomerbuilder.php
@@ -1,5 +1,6 @@
 <?php
 
+
 /**
  * @category Integration
  * @package  Intaro\RetailCrm\Component\Builder\API

diff --git a/intaro.retailcrm/lib/component/builder/api/customerbuilder.php b/intaro.retailcrm/lib/component/builder/api/customerbuilder.php
@@ -1,5 +1,6 @@
 <?php
 
+
 /**
  * @category Integration
  * @package  Intaro\RetailCrm\Component\Builder\API

diff --git a/intaro.retailcrm/lib/component/configprovider.php b/intaro.retailcrm/lib/component/configprovider.php
@@ -1,5 +1,6 @@
 <?php
 
+
 /**
  * @category Integration
  * @package  Intaro\RetailCrm\Component

diff --git 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/lib/service/customerservice.php b/intaro.retailcrm/lib/service/customerservice.php
@@ -1,5 +1,6 @@
 <?php
 
+
 /**
  * @category Integration
  * @package  Intaro\RetailCrm\Service

diff --git a/intaro.retailcrm/lib/service/utils.php b/intaro.retailcrm/lib/service/utils.php
@@ -1,5 +1,6 @@
 <?php
 
+
 /**
  * @category Integration
  * @package  Intaro\RetailCrm\Component

diff --git a/intaro.retailcrm/options.php b/intaro.retailcrm/options.php
@@ -1,5 +1,6 @@
 <?php
 
+
 use Bitrix\Currency\CurrencyManager;
 use Bitrix\Main\Application;
 use Bitrix\Main\EventManager;

diff --git a/intaro.retailcrm/updater.php b/intaro.retailcrm/updater.php
@@ -1,11 +1,8 @@
 <?php
 
-require_once __DIR__ . '/lib/component/constants.php';
-
 use Bitrix\Main\Loader;
 use Bitrix\Main\Config\Option;
 use Bitrix\Main\Application;
-use Intaro\RetailCrm\Component\Constants;
 
 function update()
 {
@@ -103,13 +100,13 @@ function addEventSaveOrder()
  */
 function migrateContragentTypes()
 {
-    $newOptionValue = Option::get('intaro.retailcrm', Constants::CRM_CONTRAGENT_TYPE_SITE, null);
+    $newOptionValue = Option::get('intaro.retailcrm', 'contragent_type_site', null);
 
     if ($newOptionValue !== null && $newOptionValue !== '') {
         return;
     }
 
-    $oldContragentTypes = Option::get('intaro.retailcrm', Constants::CRM_CONTRAGENT_TYPE, null);
+    $oldContragentTypes = Option::get('intaro.retailcrm', 'contragent_type', null);
 
     if (empty($oldContragentTypes)) {
         $oldContragentTypes = [];
@@ -150,7 +147,7 @@ function migrateContragentTypes()
     }
 
     if (!empty($newContragentTypes)) {
-        Option::set('intaro.retailcrm', Constants::CRM_CONTRAGENT_TYPE_SITE, serialize($newContragentTypes));
+        Option::set('intaro.retailcrm', 'contragent_type_site', serialize($newContragentTypes));
     }
 }
 

diff --git a/tests/classes/general/order/RetailCrmOrder_v5Test.php b/tests/classes/general/order/RetailCrmOrder_v5Test.php
@@ -1,5 +1,6 @@
 <?php
 
+
 /**
  * Class RetailCrmOrder_v5Test
  */

diff --git a/tests/lib/component/builder/api/CorporateCustomerBuilderTest.php b/tests/lib/component/builder/api/CorporateCustomerBuilderTest.php
@@ -1,5 +1,6 @@
 <?php
 
+
 namespace Tests\Intaro\RetailCrm\Component\Builder\Api;
 
 use Bitrix\Main\Type\DateTime;

diff --git a/tests/lib/component/builder/api/CustomerBuilderTest.php b/tests/lib/component/builder/api/CustomerBuilderTest.php
@@ -1,5 +1,6 @@
 <?php
 
+
 namespace Tests\Intaro\RetailCrm\Component\Builder\Api;
 
 use Bitrix\Main\Event;
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		- Исправлена загрузка Constants при установке и обновлении модуля
		- Добавлена поддержка мультисайтовости для типа контрагента
-Original file line number
+Diff line change
@@ -1,5 +1,6 @@
     <?php
     /**
      * Class RetailCrmOrder_v5Test
      */
@@ Expand Down @@