RetailCRM-Mirror/bitrix-module
1
0
Fork 0
mirror of synced 2024-11-22 05:16:09 +03:00
Code Issues Projects Releases Wiki Activity

fio fix

Browse Source
This commit is contained in:
Grisha Pomadchin 2013-09-12 16:27:43 +04:00
parent c6e2a8c1b7
commit 3e9f019f7e
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -320,7 +320,7 @@ class ICrmOrderActions
'orderType' => $arParams['optionsOrderTypes'][$arFields['PERSON_TYPE_ID']], 'orderType' => $arParams['optionsOrderTypes'][$arFields['PERSON_TYPE_ID']],
'deliveryType' => $arParams['optionsDelivTypes'][$resultDeliveryTypeId], 'deliveryType' => $arParams['optionsDelivTypes'][$resultDeliveryTypeId],
'status' => $arParams['optionsPayStatuses'][$arFields['STATUS_ID']], 'status' => $arParams['optionsPayStatuses'][$arFields['STATUS_ID']],
'statusComment' => $arFields['REASON_CANCELED'], 'statusComment' => $arFields['USER_DESCRIPTION'],
'createdAt' => $createdAt, 'createdAt' => $createdAt,
'deliveryAddress' => $resOrderDeliveryAddress, 'deliveryAddress' => $resOrderDeliveryAddress,
'items' => $items 'items' => $items
@ -330,9 +330,9 @@ class ICrmOrderActions
if(count($contactNameArr) == 1) { if(count($contactNameArr) == 1) {
$resOrder['firstName'] = $contactNameArr[0]; $resOrder['firstName'] = $contactNameArr[0];
} else { } else {
$resOrder['lastName'] = $contactNameArr['contactName'][0]; $resOrder['lastName'] = $contactNameArr[0];
$resOrder['firstName'] = $contactNameArr['contactName'][1]; $resOrder['firstName'] = $contactNameArr[1];
$resOrder['patronymic'] = $contactNameArr['contactName'][2]; $resOrder['patronymic'] = $contactNameArr[2];
} }
$resOrder = self::clearArr($resOrder); $resOrder = self::clearArr($resOrder);
@ -397,11 +397,15 @@ class ICrmOrderActions
return array(); return array();
$array = explode(" ", self::toJSON($str), 3); $array = explode(" ", self::toJSON($str), 3);
$newArray = array();
foreach($array as &$ar) foreach($array as $ar) {
if(!$ar) if(!$ar)
unset($ar); continue;
$newArray[] = $ar;
}
return $array; return $newArray;
} }
} }

2
intaro.intarocrm/classes/general/events/ICrmOrderEvent.php
View File

@ -88,8 +88,6 @@ class ICrmOrderEvent {
ICrmOrderActions::eventLog('ICrmOrderEvent::writeDataOnOrderCreate', 'ICrmOrderActions::orderCreate', 'error during creating order'); ICrmOrderActions::eventLog('ICrmOrderEvent::writeDataOnOrderCreate', 'ICrmOrderActions::orderCreate', 'error during creating order');
return true; return true;
} }
COption::SetOptionString(self::$MODULE_ID, self::$CRM_ORDER_LAST_ID, $ID);
return true; return true;
} }