RetailCRM-Mirror/bitrix-module
1
0
Fork 0
mirror of synced 2024-11-29 08:46:09 +03:00
Code Issues Projects Releases Wiki Activity

price fix

Browse Source
This commit is contained in:
Grisha Pomadchin 2014-02-01 17:02:40 +04:00
parent 513f852b60
commit 8718f7f637
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -380,7 +380,7 @@ class ICrmOrderActions
// we dont need new orders without any customers (can check only for externalId) // we dont need new orders without any customers (can check only for externalId)
if(!isset($order['customer']['externalId']) && !$order['customer']['externalId']) { if(!isset($order['customer']['externalId']) && !$order['customer']['externalId']) {
if (!$order['customer']['email']) { if (!$order['customer']['email']) {
$login = 'user_' . (microtime(true) * 1000) . mt_rand(1, 1000); $login = 'user_' . (microtime(true) * 10000) . mt_rand(1, 1000);
$server_name = 0 < strlen(SITE_SERVER_NAME)? $server_name = 0 < strlen(SITE_SERVER_NAME)?
SITE_SERVER_NAME : 'server.com'; SITE_SERVER_NAME : 'server.com';
$order['customer']['email'] = $login . '@' . $server_name; $order['customer']['email'] = $login . '@' . $server_name;
@ -395,7 +395,7 @@ class ICrmOrderActions
$arUser = $dbUser->Fetch(); $arUser = $dbUser->Fetch();
$registeredUserID = $arUser['ID']; $registeredUserID = $arUser['ID'];
} else { } else {
$login = 'user_' . (microtime(true) * 1000) . mt_rand(1, 1000); $login = 'user_' . (microtime(true) * 10000) . mt_rand(1, 1000);
$registerNewUser = true; $registerNewUser = true;
} }
} }
@ -784,7 +784,7 @@ class ICrmOrderActions
// orderUpdate // orderUpdate
$arFields = self::clearArr(array( $arFields = self::clearArr(array(
'PRICE_DELIVERY' => $order['deliveryCost'], 'PRICE_DELIVERY' => $order['deliveryCost'],
'PRICE' => $order['summ'] ? $order['summ'] + (double) $order['deliveryCost'] : 0, 'PRICE' => $order['summ'] + (double) $order['deliveryCost'],
'DATE_MARKED' => $order['markDatetime'], 'DATE_MARKED' => $order['markDatetime'],
'USER_ID' => $userId, //$order['customer'] 'USER_ID' => $userId, //$order['customer']
'PAY_SYSTEM_ID' => $optionsPayTypes[$order['paymentType']], 'PAY_SYSTEM_ID' => $optionsPayTypes[$order['paymentType']],