RetailCRM-Mirror/bitrix-module
1
0
Fork 0
mirror of synced 2025-04-11 05:00:55 +00:00
Code Issues Projects Releases Wiki Activity

ref #92774

Browse source 
Передача кастомных полей в црм
Изменение формата кода пользовательских полей пользователя
This commit is contained in:
Ivan Chaplygin 2023-12-05 13:23:58 +03:00
parent d4030d08ac
commit 58500a722b
4 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
intaro.retailcrm/classes/general/RCrmActions.php
View file

@ -485,8 +485,7 @@ class RCrmActions
]
])->fetch();
$key = $userField['ID'] . '#' . $userField['FIELD_NAME'];
$resultList[$key] = $label['EDIT_FORM_LABEL'];
$resultList[$userField['FIELD_NAME']] = $label['EDIT_FORM_LABEL'];
}
return $resultList;

1
intaro.retailcrm/classes/general/events/RetailCrmEvent.php
View file

@ -175,6 +175,7 @@ class RetailCrmEvent
'optionsContragentType' => $optionsContragentType,
'optionsSitesList' => $optionsSitesList,
'optionsCustomFields' => $optionsCustomFields,
'customOrderProps' => RetailcrmConfigProvider::getMatchedOrderProps(),
]);
//many sites?

7
intaro.retailcrm/classes/general/order/RetailCrmOrder_v5.php
View file

@ -131,10 +131,10 @@ class RetailCrmOrder
&& $search = array_search($prop['CODE'], $arParams['optionsLegalDetails'][$arOrder['PERSON_TYPE_ID']])
) {
$order['contragent'][$search] = $prop['VALUE'][0];//legal order data
} elseif (!empty($arParams['optionsCustomFields'])
&& $search = array_search($prop['CODE'], $arParams['optionsCustomFields'][$arOrder['PERSON_TYPE_ID']])
} elseif (!empty($arParams['customOrderProps'])
&& isset($arParams['customOrderProps'][$prop['ID'] . '#' . $prop['CODE']])
) {
$order['customFields'][$search] = $prop['VALUE'][0];//custom properties
$order['customFields'][$arParams['customOrderProps'][$prop['ID'] . '#' . $prop['CODE']]] = $prop['VALUE'][0];
} elseif (is_array($arParams['optionsOrderProps'][$arOrder['PERSON_TYPE_ID']])
&& $search = array_search($prop['CODE'], $arParams['optionsOrderProps'][$arOrder['PERSON_TYPE_ID']])) {//other
if (in_array($search, ['fio', 'phone', 'email'])) {//fio, phone, email
@ -557,6 +557,7 @@ class RetailCrmOrder
'optionsContragentType' => $optionsContragentType,
'optionsSitesList' => RetailcrmConfigProvider::getSitesList(),
'optionsCustomFields' => $optionsCustomFields,
'customOrderProps' => RetailcrmConfigProvider::getMatchedOrderProps(),
];
$recOrders = [];

16
intaro.retailcrm/classes/general/user/RetailCrmUser.php
View file

@ -26,6 +26,7 @@ class RetailCrmUser
}
$customer = self::getSimpleCustomer($arFields);
$customer['customFields'] = self::getCustomFields($arFields);
$customer['createdAt'] = new \DateTime($arFields['DATE_REGISTER']);
$customer['contragent'] = ['contragentType' => $contragentType];
@ -73,6 +74,7 @@ class RetailCrmUser
}
$customer = self::getSimpleCustomer($arFields);
$customer['customFields'] = self::getCustomFields($arFields);
$found = false;
if (count($optionsSitesList) > 0) {
@ -151,4 +153,18 @@ class RetailCrmUser
return $customer;
}
private static function getCustomFields(array $arFields)
{
$customUserFields = RetailcrmConfigProvider::getMatchedUserFields();
$result = [];
foreach ($customUserFields as $code => $codeCrm) {
if (!empty($arFields[$code])) {
$result[$codeCrm] = $arFields[$code];
}
}
return $result;
}
}