ref #89521 Исправление ошибки при изменении настроек модуля (#296)

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 2023-06-07 v.6.3.11
+- Исправление критической ошибки при изменении настроек модуля
+
 ## 2023-06-02 v.6.3.10
 - Добавлено ограничение по магазинам для типов доставок и оплат
 

intaro.retailcrm/description.ru

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

intaro.retailcrm/install/version.php

@@ -1,6 +1,6 @@
 <?php
 
 $arModuleVersion = [
-    'VERSION'      => '6.3.10',
-    'VERSION_DATE' => '2023-06-02 11:00:00'
+    'VERSION'      => '6.3.11',
+    'VERSION_DATE' => '2023-06-07 18:00:00'
 ];

intaro.retailcrm/options.php

@@ -688,8 +688,8 @@ if (isset($_POST['Update']) && ($_POST['Update'] === 'Y')) {
             COption::SetOptionString($mid, $EVENTS_DEACTIVATE, serialize($deactivateEvents));
         }
     } else {
-        $deactivateAgents = unserialize(COption::GetOptionString($mid, $AGENTS_DEACTIVATE, []));
-        $deactivateEvents = unserialize(COption::GetOptionString($mid, $EVENTS_DEACTIVATE, []));
+        $deactivateAgents = unserialize(COption::GetOptionString($mid, $AGENTS_DEACTIVATE, ''));
+        $deactivateEvents = unserialize(COption::GetOptionString($mid, $EVENTS_DEACTIVATE, ''));
 
         if (!empty($deactivateAgents)) {
             $dateAgent = new DateTime();

tests/classes/general/history/RetailCrmHistory_v5Test.php

@@ -175,6 +175,7 @@ class RetailCrmHistory_v5Test extends \BitrixTestCase
     {
         $currency = CurrencyManager::getBaseCurrency();
         $cmsOrder = Order::create('bitrix', 1, $currency);
+        $cmsOrder->setPersonTypeId('bitrixType');
         $crmManagerId = 123;
 
         RetailcrmConfigProvider::setUsersMap(['bitrixUserId-1515' => $crmManagerId]);

tests/classes/general/order/RetailCrmOrder_v5Test.php

@@ -66,6 +66,7 @@ class RetailCrmOrder_v5Test extends BitrixTestCase {
     public function testFieldExists(): void
     {
         $order = \Bitrix\Sale\Order::create('s1', 1, 'RUB');
+        $order->setPersonTypeId('bitrixType');
         $flag = true;
 
         try {
@@ -136,4 +137,23 @@ class RetailCrmOrder_v5Test extends BitrixTestCase {
             ],
         ]];
     }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState disabled
+     */
+    public function testUploadOrders(): void
+    {
+        $dependencyLoader = Mockery::mock('alias:' . RetailcrmDependencyLoader::class);
+        $dependencyLoader->shouldReceive('loadDependencies')->withAnyArgs()->andReturn(true);
+
+        COption::SetOptionString('intaro.retailcrm', \Intaro\RetailCrm\Component\Constants::CRM_SITES_LIST, serialize([]));
+
+        $rcrmActions = Mockery::mock('alias:' . RCrmActions::class);
+        $rcrmActions->shouldReceive('apiMethod')->withAnyArgs()->andReturn(true);
+
+        $result = RetailCrmOrder::uploadOrders();
+
+        self::assertTrue($result);
+    }
 }