after merge
This commit is contained in:
commit
903774d57d
@ -327,12 +327,23 @@ 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']))
|
||||||
$resOrder['site'] = $arFields['LID'];
|
$resOrder['site'] = $arFields['LID'];
|
||||||
|
|
||||||
|
$resOrder = self::clearArr($resOrder);
|
||||||
|
|
||||||
// parse fio
|
// parse fio
|
||||||
if(count($contactNameArr) == 1) {
|
if(count($contactNameArr) == 1) {
|
||||||
$resOrder['firstName'] = $contactNameArr[0];
|
$resOrder['firstName'] = $contactNameArr[0];
|
||||||
@ -404,6 +415,7 @@ class ICrmOrderActions
|
|||||||
return array();
|
return array();
|
||||||
|
|
||||||
$array = explode(" ", self::toJSON($str), 3);
|
$array = explode(" ", self::toJSON($str), 3);
|
||||||
|
|
||||||
$newArray = array();
|
$newArray = array();
|
||||||
|
|
||||||
foreach($array as $ar) {
|
foreach($array as $ar) {
|
||||||
|
@ -72,6 +72,7 @@ class intaro_intarocrm extends CModule
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if (!date_default_timezone_get()) {
|
if (!date_default_timezone_get()) {
|
||||||
if (!ini_get('date.timezone')) {
|
if (!ini_get('date.timezone')) {
|
||||||
$APPLICATION->ThrowException(GetMessage("DATE_TIMEZONE_ERR"));
|
$APPLICATION->ThrowException(GetMessage("DATE_TIMEZONE_ERR"));
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
</tr>
|
</tr>
|
||||||
<!--<tr align="center">
|
<!--<tr align="center">
|
||||||
<td colspan="2"><b><?php echo GetMessage('INFO_3'); ?></b></td>
|
<td colspan="2"><b><?php echo GetMessage('INFO_3'); ?></b></td>
|
||||||
</tr>-_>
|
</tr>-->
|
||||||
<tr align="center">
|
<tr align="center">
|
||||||
<td colspan="2"> </td>
|
<td colspan="2"> </td>
|
||||||
</tr>
|
</tr>
|
||||||
|
Loading…
Reference in New Issue
Block a user