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

new orders create

Browse Source
This commit is contained in:
Grisha Pomadchin 2013-10-02 17:45:28 +04:00
parent 0d8d174980
commit 8508c6bebb
1 changed files with 69 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -279,6 +279,11 @@ class ICrmOrderActions
return true; return true;
} }
$defaultSiteId = 0;
$rsSites = CSite::GetList($by, $sort, array('DEF' => 'Y'));
while ($ar = $rsSites->Fetch())
$defaultSiteId = $ar['LID'];
$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);
@ -297,21 +302,24 @@ class ICrmOrderActions
// pushing existing orders // pushing existing orders
foreach ($orderHistory as $order) { foreach ($orderHistory as $order) {
var_dump($order);
// выбрасываем заказы от 'новых клиентов'
if(!isset($order['customer']) && !$order['customer'])
continue;
if(!isset($order['externalId']) && !$order['externalId']) { if(!isset($order['externalId']) && !$order['externalId']) {
continue;
// new order // new order
/*array( $newOrderFields = array(
'LID' => SITE_ID, //<----! 'LID' => $defaultSiteId, //<----!
'PERSON_TYPE_ID' => 1, // <------! 'PERSON_TYPE_ID' => $optionsOrderTypes[$order['orderType']], // <------!
'PAYED' => 'N', 'PAYED' => 'N',
'CANCELED' => 'N', 'CANCELED' => 'N',
'STATUS_ID' => 'N', 'STATUS_ID' => 'N',
'PRICE' => 0, 'PRICE' => 0,
'CURRENCY' => 'RUB', 'CURRENCY' => 'RUB',
'USER_ID' => IntVal($USER->GetID()), // <--------! 'USER_ID' => $order['customer'], // <--------!
'PAY_SYSTEM_ID' => 0, 'PAY_SYSTEM_ID' => 0,
'PRICE_DELIVERY' => 0, 'PRICE_DELIVERY' => 0,
'DELIVERY_ID' => 0, 'DELIVERY_ID' => 0,
@ -319,17 +327,18 @@ class ICrmOrderActions
'USER_DESCRIPTION' => '' 'USER_DESCRIPTION' => ''
); );
$order['externalId'] = CSaleOrder::Add(array()); if(isset($order['number']) && $order['number'])
$newOrderFields['ACCOUNT_NUMBER'] = $order['number'];
$api->orderFixExternalIds(array($order['id'], $order['externalId'])); $order['externalId'] = CSaleOrder::Add($newOrderFields);
$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']) {
@ -347,6 +356,8 @@ class ICrmOrderActions
$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($order['externalId'] == 45)
var_dump($ar);
if (isset($order['deliveryAddress']) && $order['deliveryAddress']) { if (isset($order['deliveryAddress']) && $order['deliveryAddress']) {
switch ($ar['CODE']) { switch ($ar['CODE']) {
case 'CITY': if (isset($order['deliveryAddress']['city'])) case 'CITY': if (isset($order['deliveryAddress']['city']))
@ -479,13 +490,24 @@ class ICrmOrderActions
self::addOrderProperty($optionsOrderProps[$arFields['PERSON_TYPE_ID']]['fio'], self::addOrderProperty($optionsOrderProps[$arFields['PERSON_TYPE_ID']]['fio'],
implode(" ", $contactName), $order['externalId']); implode(" ", $contactName), $order['externalId']);
/*foreach($order['items'] as $item) { foreach($order['items'] as $item) {
if(!isset($item['offer']) && !$item['offer']['externalId'])
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 not found if(!$p)
continue; $p = CIBlockElement::GetByID($item['offer']['externalId'])->Fetch();
var_dump($p);
var_dump(GetCatalogProductPrice($item['offer']['externalId'], 1));
//if(!$p) // if not found
// continue;
//echo 1;
// del from basket // del from basket
if(isset($item['deleted']) && $item['deleted']) { if(isset($item['deleted']) && $item['deleted']) {
@ -494,18 +516,19 @@ class ICrmOrderActions
} }
// change existing basket items // change existing basket items
if(!isset($item['offer']) && !$item['offer']['externalId'])
continue;
$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);
$arProduct = array( $arProduct = array(
'FUSER_ID' => $userId, 'FUSER_ID' => $userId,
'ORDER_ID' => $order['externalId'], 'ORDER_ID' => $order['externalId'],
'QUANTITY' => $item['quantity'], 'QUANTITY' => $item['quantity'],
'CURRENCY' => $p['CURRENCY'], 'CURRENCY' => $productPrice['CURRENCY'],
'LID' => $LID, 'LID' => $LID,
'PRODUCT_ID' => $item['offer']['externalId'], 'PRODUCT_ID' => $item['offer']['externalId'],
'PRODUCT_PRICE_ID' => $p['PRODUCT_PRICE_ID'], 'PRODUCT_PRICE_ID' => $p['PRODUCT_PRICE_ID'],
@ -536,29 +559,34 @@ class ICrmOrderActions
if (isset($item['offer']['name']) && $item['offer']['name']) if (isset($item['offer']['name']) && $item['offer']['name'])
$arProduct['NAME'] = $item['offer']['name']; $arProduct['NAME'] = $item['offer']['name'];
CSaleBasket::Add($arProduct);
continue; var_dump($arProduct);
var_dump(CSaleBasket::Add($arProduct));
//continue;
} }
// update old if ($p) {
if(isset($item['initialPrice']) && $item['initialPrice']) // update old
$arProduct['PRICE'] = (double) $item['initialPrice']; if (isset($item['initialPrice']) && $item['initialPrice'])
$arProduct['PRICE'] = (double) $item['initialPrice'];
if(isset($item['dicount']) && $item['discount']){ if (isset($item['dicount']) && $item['discount']) {
$arProduct['PRICE'] = $arProducts['PRICE'] - (double) $item['disount']; $arProduct['PRICE'] = $arProducts['PRICE'] - (double) $item['disount'];
$arProduct['DISCOUNT_PRICE'] = $item['discount']; $arProduct['DISCOUNT_PRICE'] = $item['discount'];
}
if (isset($item['discountPercent']) && $item['discountPercent']) {
//$arProducts['PRICE'] -- how ?
$arProduct['DISCOUNT_VALUE'] = $item['discountPercent'];
}
if (isset($item['offer']['name']) && $item['offer']['name'])
$arProduct['NAME'] = $item['offer']['name'];
CSaleBasket::Update($p['ID'], $arProduct);
} }
}
if(isset($item['discountPercent']) && $item['discountPercent']) {
//$arProducts['PRICE'] -- how ?
$arProduct['DISCOUNT_VALUE'] = $item['discountPercent'];
}
if(isset($item['offer']['name']) && $item['offer']['name'])
$arProduct['NAME'] = $item['offer']['name'];
CSaleBasket::Update($p['ID'], $arProduct);
}*/
// orderUpdate // orderUpdate
$arFields = self::clearArr(array( $arFields = self::clearArr(array(
@ -806,6 +834,8 @@ class ICrmOrderActions
'managerComment' => $arFields['COMMENTS'], 'managerComment' => $arFields['COMMENTS'],
'createdAt' => $createdAt, 'createdAt' => $createdAt,
'deliveryAddress' => $resOrderDeliveryAddress, 'deliveryAddress' => $resOrderDeliveryAddress,
'discount' => $arFields['DISCOUNT_PRICE'],
'discountPercent' => $arFields['DISCOUNT_VALUE'],
'items' => $items 'items' => $items
); );