RetailCRM-Mirror/bitrix-module
1
0
Fork 0
mirror of synced 2025-01-20 01:41:40 +03:00
Code Issues Projects Releases Wiki Activity

fix index, cancel status, % priceoff fix

Browse Source
This commit is contained in:
Grisha Pomadchin 2013-11-13 18:01:44 +04:00
parent 317b580d8a
commit 60c3af7f97
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -367,6 +367,9 @@ class ICrmOrderActions
while ($ar = $rsOrderProps->Fetch()) { while ($ar = $rsOrderProps->Fetch()) {
if (isset($order['deliveryAddress']) && $order['deliveryAddress']) { if (isset($order['deliveryAddress']) && $order['deliveryAddress']) {
switch ($ar['CODE']) { switch ($ar['CODE']) {
case $optionsOrderProps[$arFields['PERSON_TYPE_ID']]['index']: if (isset($order['deliveryAddress']['index']))
CSaleOrderPropsValue::Update($ar['ID'], array('VALUE' => self::fromJSON($order['deliveryAddress']['index'])));
break;
case 'CITY': if (isset($order['deliveryAddress']['city'])) case 'CITY': if (isset($order['deliveryAddress']['city']))
CSaleOrderPropsValue::Update($ar['ID'], array('VALUE' => self::fromJSON($order['deliveryAddress']['city']))); CSaleOrderPropsValue::Update($ar['ID'], array('VALUE' => self::fromJSON($order['deliveryAddress']['city'])));
break; break;
@ -441,6 +444,10 @@ class ICrmOrderActions
// here check if smth wasnt added or new propetties // here check if smth wasnt added or new propetties
if (isset($order['deliveryAddress']) && $order['deliveryAddress']) { if (isset($order['deliveryAddress']) && $order['deliveryAddress']) {
if (isset($order['deliveryAddress']['index']))
self::addOrderProperty($optionsOrderProps[$arFields['PERSON_TYPE_ID']]['index'],
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']);
@ -557,7 +564,9 @@ class ICrmOrderActions
if (isset($item['discountPercent']) && $item['discountPercent']) { if (isset($item['discountPercent']) && $item['discountPercent']) {
$arProduct['DISCOUNT_VALUE'] = $item['discountPercent']; $arProduct['DISCOUNT_VALUE'] = $item['discountPercent'];
$arProduct['PRICE'] = floor ($arProduct['PRICE'] / 100 * (100 - $arProduct['DISCOUNT_VALUE'])); $newPrice = floor ($arProduct['PRICE'] / 100 * (100 - $arProduct['DISCOUNT_VALUE']));
$arProduct['DISCOUNT_PRICE'] = $arProduct['PRICE'] - $newPrice;
$arProduct['PRICE'] -= $arProduct['DISCOUNT_PRICE'];
} }
if (isset($item['offer']['name']) && $item['offer']['name']) if (isset($item['offer']['name']) && $item['offer']['name'])
@ -578,7 +587,9 @@ class ICrmOrderActions
if (isset($item['discountPercent']) && $item['discountPercent']) { if (isset($item['discountPercent']) && $item['discountPercent']) {
$arProduct['DISCOUNT_VALUE'] = $item['discountPercent']; $arProduct['DISCOUNT_VALUE'] = $item['discountPercent'];
$arProduct['PRICE'] = floor ($arProduct['PRICE'] / 100 * (100 - $arProduct['DISCOUNT_VALUE'])); $newPrice = floor ($arProduct['PRICE'] / 100 * (100 - $arProduct['DISCOUNT_VALUE']));
$arProduct['DISCOUNT_PRICE'] = $arProduct['PRICE'] - $newPrice;
$arProduct['PRICE'] -= $arProduct['DISCOUNT_PRICE'];
} }
if (isset($item['quantity']) && $item['quantity']) if (isset($item['quantity']) && $item['quantity'])
@ -604,7 +615,7 @@ class ICrmOrderActions
//'PAYED' => $optionsPayment[$order['paymentStatus']], //'PAYED' => $optionsPayment[$order['paymentStatus']],
//'PERSON_TYPE_ID' => $optionsOrderTypes[$order['orderType']], //'PERSON_TYPE_ID' => $optionsOrderTypes[$order['orderType']],
'DELIVERY_ID' => $optionsDelivTypes[$order['deliveryType']], 'DELIVERY_ID' => $optionsDelivTypes[$order['deliveryType']],
//'STATUS_ID' => $optionsPayStatuses[$order['status']], 'STATUS_ID' => $optionsPayStatuses[$order['status']],
'REASON_CANCELED' => $order['statusComment'], 'REASON_CANCELED' => $order['statusComment'],
'USER_DESCRIPTION' => $order['customerComment'], 'USER_DESCRIPTION' => $order['customerComment'],
'COMMENTS' => $order['managerComment'] 'COMMENTS' => $order['managerComment']
@ -616,6 +627,10 @@ class ICrmOrderActions
// set STATUS_ID // set STATUS_ID
CSaleOrder::StatusOrder($order['externalId'], $optionsPayStatuses[$order['status']]); CSaleOrder::StatusOrder($order['externalId'], $optionsPayStatuses[$order['status']]);
if($optionsPayStatuses[$order['status']] == 'YY')
CSaleOrder::CancelOrder($order['externalId'], "Y", $order['statusComment']);
// set PAYED // set PAYED
CSaleOrder::PayOrder($order['externalId'], $optionsPayment[$order['paymentStatus']]); CSaleOrder::PayOrder($order['externalId'], $optionsPayment[$order['paymentStatus']]);