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

fix summ null error

Browse Source
This commit is contained in:
Grisha Pomadchin 2013-11-13 23:05:19 +04:00
parent 5e33d50f98
commit b9e681a683
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -605,9 +605,13 @@ 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']))
$order['summ'] = $arFields['PRICE'] - $arFields['PRICE_DELIVERY'];
// orderUpdate // orderUpdate
$arFields = self::clearArr(array( $arFields = self::clearArr(array(
'PRICE_DELIVERY' => $order['deliveryCost'], 'PRICE_DELIVERY' => $order['deliveryCost'],
'PRICE' => $order['summ'] + (double) $order['deliveryCost'],
'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']],
@ -620,9 +624,6 @@ class ICrmOrderActions
'COMMENTS' => $order['managerComment'] 'COMMENTS' => $order['managerComment']
)); ));
if(isset($order['summ']) && $order['summ'])
$arFields['PRICE'] => $order['summ'] + (double) $order['deliveryCost'];
$GLOBALS['INTARO_CRM_FROM_HISTORY'] = true; $GLOBALS['INTARO_CRM_FROM_HISTORY'] = true;
CSaleOrder::Update($order['externalId'], $arFields); CSaleOrder::Update($order['externalId'], $arFields);