RetailCRM-Mirror/bitrix-module
1
0
Fork 0
mirror of synced 2025-01-19 17:31:43 +03:00
Code Issues Projects Releases Wiki Activity

fix comment and method

Browse Source
This commit is contained in:
Dmitry Mamontov 2015-02-13 17:56:50 +03:00
parent 54e953eec4
commit 88ca56156e
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1073,7 +1073,7 @@ class ICrmOrderActions
*/ */
public static function notForkedOrderAgent() { public static function notForkedOrderAgent() {
//self::uploadOrdersAgent(); self::uploadOrdersAgent();
self::orderHistory(); self::orderHistory();
return 'ICrmOrderActions::notForkedOrderAgent();'; return 'ICrmOrderActions::notForkedOrderAgent();';
} }
@ -1238,12 +1238,6 @@ class ICrmOrderActions
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']);
break;
case $arParams['optionsOrderProps'][$arFields['PERSON_TYPE_ID']]['region']: $resOrderDeliveryAddress['region'] = self::toJSON($ar['VALUE']);
break;
case $arParams['optionsOrderProps'][$arFields['PERSON_TYPE_ID']]['city']: $resOrderDeliveryAddress['city'] = self::toJSON($ar['VALUE']);
break; */
case $arParams['optionsOrderProps'][$arFields['PERSON_TYPE_ID']]['street']: $resOrderDeliveryAddress['street'] = self::toJSON($ar['VALUE']); case $arParams['optionsOrderProps'][$arFields['PERSON_TYPE_ID']]['street']: $resOrderDeliveryAddress['street'] = self::toJSON($ar['VALUE']);
break; break;
case $arParams['optionsOrderProps'][$arFields['PERSON_TYPE_ID']]['building']: $resOrderDeliveryAddress['building'] = self::toJSON($ar['VALUE']); case $arParams['optionsOrderProps'][$arFields['PERSON_TYPE_ID']]['building']: $resOrderDeliveryAddress['building'] = self::toJSON($ar['VALUE']);
@ -1333,14 +1327,11 @@ class ICrmOrderActions
'paymentType' => $arParams['optionsPayTypes'][$arFields['PAY_SYSTEM_ID']], 'paymentType' => $arParams['optionsPayTypes'][$arFields['PAY_SYSTEM_ID']],
'paymentStatus' => $arParams['optionsPayment'][$arFields['PAYED']], 'paymentStatus' => $arParams['optionsPayment'][$arFields['PAYED']],
'orderType' => $arParams['optionsOrderTypes'][$arFields['PERSON_TYPE_ID']], 'orderType' => $arParams['optionsOrderTypes'][$arFields['PERSON_TYPE_ID']],
/*'deliveryType' => $arParams['optionsDelivTypes'][$resultDeliveryTypeId],
'deliveryService' => ($arParams['optionsDelivTypes'][$resultDeliveryTypeId]) ? $deliveryService : '',*/
'status' => $arParams['optionsPayStatuses'][$arFields['STATUS_ID']], 'status' => $arParams['optionsPayStatuses'][$arFields['STATUS_ID']],
'statusComment' => $statusComment, 'statusComment' => $statusComment,
'customerComment' => $customerComment, 'customerComment' => $customerComment,
'managerComment' => $managerComment, 'managerComment' => $managerComment,
'createdAt' => $createdAt, 'createdAt' => $createdAt,
//'deliveryAddress' => $resOrderDeliveryAddress,
'delivery' => $delivery, 'delivery' => $delivery,
'discount' => $arFields['DISCOUNT_VALUE'], 'discount' => $arFields['DISCOUNT_VALUE'],
'items' => $items 'items' => $items
@ -1556,4 +1547,4 @@ class RetailUser extends CUser
} }
} }
} }
} }