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 18:16:30 +03:00
parent 56701ccb4d
commit fb4ed685df
1 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php
View file

@ -270,10 +270,16 @@ class RetailCrmHistory
$contragentTypes = array_flip(RetailcrmConfigProvider::getContragentTypes());
$shipmentDeducted = RetailcrmConfigProvider::getShipmentDeducted();
$matchedCustomFields = RetailcrmConfigProvider::getMatchedUserFields() ?? [];
$matchedCustomFields = array_flip($matchedCustomFields);
$matchedCustomUserFields = RetailcrmConfigProvider::getMatchedUserFields() ?? [];
$matchedCustomUserFields = array_flip($matchedCustomUserFields);
$matchedCustomOrderFields = RetailcrmConfigProvider::getMatchedOrderProps() ?? [];
$matchedCustomOrderFields = array_flip($matchedCustomUserFields);
self::$CUSTOM_FIELDS_IS_ACTIVE = RetailcrmConfigProvider::getCustomFieldsStatus();
$api = new RetailCrm\ApiClient(RetailcrmConfigProvider::getApiUrl(), RetailcrmConfigProvider::getApiKey());
$page = 1;
/* @var OrderLoyaltyDataService $orderLoyaltyDataService */
@ -472,7 +478,7 @@ class RetailCrmHistory
$newUser = new CUser();
$customerArray = $corporateCustomerBuilder->getCustomer()->getObjectToArray();
$customFields = self::getCustomUserFields($userData, $matchedCustomFields);
$customFields = self::getCustomUserFields($userData, $matchedCustomUserFields);
$customerArray = array_merge($customerArray, $customFields);
if (!array_key_exists('UF_SUBSCRIBE_USER_EMAIL', $customerArray)) {
@ -941,7 +947,7 @@ class RetailCrmHistory
}
if ($registerNewUser === true) {
$customFields = self::getCustomUserFields($response['customer'], $matchedCustomFields);
$customFields = self::getCustomUserFields($response['customer'], $matchedCustomUserFields);
$registeredUserID = $newUser->Add(self::getDataUser($customerBuilder, $customFields));
if ($registeredUserID === false) {
@ -1233,6 +1239,18 @@ class RetailCrmHistory
}
$newOrder->setField('PRICE', $orderSumm);
if (self::$CUSTOM_FIELDS_IS_ACTIVE === 'Y' && !empty($matchedCustomOrderFields)) {
foreach ($order['customFields'] as $code => $value) {
if (isset($matchedCustomOrderFields[$code])) {
$masIdentifier = explode('#', $matchedCustomOrderFields[$code], 2);
$property = $propertyCollection->getItemById($masIdentifier[0]);
$property->setValue($value);
}
}
}
self::orderSave($newOrder);
if ($optionsOrderNumbers === 'Y' && isset($order['number'])) {