ref #92774

Обновление тестов.
Получение кастосмных полей только текстового формата

intaro.retailcrm/classes/general/RCrmActions.php

@@ -447,7 +447,8 @@ class RCrmActions
             'filter' => [
                 ['!=CODE' => "LP_BONUS_INFO"],
                 ['!=CODE' => "LP_DISCOUNT_INFO"],
-                ['>ID' => 19]
+                ['>ID' => 19],
+                ['TYPE' => 'STRING']
             ]
         ]);
 
@@ -469,11 +470,11 @@ class RCrmActions
             'filter' => [
                 ['ENTITY_ID' => 'USER'],
                 ['?FIELD_NAME' => '~%INTARO%'],
-                ['!=FIELD_NAME' => 'UF_SUBSCRIBE_USER_EMAIL']
+                ['!=FIELD_NAME' => 'UF_SUBSCRIBE_USER_EMAIL'],
+                ['USER_TYPE_ID' => 'string']
             ]
         ])->fetchAll();
 
-
         $resultList = [];
 
         foreach ($userFields as $userField) {

tests/BitrixTestCase.php

@@ -47,7 +47,13 @@ class BitrixTestCase extends \PHPUnit\Framework\TestCase
             'USER_DESCRIPTION' => 'userComment',
             'COMMENTS' => 'managerComment',
             'PRICE_DELIVERY' => '100',
-            'PROPS' => ['properties' => [['CODE' => 'FIO', 'VALUE' => ['FirstName LastName']]]],
+            'PROPS' => [
+                'properties' => [
+                    ['CODE' => 'FIO', 'VALUE' => ['FirstName LastName']],
+                    ['ID' => 1, 'CODE' => 'TEST_PROP_1', 'VALUE' => ['test 1']],
+                    ['ID' => 2, 'CODE' => 'TEST_PROP_2', 'VALUE' => ['test 2']]
+                ]
+            ],
             'DELIVERYS' => [[
                 'id' => 'test',
                 'service' => 'service'

tests/classes/general/history/RetailCrmHistory_v5Test.php

@@ -4,6 +4,7 @@ use Bitrix\Sale\Order;
 use Bitrix\Currency\CurrencyManager;
 use RetailCrm\Response\ApiResponse;
 use Tests\Intaro\RetailCrm\DataHistory;
+use CUserTypeEntity;
 
 /**
  * Class RetailCrmHistory_v5Test
@@ -27,6 +28,13 @@ class RetailCrmHistory_v5Test extends \BitrixTestCase
      */
     public function testRegisterUser(): void
     {
+        RetailcrmConfigProvider::setCustomFieldsStatus('Y');
+        RetailcrmConfigProvider::setMatchedUserFields(
+            ['UF_FIELD_USER_1' => 'custom_1', 'UF_FIELD_USER_2' => 'custom_2']
+        );
+
+        $this->registerCustomFields();
+
         $actionsMock = Mockery::mock('alias:' . RCrmActions::class);
         $apiResponse = new ApiResponse(200, DataHistory::get_history_data_new_customer());
 
@@ -220,4 +228,38 @@ class RetailCrmHistory_v5Test extends \BitrixTestCase
             ],
         ];
     }
+
+    private function registerCustomFields()
+    {
+        $oUserTypeEntity    = new CUserTypeEntity();
+        $userField = [
+            'ENTITY_ID' => 'USER',
+            'FIELD_NAME' => 'UF_FIELD_USER_1',
+            'USER_TYPE_ID' => 'string',
+            'MULTIPLE' => 'N',
+            'MANDATORY' => 'N',
+            'EDIT_FROM_LABEL' => ['ru' => 'TEST 1']
+        ];
+
+        $dbRes = CUserTypeEntity::GetList([], ['FIELD_NAME' => 'UF_FIELD_USER_1'])->fetch();
+
+        if (!$dbRes['ID']) {
+            $oUserTypeEntity->Add($userField);
+        }
+
+        $userField = [
+            'ENTITY_ID' => 'USER',
+            'FIELD_NAME' => 'UF_FIELD_USER_2',
+            'USER_TYPE_ID' => 'string',
+            'MULTIPLE' => 'N',
+            'MANDATORY' => 'N',
+            'EDIT_FROM_LABEL' => ['ru' => 'TEST 2']
+        ];
+
+        $dbRes = CUserTypeEntity::GetList([], ['FIELD_NAME' => 'UF_FIELD_USER_2'])->fetch();
+
+        if (!$dbRes['ID']) {
+            $oUserTypeEntity->Add($userField);
+        }
+    }
 }

tests/classes/general/order/RetailCrmOrder_v5Test.php

@@ -29,6 +29,8 @@ class RetailCrmOrder_v5Test extends BitrixTestCase {
      */
     public function testOrderSend($arFields, $arParams, $methodApi, $expected)
     {
+        RetailcrmConfigProvider::setCustomFieldsStatus('Y');
+
         self::assertEquals($expected, RetailCrmOrder::orderSend(
             $arFields,
             new stdClass(),
@@ -103,7 +105,8 @@ class RetailCrmOrder_v5Test extends BitrixTestCase {
             'optionsDelivTypes' => RetailcrmConfigProvider::getDeliveryTypes(),
             'optionsPayTypes' => RetailcrmConfigProvider::getPaymentTypes(),
             'optionsOrderProps' => ['bitrixType' => ['fio' => 'FIO']],
-            'optionsPayment' => ['Y' => 'paid']
+            'optionsPayment' => ['Y' => 'paid'],
+            'customOrderProps' => ['1#TEST_PROP_1' => 'custom_first', '2#TEST_PROP_2' => 'custom_second']
         ];
 
         return [[
@@ -136,7 +139,8 @@ class RetailCrmOrder_v5Test extends BitrixTestCase {
                 'privilegeType' => 'none',
                 'statusComment' => $arFields['REASON_CANCELED'],
                 'firstName' => 'FirstName',
-                'lastName' => 'LastName'
+                'lastName' => 'LastName',
+                'customFields' => ['custom_first' => 'test 1', 'custom_second' => 'test 2']
             ],
         ]];
     }

tests/datasets/DataHistory.php

@@ -45,7 +45,9 @@ class DataHistory
                         "text": "Street"
                     },
                     "customFields": {
-                        "crm_customer": "test_customer"
+                        "crm_customer": "test_customer",
+                        "custom_1": "test 1",
+                        "custom_2": "test 2"
                     },
                     "segments": [],
                     "firstName": "Test_Name",