RetailCRM-Mirror/bitrix-module
1
0
Fork 0
mirror of synced 2025-02-21 09:23:14 +03:00
Code Issues Projects Releases Wiki Activity

upd custom type func calls

Browse Source
This commit is contained in:
Grisha Pomadchin 2014-02-12 09:44:35 +04:00
parent 5d0f4e745a
commit 1df0d65827
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
intaro.intarocrm/classes/general/ICrmOrderActions.php
View File

@ -376,7 +376,7 @@ class ICrmOrderActions
foreach ($orderHistory as $order) { foreach ($orderHistory as $order) {
// custom orderType functunion // custom orderType functunion
if(function_exists('intarocrm_set_order_type')) { if(function_exists('intarocrm_get_order_type') && function_exists('intarocrm_set_order_type')) {
$orderType = intarocrm_set_order_type($order); $orderType = intarocrm_set_order_type($order);
if($orderType) if($orderType)
$optionsOrderTypes[$order['orderType']] = $orderType; $optionsOrderTypes[$order['orderType']] = $orderType;
@ -470,6 +470,14 @@ class ICrmOrderActions
} }
if(isset($order['externalId']) && $order['externalId']) { if(isset($order['externalId']) && $order['externalId']) {
// custom orderType functunion
if(function_exists('intarocrm_get_order_type') && function_exists('intarocrm_set_order_type')) {
$orderType = intarocrm_set_order_type($order);
if($orderType)
$optionsOrderTypes[$order['orderType']] = $orderType;
}
$arFields = CSaleOrder::GetById($order['externalId']); $arFields = CSaleOrder::GetById($order['externalId']);
// incorrect order // incorrect order
@ -1112,7 +1120,7 @@ class ICrmOrderActions
} }
// custom orderType functunion // custom orderType functunion
if(function_exists('intarocrm_get_order_type')) { if(function_exists('intarocrm_get_order_type') && function_exists('intarocrm_set_order_type')) {
$orderType = intarocrm_get_order_type($arFields); $orderType = intarocrm_get_order_type($arFields);
if($orderType) if($orderType)
$resOrder['orderType'] = $orderType; $resOrder['orderType'] = $orderType;