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

ready for product statuses

Browse Source
This commit is contained in:
Ilyas Salikhov 2013-12-25 16:30:46 +04:00
parent be1041a38f
commit deac6e4cb4
1 changed files with 165 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,6 +16,8 @@ class ICrmOrderActions
protected static $CRM_ORDER_FAILED_IDS = 'order_failed_ids'; protected static $CRM_ORDER_FAILED_IDS = 'order_failed_ids';
protected static $CRM_ORDER_HISTORY_DATE = 'order_history_date'; protected static $CRM_ORDER_HISTORY_DATE = 'order_history_date';
const CANCEL_PROPERTY_CODE = 'INTAROCRM_IS_CANCELED';
/** /**
* Mass order uploading, without repeating; always returns true, but writes error log * Mass order uploading, without repeating; always returns true, but writes error log
* @param $failed -- flag to export failed orders * @param $failed -- flag to export failed orders
@ -159,10 +161,10 @@ class ICrmOrderActions
if ($lastOrderId) if ($lastOrderId)
COption::SetOptionString(self::$MODULE_ID, self::$CRM_ORDER_LAST_ID, $lastOrderId); COption::SetOptionString(self::$MODULE_ID, self::$CRM_ORDER_LAST_ID, $lastOrderId);
} else { } else {
// failed orders upload // failed orders upload
$orderCount = 0; $orderCount = 0;
$recOrders = array(); $recOrders = array();
@ -247,19 +249,41 @@ class ICrmOrderActions
return true; //all ok! return true; //all ok!
} }
protected static function updateCancelProp($arProduct, $value) {
$propUpdated = false;
foreach($arProduct['PROPS'] as $key => $item) {
if ($item['CODE'] == self::CANCEL_PROPERTY_CODE) {
$arProduct['PROPS'][$key]['VALUE'] = $value;
$propUpdated = true;
break;
}
}
if (!$propUpdated) {
$arProduct['PROPS'][] = array(
'NAME' => 'Товар в статусе отмены',
'CODE' => self::CANCEL_PROPERTY_CODE,
'VALUE' => $value,
'SORT' => 10,
);
}
return $arProduct;
}
/** /**
* *
* History update * History update
* @global CUser $USER * @global CUser $USER
* @return boolean * @return boolean
*/ */
public static function orderHistory() { public static function orderHistory() {
global $USER; global $USER;
if(!isset($USER) || !$USER) { // for agent; to add order User if(!isset($USER) || !$USER) { // for agent; to add order User
$rsUser = CUser::GetByLogin('intarocrm'); $rsUser = CUser::GetByLogin('intarocrm');
if($arUser = $rsUser->Fetch()) { if($arUser = $rsUser->Fetch()) {
$USER = new CUser; $USER = new CUser;
$USER->Update($arUser['ID'], array()); $USER->Update($arUser['ID'], array());
@ -283,7 +307,7 @@ class ICrmOrderActions
); );
$id = $user->Add($arFields); $id = $user->Add($arFields);
if (!$id) { if (!$id) {
self::eventLog('ICrmOrderActions::orderHistory', 'USER', $user->LAST_ERROR); self::eventLog('ICrmOrderActions::orderHistory', 'USER', $user->LAST_ERROR);
return; return;
@ -293,32 +317,32 @@ class ICrmOrderActions
$USER->Update($id, array()); $USER->Update($id, array());
} }
} }
if (!CModule::IncludeModule("iblock")) { if (!CModule::IncludeModule("iblock")) {
//handle err //handle err
self::eventLog('ICrmOrderActions::orderHistory', 'iblock', 'module not found'); self::eventLog('ICrmOrderActions::orderHistory', 'iblock', 'module not found');
return true; return true;
} }
if (!CModule::IncludeModule("sale")) { if (!CModule::IncludeModule("sale")) {
//handle err //handle err
self::eventLog('ICrmOrderActions::orderHistory', 'sale', 'module not found'); self::eventLog('ICrmOrderActions::orderHistory', 'sale', 'module not found');
return true; return true;
} }
if (!CModule::IncludeModule("catalog")) { if (!CModule::IncludeModule("catalog")) {
//handle err //handle err
self::eventLog('ICrmOrderActions::orderHistory', 'catalog', 'module not found'); self::eventLog('ICrmOrderActions::orderHistory', 'catalog', 'module not found');
return true; return true;
} }
$defaultSiteId = 0; $defaultSiteId = 0;
$rsSites = CSite::GetList($by, $sort, array('DEF' => 'Y')); $rsSites = CSite::GetList($by, $sort, array('DEF' => 'Y'));
while ($ar = $rsSites->Fetch()) { while ($ar = $rsSites->Fetch()) {
$defaultSiteId = $ar['LID']; $defaultSiteId = $ar['LID'];
break; break;
} }
$api_host = COption::GetOptionString(self::$MODULE_ID, self::$CRM_API_HOST_OPTION, 0); $api_host = COption::GetOptionString(self::$MODULE_ID, self::$CRM_API_HOST_OPTION, 0);
$api_key = COption::GetOptionString(self::$MODULE_ID, self::$CRM_API_KEY_OPTION, 0); $api_key = COption::GetOptionString(self::$MODULE_ID, self::$CRM_API_KEY_OPTION, 0);
@ -332,14 +356,14 @@ class ICrmOrderActions
$optionsOrderProps = unserialize(COption::GetOptionString(self::$MODULE_ID, self::$CRM_ORDER_PROPS, 0)); $optionsOrderProps = unserialize(COption::GetOptionString(self::$MODULE_ID, self::$CRM_ORDER_PROPS, 0));
$api = new IntaroCrm\RestApi($api_host, $api_key); $api = new IntaroCrm\RestApi($api_host, $api_key);
$dateStart = COption::GetOptionString(self::$MODULE_ID, self::$CRM_ORDER_HISTORY_DATE, null); $dateStart = COption::GetOptionString(self::$MODULE_ID, self::$CRM_ORDER_HISTORY_DATE, null);
$orderHistory = $api->orderHistory($dateStart); $orderHistory = $api->orderHistory($dateStart);
if($dateStart) if($dateStart)
$dateStart = new \DateTime($dateStart); $dateStart = new \DateTime($dateStart);
// pushing existing orders // pushing existing orders
foreach ($orderHistory as $order) { foreach ($orderHistory as $order) {
@ -365,39 +389,39 @@ class ICrmOrderActions
'DISCOUNT_VALUE' => 0, 'DISCOUNT_VALUE' => 0,
'USER_DESCRIPTION' => '' 'USER_DESCRIPTION' => ''
); );
if(isset($order['number']) && $order['number']) if(isset($order['number']) && $order['number'])
$GLOBALS['ICRM_ACCOUNT_NUMBER'] = $order['number']; $GLOBALS['ICRM_ACCOUNT_NUMBER'] = $order['number'];
$order['externalId'] = CSaleOrder::Add($newOrderFields); $order['externalId'] = CSaleOrder::Add($newOrderFields);
if(isset($GLOBALS['ICRM_ACCOUNT_NUMBER'])) if(isset($GLOBALS['ICRM_ACCOUNT_NUMBER']))
unset($GLOBALS['ICRM_ACCOUNT_NUMBER']); unset($GLOBALS['ICRM_ACCOUNT_NUMBER']);
$api->orderFixExternalIds(array(array('id' => $order['id'], 'externalId' => $order['externalId']))); $api->orderFixExternalIds(array(array('id' => $order['id'], 'externalId' => $order['externalId'])));
if ($api->getStatusCode() != 200) { if ($api->getStatusCode() != 200) {
//handle err - write log & continue //handle err - write log & continue
self::eventLog('ICrmOrderActions::orderHistory', 'IntaroCrm\RestApi::orderFixExternalIds', $api->getLastError()); self::eventLog('ICrmOrderActions::orderHistory', 'IntaroCrm\RestApi::orderFixExternalIds', $api->getLastError());
continue; continue;
} }
} }
if(isset($order['externalId']) && $order['externalId']) { if(isset($order['externalId']) && $order['externalId']) {
$arFields = CSaleOrder::GetById($order['externalId']); $arFields = CSaleOrder::GetById($order['externalId']);
// incorrect order // incorrect order
if(!$arFields || empty($arFields)) if(!$arFields || empty($arFields))
continue; continue;
$LID = $arFields['LID']; $LID = $arFields['LID'];
$userId = $arFields['USER_ID']; $userId = $arFields['USER_ID'];
if(isset($order['customer']['externalId']) && $order['customer']['externalId']) if(isset($order['customer']['externalId']) && $order['customer']['externalId'])
$userId = $order['customer']['externalId']; $userId = $order['customer']['externalId'];
$rsOrderProps = CSaleOrderPropsValue::GetList(array(), array('ORDER_ID' => $arFields['ID'])); $rsOrderProps = CSaleOrderPropsValue::GetList(array(), array('ORDER_ID' => $arFields['ID']));
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']) {
@ -475,13 +499,13 @@ 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'])) if (isset($order['deliveryAddress']['index']))
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']);
@ -490,35 +514,35 @@ class ICrmOrderActions
if (count($optionsOrderProps[$arFields['PERSON_TYPE_ID']] > 4)) { if (count($optionsOrderProps[$arFields['PERSON_TYPE_ID']] > 4)) {
if (isset($order['deliveryAddress']['street'])) if (isset($order['deliveryAddress']['street']))
self::addOrderProperty($optionsOrderProps[$arFields['PERSON_TYPE_ID']]['street'], self::addOrderProperty($optionsOrderProps[$arFields['PERSON_TYPE_ID']]['street'],
self::fromJSON($order['deliveryAddress']['street']), $order['externalId']); self::fromJSON($order['deliveryAddress']['street']), $order['externalId']);
if (isset($order['deliveryAddress']['building'])) if (isset($order['deliveryAddress']['building']))
self::addOrderProperty($optionsOrderProps[$arFields['PERSON_TYPE_ID']]['building'], self::addOrderProperty($optionsOrderProps[$arFields['PERSON_TYPE_ID']]['building'],
self::fromJSON($order['deliveryAddress']['bulding']), $order['externalId']); self::fromJSON($order['deliveryAddress']['bulding']), $order['externalId']);
if (isset($order['deliveryAddress']['flat'])) if (isset($order['deliveryAddress']['flat']))
self::addOrderProperty($optionsOrderProps[$arFields['PERSON_TYPE_ID']]['flat'], self::addOrderProperty($optionsOrderProps[$arFields['PERSON_TYPE_ID']]['flat'],
self::fromJSON($order['deliveryAddress']['flat']), $order['externalId']); self::fromJSON($order['deliveryAddress']['flat']), $order['externalId']);
if (isset($order['deliveryAddress']['intercomcode'])) if (isset($order['deliveryAddress']['intercomcode']))
self::addOrderProperty($optionsOrderProps[$arFields['PERSON_TYPE_ID']]['intercomcode'], self::addOrderProperty($optionsOrderProps[$arFields['PERSON_TYPE_ID']]['intercomcode'],
self::fromJSON($order['deliveryAddress']['intercomcode']), $order['externalId']); self::fromJSON($order['deliveryAddress']['intercomcode']), $order['externalId']);
if (isset($order['deliveryAddress']['floor'])) if (isset($order['deliveryAddress']['floor']))
self::addOrderProperty($optionsOrderProps[$arFields['PERSON_TYPE_ID']]['floor'], self::addOrderProperty($optionsOrderProps[$arFields['PERSON_TYPE_ID']]['floor'],
self::fromJSON($order['deliveryAddress']['floor']), $order['externalId']); self::fromJSON($order['deliveryAddress']['floor']), $order['externalId']);
if (isset($order['deliveryAddress']['block'])) if (isset($order['deliveryAddress']['block']))
self::addOrderProperty($optionsOrderProps[$arFields['PERSON_TYPE_ID']]['block'], self::addOrderProperty($optionsOrderProps[$arFields['PERSON_TYPE_ID']]['block'],
self::fromJSON($order['deliveryAddress']['block']), $order['externalId']); self::fromJSON($order['deliveryAddress']['block']), $order['externalId']);
if (isset($order['deliveryAddress']['house'])) if (isset($order['deliveryAddress']['house']))
self::addOrderProperty($optionsOrderProps[$arFields['PERSON_TYPE_ID']]['house'], self::addOrderProperty($optionsOrderProps[$arFields['PERSON_TYPE_ID']]['house'],
self::fromJSON($order['deliveryAddress']['house']), $order['externalId']); self::fromJSON($order['deliveryAddress']['house']), $order['externalId']);
} }
} }
if (isset($order['phone'])) if (isset($order['phone']))
self::addOrderProperty($optionsOrderProps[$arFields['PERSON_TYPE_ID']]['phone'], self::addOrderProperty($optionsOrderProps[$arFields['PERSON_TYPE_ID']]['phone'],
self::fromJSON($order['phone']), $order['externalId']); self::fromJSON($order['phone']), $order['externalId']);
@ -553,22 +577,36 @@ class ICrmOrderActions
if(!isset($item['offer']) && !$item['offer']['externalId']) if(!isset($item['offer']) && !$item['offer']['externalId'])
continue; continue;
$p = CSaleBasket::GetList( $p = CSaleBasket::GetList(
array('PRODUCT_ID' => 'ASC'), array('PRODUCT_ID' => 'ASC'),
array('ORDER_ID' => $order['externalId'], 'PRODUCT_ID' => $item['offer']['externalId']))->Fetch(); array('ORDER_ID' => $order['externalId'], 'PRODUCT_ID' => $item['offer']['externalId'])
)->Fetch();
if(!$p)
if (!$p) {
$p = CIBlockElement::GetByID($item['offer']['externalId'])->Fetch(); $p = CIBlockElement::GetByID($item['offer']['externalId'])->Fetch();
$p[self::CANCEL_PROPERTY_CODE] = 0;
}
else {
//for basket props updating (in props we save cancel status)
$propResult = CSaleBasket::GetPropsList(
array(),
array('BASKET_ID' => $p['ID'])
);
while($r = $propResult->Fetch()) {
$p['PROPS'][] = $r;
}
}
// change existing basket items // change existing basket items
$arProduct = array(); $arProduct = array();
// create new // create new
if(isset($item['created']) && $item['created']) { if(isset($item['created']) && $item['created']) {
$productPrice = GetCatalogProductPrice($item['offer']['externalId'], 1); $productPrice = GetCatalogProductPrice($item['offer']['externalId'], 1);
$arProduct = array( $arProduct = array(
'FUSER_ID' => $userId, 'FUSER_ID' => $userId,
'ORDER_ID' => $order['externalId'], 'ORDER_ID' => $order['externalId'],
@ -593,41 +631,59 @@ class ICrmOrderActions
$arProduct['PRICE'] = (double) $item['initialPrice']; $arProduct['PRICE'] = (double) $item['initialPrice'];
if (isset($item['discount'])) { if (isset($item['discount'])) {
$arProduct['DISCOUNT_PRICE'] = $item['discount']; $arProduct['DISCOUNT_PRICE'] = $item['discount'];
} }
if (isset($item['discountPercent'])) { if (isset($item['discountPercent'])) {
$arProduct['DISCOUNT_VALUE'] = $item['discountPercent']; $arProduct['DISCOUNT_VALUE'] = $item['discountPercent'];
$newPrice = floor ($arProduct['PRICE'] / 100 * (100 - $arProduct['DISCOUNT_VALUE'])); $newPrice = floor ($arProduct['PRICE'] / 100 * (100 - $arProduct['DISCOUNT_VALUE']));
$arProduct['DISCOUNT_PRICE'] = $arProduct['DISCOUNT_PRICE'] + $arProduct['PRICE'] - $newPrice; $arProduct['DISCOUNT_PRICE'] = $arProduct['DISCOUNT_PRICE'] + $arProduct['PRICE'] - $newPrice;
} }
if(isset($item['discount']) || isset($item['discountPercent'])) if(isset($item['discount']) || isset($item['discountPercent']))
$arProduct['PRICE'] -= $arProduct['DISCOUNT_PRICE']; $arProduct['PRICE'] -= $arProduct['DISCOUNT_PRICE'];
if (isset($item['offer']['name']) && $item['offer']['name']) if (isset($item['offer']['name']) && $item['offer']['name'])
$arProduct['NAME'] = self::fromJSON($item['offer']['name']); $arProduct['NAME'] = self::fromJSON($item['offer']['name']);
if (isset($item['isCanceled'])) {
//for product excluding from order
$arProduct['PRICE'] = 0;
self::updateCancelProp($arProduct, 1);
}
CSaleBasket::Add($arProduct); CSaleBasket::Add($arProduct);
continue; continue;
} }
// update old $arProduct['PROPS'] = $p['PROPS'];
if (isset($item['initialPrice']) && $item['initialPrice'])
$arProduct['PRICE'] = (double) $item['initialPrice'];
if (isset($item['discount'])) { if (!isset($item['isCanceled']) {
$arProduct['DISCOUNT_PRICE'] = $item['discount']; // update old
if (isset($item['initialPrice']) && $item['initialPrice'])
$arProduct['PRICE'] = (double) $item['initialPrice'];
if (isset($item['discount'])) {
$arProduct['DISCOUNT_PRICE'] = $item['discount'];
}
if (isset($item['discountPercent'])) {
$arProduct['DISCOUNT_VALUE'] = $item['discountPercent'];
$newPrice = floor ($arProduct['PRICE'] / 100 * (100 - $arProduct['DISCOUNT_VALUE']));
$arProduct['DISCOUNT_PRICE'] = $arProduct['DISCOUNT_PRICE'] + $arProduct['PRICE'] - $newPrice;
}
if(isset($item['discount']) || isset($item['discountPercent']))
$arProduct['PRICE'] -= $arProduct['DISCOUNT_PRICE'];
self::updateCancelProp($arProduct, 0);
}
else {
//for product excluding from order
$arProduct['PRICE'] = 0;
self::updateCancelProp($arProduct, 1);
} }
if (isset($item['discountPercent'])) {
$arProduct['DISCOUNT_VALUE'] = $item['discountPercent'];
$newPrice = floor ($arProduct['PRICE'] / 100 * (100 - $arProduct['DISCOUNT_VALUE']));
$arProduct['DISCOUNT_PRICE'] = $arProduct['DISCOUNT_PRICE'] + $arProduct['PRICE'] - $newPrice;
}
if(isset($item['discount']) || isset($item['discountPercent']))
$arProduct['PRICE'] -= $arProduct['DISCOUNT_PRICE'];
if (isset($item['quantity']) && $item['quantity']) if (isset($item['quantity']) && $item['quantity'])
$arProduct['QUANTITY'] = $item['quantity']; $arProduct['QUANTITY'] = $item['quantity'];
@ -637,17 +693,17 @@ class ICrmOrderActions
CSaleBasket::Update($p['ID'], $arProduct); CSaleBasket::Update($p['ID'], $arProduct);
CSaleBasket::DeleteAll($userId); CSaleBasket::DeleteAll($userId);
} }
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'] = $arFields['PRICE'] - $arFields['PRICE_DELIVERY']; $order['summ'] = $arFields['PRICE'] - $arFields['PRICE_DELIVERY'];
$wasCanaceled = false; $wasCanaceled = false;
if($arFields['CANCELED'] == 'Y') if($arFields['CANCELED'] == 'Y')
$wasCanaceled = true; $wasCanaceled = true;
// orderUpdate // orderUpdate
$arFields = self::clearArr(array( $arFields = self::clearArr(array(
@ -664,7 +720,7 @@ class ICrmOrderActions
'USER_DESCRIPTION' => $order['customerComment'], 'USER_DESCRIPTION' => $order['customerComment'],
'COMMENTS' => $order['managerComment'] 'COMMENTS' => $order['managerComment']
)); ));
$GLOBALS['INTARO_CRM_FROM_HISTORY'] = true; $GLOBALS['INTARO_CRM_FROM_HISTORY'] = true;
CSaleOrder::Update($order['externalId'], $arFields); CSaleOrder::Update($order['externalId'], $arFields);
@ -686,12 +742,12 @@ class ICrmOrderActions
CSaleOrder::PayOrder($order['externalId'], $optionsPayment[$order['paymentStatus']]); CSaleOrder::PayOrder($order['externalId'], $optionsPayment[$order['paymentStatus']]);
$dateStart = new \DateTime(); $dateStart = new \DateTime();
} }
} }
if(count($orderHistory)) if(count($orderHistory))
COption::SetOptionString(self::$MODULE_ID, self::$CRM_ORDER_HISTORY_DATE, $dateStart->format('Y-m-d H:i:s')); COption::SetOptionString(self::$MODULE_ID, self::$CRM_ORDER_HISTORY_DATE, $dateStart->format('Y-m-d H:i:s'));
return true; return true;
} }
@ -723,10 +779,10 @@ class ICrmOrderActions
$failedIds = unserialize(COption::GetOptionString(self::$MODULE_ID, self::$CRM_ORDER_FAILED_IDS, 0)); $failedIds = unserialize(COption::GetOptionString(self::$MODULE_ID, self::$CRM_ORDER_FAILED_IDS, 0));
if(is_array($failedIds) && !empty($failedIds)) if(is_array($failedIds) && !empty($failedIds))
self::uploadOrders(50, true); // upload failed orders self::uploadOrders(50, true); // upload failed orders
return 'ICrmOrderActions::uploadOrdersAgent();'; return 'ICrmOrderActions::uploadOrdersAgent();';
} }
/** /**
* *
* Agent function * Agent function
@ -738,11 +794,11 @@ class ICrmOrderActions
self::orderHistory(); self::orderHistory();
return 'ICrmOrderActions::orderHistoryAgent();'; return 'ICrmOrderActions::orderHistoryAgent();';
} }
/** /**
* *
* creates order or returns array of order and customer for mass upload * creates order or returns array of order and customer for mass upload
* *
* @param type $orderId * @param type $orderId
* @param type $api * @param type $api
* @param type $arParams * @param type $arParams
@ -754,7 +810,7 @@ class ICrmOrderActions
if(!$api || empty($arParams)) { // add cond to check $arParams if(!$api || empty($arParams)) { // add cond to check $arParams
return false; return false;
} }
if (empty($arFields)) { if (empty($arFields)) {
//handle err //handle err
self::eventLog('ICrmOrderActions::orderCreate', 'empty($arFields)', 'incorrect order'); self::eventLog('ICrmOrderActions::orderCreate', 'empty($arFields)', 'incorrect order');
@ -799,10 +855,10 @@ class ICrmOrderActions
'phones' => $phones, 'phones' => $phones,
'createdAt' => $createdAt 'createdAt' => $createdAt
)); ));
if($send) if($send)
$customer = $api->customerEdit($customer); $customer = $api->customerEdit($customer);
// error pushing customer // error pushing customer
if (!$customer) { if (!$customer) {
//handle err //handle err
@ -846,7 +902,7 @@ class ICrmOrderActions
case $arParams['optionsOrderProps'][$arFields['PERSON_TYPE_ID']]['email']: $resOrder['email'] = $ar['VALUE']; case $arParams['optionsOrderProps'][$arFields['PERSON_TYPE_ID']]['email']: $resOrder['email'] = $ar['VALUE'];
break; break;
} }
if (count($arParams['optionsOrderProps'][$arFields['PERSON_TYPE_ID']] > 4)) { if (count($arParams['optionsOrderProps'][$arFields['PERSON_TYPE_ID']] > 4)) {
switch ($ar['CODE']) { switch ($ar['CODE']) {
/*case $arParams['optionsOrderProps'][$arFields['PERSON_TYPE_ID']]['country']: $resOrderDeliveryAddress['country'] = self::toJSON($ar['VALUE']); /*case $arParams['optionsOrderProps'][$arFields['PERSON_TYPE_ID']]['country']: $resOrderDeliveryAddress['country'] = self::toJSON($ar['VALUE']);
@ -877,6 +933,15 @@ class ICrmOrderActions
$rsOrderBasket = CSaleBasket::GetList(array('PRODUCT_ID' => 'ASC'), array('ORDER_ID' => $arFields['ID'])); $rsOrderBasket = CSaleBasket::GetList(array('PRODUCT_ID' => 'ASC'), array('ORDER_ID' => $arFields['ID']));
while ($p = $rsOrderBasket->Fetch()) { while ($p = $rsOrderBasket->Fetch()) {
//for basket props updating (in props we save cancel status)
$propCancel = CSaleBasket::GetPropsList(
array(),
array('BASKET_ID' => $p['ID'], 'CODE' => self::CANCEL_PROPERTY_CODE)
)->Fetch();
if ($propCancel) {
$propCancel = (int)$propCancel['VALUE'];
}
$pr = CCatalogProduct::GetList(array('ID' => $p['PRODUCT_ID']))->Fetch(); $pr = CCatalogProduct::GetList(array('ID' => $p['PRODUCT_ID']))->Fetch();
if ($pr) if ($pr)
$pr = $pr['PURCHASING_PRICE']; $pr = $pr['PURCHASING_PRICE'];
@ -884,14 +949,17 @@ class ICrmOrderActions
$pr = ''; $pr = '';
$items[] = array( $items[] = array(
'initialPrice' => (double) $p['PRICE'] + (double) $p['DISCOUNT_PRICE'],
//'purchasePrice' => $pr,
'discount' => $p['DISCOUNT_PRICE'],
'discountPercent' => 0, 'discountPercent' => 0,
'quantity' => $p['QUANTITY'], 'quantity' => $p['QUANTITY'],
'productId' => $p['PRODUCT_ID'], 'productId' => $p['PRODUCT_ID'],
'productName' => self::toJSON($p['NAME']) 'productName' => self::toJSON($p['NAME'])
); );
//if it is canceled product don't send price
if (!$propCancel) {
$items['initialPrice'] = (double) $p['PRICE'] + (double) $p['DISCOUNT_PRICE'];
$items['discount'] => $p['DISCOUNT_PRICE']
}
} }
if($arFields['CANCELED'] == 'Y') if($arFields['CANCELED'] == 'Y')
@ -928,7 +996,7 @@ class ICrmOrderActions
if(isset($arParams['optionsSites']) && is_array($arParams['optionsSites']) if(isset($arParams['optionsSites']) && is_array($arParams['optionsSites'])
&& in_array($arFields['LID'], $arParams['optionsSites'])) && in_array($arFields['LID'], $arParams['optionsSites']))
$resOrder['site'] = $arFields['LID']; $resOrder['site'] = $arFields['LID'];
// parse fio // parse fio
if(count($contactNameArr) == 1) { if(count($contactNameArr) == 1) {
$resOrder['firstName'] = $contactNameArr[0]; $resOrder['firstName'] = $contactNameArr[0];
@ -937,12 +1005,12 @@ class ICrmOrderActions
$resOrder['firstName'] = $contactNameArr[1]; $resOrder['firstName'] = $contactNameArr[1];
$resOrder['patronymic'] = $contactNameArr[2]; $resOrder['patronymic'] = $contactNameArr[2];
} }
$resOrder = self::clearArr($resOrder); $resOrder = self::clearArr($resOrder);
if($send) if($send)
return $api->orderEdit($resOrder); return $api->orderEdit($resOrder);
return array( return array(
'order' => $resOrder, 'order' => $resOrder,
'customer' => $customer 'customer' => $customer
@ -1005,20 +1073,20 @@ class ICrmOrderActions
foreach($array as $ar) { foreach($array as $ar) {
if(!$ar) if(!$ar)
continue; continue;
$newArray[] = $ar; $newArray[] = $ar;
} }
return $newArray; return $newArray;
} }
public static function addOrderProperty($code, $value, $order) { public static function addOrderProperty($code, $value, $order) {
if (!$code) if (!$code)
return; return;
if (!CModule::IncludeModule('sale')) if (!CModule::IncludeModule('sale'))
return; return;
if ($arProp = CSaleOrderProps::GetList(array(), array('CODE' => $code))->Fetch()) { if ($arProp = CSaleOrderProps::GetList(array(), array('CODE' => $code))->Fetch()) {
return CSaleOrderPropsValue::Add(array( return CSaleOrderPropsValue::Add(array(
'NAME' => $arProp['NAME'], 'NAME' => $arProp['NAME'],
@ -1029,18 +1097,18 @@ class ICrmOrderActions
)); ));
} }
} }
public static function getLocationCityId($cityName) { public static function getLocationCityId($cityName) {
if(!$cityName) if(!$cityName)
return; return;
$dbLocation = CSaleLocation::GetList( $dbLocation = CSaleLocation::GetList(
array( array(
"SORT" => "ASC", "SORT" => "ASC",
"CITY_NAME_LANG" => "ASC" "CITY_NAME_LANG" => "ASC"
), ),
array("LID" => "ru", "CITY_NAME" => $cityName), false, false, array()); array("LID" => "ru", "CITY_NAME" => $cityName), false, false, array());
if($location = $dbLocation->Fetch()) if($location = $dbLocation->Fetch())
return $location['ID']; return $location['ID'];
} }