From 88ca56156e54418d812bb270e92d719691139704 Mon Sep 17 00:00:00 2001
From: Dmitry Mamontov <d.slonyara@gmail.com>
Date: Fri, 13 Feb 2015 17:56:50 +0300
Subject: [PATCH] fix comment and method

---
 .../classes/general/ICrmOrderActions.php            | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/intaro.intarocrm/classes/general/ICrmOrderActions.php b/intaro.intarocrm/classes/general/ICrmOrderActions.php
index c64a4203..07d8750c 100755
--- a/intaro.intarocrm/classes/general/ICrmOrderActions.php
+++ b/intaro.intarocrm/classes/general/ICrmOrderActions.php
@@ -1073,7 +1073,7 @@ class ICrmOrderActions
      */
 
     public static function notForkedOrderAgent() {
-        //self::uploadOrdersAgent();
+        self::uploadOrdersAgent();
         self::orderHistory();
         return 'ICrmOrderActions::notForkedOrderAgent();';
     }
@@ -1238,12 +1238,6 @@ class ICrmOrderActions
 
             if (count($arParams['optionsOrderProps'][$arFields['PERSON_TYPE_ID']]) > 4) {
                 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']);
                         break;
                     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']],
             'paymentStatus'   => $arParams['optionsPayment'][$arFields['PAYED']],
             'orderType'       => $arParams['optionsOrderTypes'][$arFields['PERSON_TYPE_ID']],
-            /*'deliveryType'    => $arParams['optionsDelivTypes'][$resultDeliveryTypeId],
-            'deliveryService' => ($arParams['optionsDelivTypes'][$resultDeliveryTypeId]) ? $deliveryService : '',*/
             'status'          => $arParams['optionsPayStatuses'][$arFields['STATUS_ID']],
             'statusComment'   => $statusComment,
             'customerComment' => $customerComment,
             'managerComment'  => $managerComment,
             'createdAt'       => $createdAt,
-            //'deliveryAddress' => $resOrderDeliveryAddress,
             'delivery'        => $delivery,
             'discount'        => $arFields['DISCOUNT_VALUE'],
             'items'           => $items
@@ -1556,4 +1547,4 @@ class RetailUser extends CUser
             }
         }
     }
-}
\ No newline at end of file
+}