From 3e9f019f7e7dff409fe31d9d61d041138ee648c5 Mon Sep 17 00:00:00 2001
From: Grisha Pomadchin <gr.pomadchin@gmail.com>
Date: Thu, 12 Sep 2013 16:27:43 +0400
Subject: [PATCH] fio fix

---
 .../classes/general/ICrmOrderActions.php       | 18 +++++++++++-------
 .../classes/general/events/ICrmOrderEvent.php  |  2 --
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/intaro.intarocrm/classes/general/ICrmOrderActions.php b/intaro.intarocrm/classes/general/ICrmOrderActions.php
index 7a5c79d5..4d78e8ea 100755
--- a/intaro.intarocrm/classes/general/ICrmOrderActions.php
+++ b/intaro.intarocrm/classes/general/ICrmOrderActions.php
@@ -320,7 +320,7 @@ class ICrmOrderActions
             'orderType'       => $arParams['optionsOrderTypes'][$arFields['PERSON_TYPE_ID']],
             'deliveryType'    => $arParams['optionsDelivTypes'][$resultDeliveryTypeId],
             'status'          => $arParams['optionsPayStatuses'][$arFields['STATUS_ID']],
-            'statusComment'   => $arFields['REASON_CANCELED'],
+            'statusComment'   => $arFields['USER_DESCRIPTION'],
             'createdAt'       => $createdAt,
             'deliveryAddress' => $resOrderDeliveryAddress,
             'items'           => $items
@@ -330,9 +330,9 @@ class ICrmOrderActions
         if(count($contactNameArr) == 1) {
             $resOrder['firstName'] = $contactNameArr[0];
         } else {
-            $resOrder['lastName'] = $contactNameArr['contactName'][0];
-            $resOrder['firstName'] = $contactNameArr['contactName'][1];
-            $resOrder['patronymic'] = $contactNameArr['contactName'][2];
+            $resOrder['lastName'] = $contactNameArr[0];
+            $resOrder['firstName'] = $contactNameArr[1];
+            $resOrder['patronymic'] = $contactNameArr[2];
         }
 
         $resOrder = self::clearArr($resOrder);
@@ -397,11 +397,15 @@ class ICrmOrderActions
             return array();
 
         $array = explode(" ", self::toJSON($str), 3);
+        $newArray = array();
 
-        foreach($array as &$ar)
+        foreach($array as $ar) {
             if(!$ar)
-                unset($ar);
+                continue;
+            
+            $newArray[] = $ar;
+        }
         
-        return $array;
+        return $newArray;
     }
 }
diff --git a/intaro.intarocrm/classes/general/events/ICrmOrderEvent.php b/intaro.intarocrm/classes/general/events/ICrmOrderEvent.php
index dac49742..13c19c78 100644
--- a/intaro.intarocrm/classes/general/events/ICrmOrderEvent.php
+++ b/intaro.intarocrm/classes/general/events/ICrmOrderEvent.php
@@ -88,8 +88,6 @@ class ICrmOrderEvent {
             ICrmOrderActions::eventLog('ICrmOrderEvent::writeDataOnOrderCreate', 'ICrmOrderActions::orderCreate', 'error during creating order');
             return true;
         }
-
-        COption::SetOptionString(self::$MODULE_ID, self::$CRM_ORDER_LAST_ID, $ID);
         
         return true;
     }