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

fixes

Browse Source
This commit is contained in:
Grisha Pomadchin 2014-02-01 12:11:42 +04:00
parent 1fdd539252
commit 513f852b60
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -491,7 +491,7 @@ class ICrmOrderActions
CSaleOrderPropsValue::Update($ar['ID'], array('VALUE' => self::fromJSON($order['deliveryAddress']['text']))); CSaleOrderPropsValue::Update($ar['ID'], array('VALUE' => self::fromJSON($order['deliveryAddress']['text'])));
break; break;
case 'LOCATION': if (isset($order['deliveryAddress']['city'])) { case 'LOCATION': if (isset($order['deliveryAddress']['city'])) {
$cityId = self::getLocationCityId($order['deliveryAddress']['city']); $cityId = self::getLocationCityId(self::fromJSON($order['deliveryAddress']['city']));
if (!$cityId) if (!$cityId)
break; break;
CSaleOrderPropsValue::Update($ar['ID'], array('VALUE' => $cityId)); CSaleOrderPropsValue::Update($ar['ID'], array('VALUE' => $cityId));
@ -562,8 +562,16 @@ class ICrmOrderActions
self::addOrderProperty($optionsOrderProps[$arFields['PERSON_TYPE_ID']]['index'], self::addOrderProperty($optionsOrderProps[$arFields['PERSON_TYPE_ID']]['index'],
self::fromJSON($order['deliveryAddress']['index']), $order['externalId']); self::fromJSON($order['deliveryAddress']['index']), $order['externalId']);
if (isset($order['deliveryAddress']['city'])) if (isset($order['deliveryAddress']['city'])) {
self::addOrderProperty($optionsOrderProps[$arFields['PERSON_TYPE_ID']]['city'], self::fromJSON($order['deliveryAddress']['city']), $order['externalId']); self::addOrderProperty($optionsOrderProps[$arFields['PERSON_TYPE_ID']]['city'], self::fromJSON($order['deliveryAddress']['city']), $order['externalId']);
self::addOrderProperty('CITY', self::fromJSON($order['deliveryAddress']['city']), $order['externalId']);
$cityId = self::getLocationCityId(self::fromJSON($order['deliveryAddress']['city']));
if ($cityId)
self::addOrderProperty('LOCATION', $cityId, $order['externalId']);
else
self::addOrderProperty('LOCATION', 0, $order['externalId']);
}
if (isset($order['deliveryAddress']['text'])) if (isset($order['deliveryAddress']['text']))
self::addOrderProperty($optionsOrderProps[$arFields['PERSON_TYPE_ID']]['text'], self::fromJSON($order['deliveryAddress']['text']), $order['externalId']); self::addOrderProperty($optionsOrderProps[$arFields['PERSON_TYPE_ID']]['text'], self::fromJSON($order['deliveryAddress']['text']), $order['externalId']);
@ -756,7 +764,7 @@ class ICrmOrderActions
if(!isset($order['deliveryCost'])) if(!isset($order['deliveryCost']))
$order['deliveryCost'] = $arFields['PRICE_DELIVERY']; $order['deliveryCost'] = $arFields['PRICE_DELIVERY'];
if(!isset($order['summ']) || (isset($order['summ']) && !$order['summ'])) if(!isset($order['summ']) || (isset($order['summ']) && !$order['summ'] && $order['summ'] !== 0))
$order['summ'] = $arFields['PRICE'] - $arFields['PRICE_DELIVERY']; $order['summ'] = $arFields['PRICE'] - $arFields['PRICE_DELIVERY'];
$wasCanaceled = false; $wasCanaceled = false;
@ -776,7 +784,7 @@ class ICrmOrderActions
// orderUpdate // orderUpdate
$arFields = self::clearArr(array( $arFields = self::clearArr(array(
'PRICE_DELIVERY' => $order['deliveryCost'], 'PRICE_DELIVERY' => $order['deliveryCost'],
'PRICE' => $order['summ'] + (double) $order['deliveryCost'], 'PRICE' => $order['summ'] ? $order['summ'] + (double) $order['deliveryCost'] : 0,
'DATE_MARKED' => $order['markDatetime'], 'DATE_MARKED' => $order['markDatetime'],
'USER_ID' => $userId, //$order['customer'] 'USER_ID' => $userId, //$order['customer']
'PAY_SYSTEM_ID' => $optionsPayTypes[$order['paymentType']], 'PAY_SYSTEM_ID' => $optionsPayTypes[$order['paymentType']],