RetailCRM-Mirror/bitrix-module
1
0
Fork 0
mirror of synced 2025-02-16 15:03:14 +03:00
Code Issues Projects Releases Wiki Activity

cancel event fix; discount upd fix.

Browse Source
This commit is contained in:
Grisha Pomadchin 2013-11-14 16:41:19 +04:00
parent c67359ce94
commit 8f2d6befbc
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -557,12 +557,12 @@ class ICrmOrderActions
if (isset($item['initialPrice']) && $item['initialPrice'])
$arProduct['PRICE'] = (double) $item['initialPrice'];
if (isset($item['discount']) && $item['discount']) {
if (isset($item['discount'])) {
$arProduct['DISCOUNT_PRICE'] = $item['discount'];
$arProduct['PRICE'] -= $arProduct['DISCOUNT_PRICE'];
}
if (isset($item['discountPercent']) && $item['discountPercent']) {
if (isset($item['discountPercent'])) {
$arProduct['DISCOUNT_VALUE'] = $item['discountPercent'];
$newPrice = floor ($arProduct['PRICE'] / 100 * (100 - $arProduct['DISCOUNT_VALUE']));
$arProduct['DISCOUNT_PRICE'] = $arProduct['PRICE'] - $newPrice;
@ -580,12 +580,12 @@ class ICrmOrderActions
if (isset($item['initialPrice']) && $item['initialPrice'])
$arProduct['PRICE'] = (double) $item['initialPrice'];
if (isset($item['discount']) && $item['discount']) {
if (isset($item['discount'])) {
$arProduct['DISCOUNT_PRICE'] = $item['discount'];
$arProduct['PRICE'] -= $arProduct['DISCOUNT_PRICE'];
}
if (isset($item['discountPercent']) && $item['discountPercent']) {
if (isset($item['discountPercent'])) {
$arProduct['DISCOUNT_VALUE'] = $item['discountPercent'];
$newPrice = floor ($arProduct['PRICE'] / 100 * (100 - $arProduct['DISCOUNT_VALUE']));
$arProduct['DISCOUNT_PRICE'] = $arProduct['PRICE'] - $newPrice;
@ -606,7 +606,11 @@ class ICrmOrderActions
$order['deliveryCost'] = $arFields['PRICE_DELIVERY'];
if(!isset($order['summ']) || (isset($order['summ']) && !$order['summ']))
$order['summ'] = $arFields['PRICE'] - $arFields['PRICE_DELIVERY'];
$order['summ'] = $arFields['PRICE'] - $arFields['PRICE_DELIVERY'];
$wasCanaceled = false;
if($arFields['CANCELED'] == 'Y')
$wasCanaceled = true;
// orderUpdate
$arFields = self::clearArr(array(
@ -631,6 +635,11 @@ class ICrmOrderActions
// set STATUS_ID
CSaleOrder::StatusOrder($order['externalId'], $optionsPayStatuses[$order['status']]);
// uncancel order
if($wasCanaceled && ($optionsPayStatuses[$order['status']] != 'YY'))
CSaleOrder::CancelOrder($order['externalId'], "N", $order['statusComment']);
// cancel order
if($optionsPayStatuses[$order['status']] == 'YY')
CSaleOrder::CancelOrder($order['externalId'], "Y", $order['statusComment']);

3
intaro.intarocrm/classes/general/events/ICrmOrderEvent.php
View File

@ -42,6 +42,9 @@ class ICrmOrderEvent {
if(isset($arFields['LOCKED_BY']) && $arFields['LOCKED_BY'])
return;
if(isset($arFields['CANCELED']))
return;
self::writeDataOnOrderCreate($ID, $arFields);
}