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

working customerUpload + send city fix;

Browse Source
This commit is contained in:
Grisha Pomadchin 2013-07-29 18:40:36 +04:00
parent befb6f59d4
commit 72bf320605
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -299,18 +299,18 @@ class ICrmOrderActions
$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()) {
switch ($ar['CODE']) { switch ($ar['CODE']) {
case 'ZIP': $resOrderDeliveryAddress['index'] = ICrmOrderActions::toJSON($ar['VALUE']); case 'ZIP': $resOrderDeliveryAddress['index'] = self::toJSON($ar['VALUE']);
break; break;
case 'CITY': $resOrderDeliveryAddress['city'] = ICrmOrderActions::toJSON($ar['VALUE']); case 'CITY': $resOrderDeliveryAddress['city'] = self::toJSON($ar['VALUE']);
break; break;
case 'ADDRESS': $resOrderDeliveryAddress['text'] = ICrmOrderActions::toJSON($ar['VALUE']); case 'ADDRESS': $resOrderDeliveryAddress['text'] = self::toJSON($ar['VALUE']);
break; break;
case 'LOCATION': if(!isset($resOrderDeliveryAddress['city']) && !$resOrderDeliveryAddress['city']) { case 'LOCATION': if(!isset($resOrderDeliveryAddress['city']) && !$resOrderDeliveryAddress['city']) {
$resOrderDeliveryAddress['city'] = CSaleLocation::GetByID($ar['VALUE']); $resOrderDeliveryAddress['city'] = CSaleLocation::GetByID($ar['VALUE']);
$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(" ", ICrmOrderActions::toJSON($ar['VALUE'])); case 'FIO': $resOrder['contactName'] = explode(" ", self::toJSON($ar['VALUE']));
break; break;
case 'PHONE': $resOrder['phone'] = $ar['VALUE']; case 'PHONE': $resOrder['phone'] = $ar['VALUE'];
break; break;

2
intaro.intarocrm/install/version.php
View File

@ -1,5 +1,5 @@
<? <?
$arModuleVersion = array( $arModuleVersion = array(
'VERSION' => '0.3.6', 'VERSION' => '0.3.6',
'VERSION_DATE' => '2013-07-29 12:29:00', 'VERSION_DATE' => '2013-07-29 18:40:00',
); );