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

after merge

Browse Source
This commit is contained in:
Grisha Pomadchin 2013-09-12 17:01:29 +04:00
commit 903774d57d
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -327,11 +327,22 @@ class ICrmOrderActions
'createdAt' => $createdAt,
'deliveryAddress' => $resOrderDeliveryAddress,
'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'])
&& in_array($arFields['LID'], $arParams['optionsSites']))
$resOrder['site'] = $arFields['LID'];
$resOrder = self::clearArr($resOrder);
// parse fio
if(count($contactNameArr) == 1) {
@ -404,6 +415,7 @@ class ICrmOrderActions
return array();
$array = explode(" ", self::toJSON($str), 3);
$newArray = array();
foreach($array as $ar) {

1
intaro.intarocrm/install/index.php
View File

@ -72,6 +72,7 @@ class intaro_intarocrm extends CModule
}
}
if (!date_default_timezone_get()) {
if (!ini_get('date.timezone')) {
$APPLICATION->ThrowException(GetMessage("DATE_TIMEZONE_ERR"));

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

@ -28,7 +28,7 @@
</tr>
<!--<tr align="center">
<td colspan="2"><b><?php echo GetMessage('INFO_3'); ?></b></td>
</tr>-_>
</tr>-->
<tr align="center">
<td colspan="2">&nbsp;</td>
</tr>