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

Merge pull request #10 from cyradin/master

Browse Source 
fix orderHistory exception
This commit is contained in:
Alex Lushpai 2016-04-11 18:26:22 +04:00
commit b6fee101cc
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -898,6 +898,10 @@ else{
'COMMENTS' => self::fromJSON($order['managerComment']) 'COMMENTS' => self::fromJSON($order['managerComment'])
)); ));
if (! date_create_from_format('Y-m-d H:i:s', $arFields['DATE_MARKED'])) {
unset($arFields['DATE_MARKED']);
}
if (isset($order['discount'])) { if (isset($order['discount'])) {
$arFields['DISCOUNT_VALUE'] = $order['discount']; $arFields['DISCOUNT_VALUE'] = $order['discount'];
$arFields['PRICE'] -= $order['discount']; $arFields['PRICE'] -= $order['discount'];