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

fio parsing fix

Browse Source
This commit is contained in:
Grisha Pomadchin 2013-09-09 16:49:08 +04:00
parent be7d3d76cd
commit f29c0f62a4
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -538,6 +538,7 @@ class ICrmOrderActions
$resOrder = array(); $resOrder = array();
$resOrderDeliveryAddress = array(); $resOrderDeliveryAddress = array();
$contactNameArr = array();
$rsOrderProps = CSaleOrderPropsValue::GetList(array(), array('ORDER_ID' => $arFields['ID'])); $rsOrderProps = CSaleOrderPropsValue::GetList(array(), array('ORDER_ID' => $arFields['ID']));
while ($ar = $rsOrderProps->Fetch()) { while ($ar = $rsOrderProps->Fetch()) {
@ -553,7 +554,7 @@ class ICrmOrderActions
$resOrderDeliveryAddress['city'] = self::toJSON($resOrderDeliveryAddress['city']['CITY_NAME_LANG']); $resOrderDeliveryAddress['city'] = self::toJSON($resOrderDeliveryAddress['city']['CITY_NAME_LANG']);
} }
break; break;
case 'FIO': $resOrder['contactName'] = explode(" ", self::toJSON($ar['VALUE'])); case 'FIO': $contactNameArr = self::explodeFIO($ar['VALUE']);
break; break;
case 'PHONE': $resOrder['phone'] = $ar['VALUE']; case 'PHONE': $resOrder['phone'] = $ar['VALUE'];
break; break;
@ -592,10 +593,7 @@ class ICrmOrderActions
$createdAt = new \DateTime($arFields['DATE_INSERT']); $createdAt = new \DateTime($arFields['DATE_INSERT']);
$createdAt = $createdAt->format('Y-m-d H:i:s'); $createdAt = $createdAt->format('Y-m-d H:i:s');
$resOrder = self::clearArr(array( $resOrder = array(
'lastName' => $resOrder['contactName'][0],
'firstName' => $resOrder['contactName'][1],
'patronymic' => $resOrder['contactName'][2],
'phone' => $resOrder['phone'], 'phone' => $resOrder['phone'],
'email' => $resOrder['email'], 'email' => $resOrder['email'],
'deliveryCost' => $arFields['PRICE_DELIVERY'], 'deliveryCost' => $arFields['PRICE_DELIVERY'],
@ -612,7 +610,16 @@ class ICrmOrderActions
'createdAt' => $createdAt, 'createdAt' => $createdAt,
'deliveryAddress' => $resOrderDeliveryAddress, 'deliveryAddress' => $resOrderDeliveryAddress,
'items' => $items 'items' => $items
)); );
// parse fio
if(count($contactNameArr) == 1) {
$resOrder['firstName'] = $contactNameArr[0];
} else {
$resOrder['lastName'] = $contactNameArr['contactName'][0];
$resOrder['firstName'] = $contactNameArr['contactName'][1];
$resOrder['patronymic'] = $contactNameArr['contactName'][2];
}
if(isset($arParams['optionsSites']) && is_array($arParams['optionsSites']) if(isset($arParams['optionsSites']) && is_array($arParams['optionsSites'])
&& in_array($arFields['LID'], $arParams['optionsSites'])) && in_array($arFields['LID'], $arParams['optionsSites']))
@ -672,4 +679,17 @@ class ICrmOrderActions
return $APPLICATION->ConvertCharset($str, 'utf-8', SITE_CHARSET); return $APPLICATION->ConvertCharset($str, 'utf-8', SITE_CHARSET);
} }
public static function expodeFIO($str) {
if(!$str)
return array();
$array = expolde(" ", ICrmOrderActions::toJSON($str), 3);
foreach($array as &$ar)
if(!$ar)
unset($ar);
return $array;
}
} }