From 58eacc3caf6a76c9e659c9ea73f18bcca0e20eaf Mon Sep 17 00:00:00 2001
From: Grisha Pomadchin <gr.pomadchin@gmail.com>
Date: Wed, 24 Jul 2013 17:29:50 +0400
Subject: [PATCH] new api err statuses; +apiUpd added order createdAt field

---
 .../classes/general/ICrmOrderActions.php      | 28 ++++++++++++++++---
 intaro.intarocrm/install/version.php          |  2 +-
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/intaro.intarocrm/classes/general/ICrmOrderActions.php b/intaro.intarocrm/classes/general/ICrmOrderActions.php
index 6696c224..3c55302b 100755
--- a/intaro.intarocrm/classes/general/ICrmOrderActions.php
+++ b/intaro.intarocrm/classes/general/ICrmOrderActions.php
@@ -84,10 +84,15 @@ class ICrmOrderActions
                 $orders = $api->orderUpload($resOrders);
 
                 // error pushing orders
-                if (!$orders) {
+                if (($api->getStatusCode() != 200) || ($api->getStatusCode() != 460)) {
                     //handle err
                     self::eventLog('ICrmOrderActions::uploadOrders', 'IntaroCrm\RestApi::orderUpload', $api->getLastError());
-                    return true;
+                    return false; // in pack mode return errors
+                }
+
+                // if some orders not uploaded
+                if ($api->getStatusCode() == 460) {
+                    self::eventLog('ICrmOrderActions::uploadOrders', 'IntaroCrm\RestApi::orderUpload', $api->getLastError());
                 }
             }
         } else { // package mode (by default runs after install)
@@ -110,12 +115,17 @@ class ICrmOrderActions
                     $orders = $api->orderUpload($resOrders);
                     
                     // error pushing orders
-                    if (!$orders) {
+                    if (($api->getStatusCode() != 200) || ($api->getStatusCode() != 460)) {
                         //handle err
                         self::eventLog('ICrmOrderActions::uploadOrders', 'IntaroCrm\RestApi::orderUpload', $api->getLastError());
                         return false; // in pack mode return errors
                     }
                     
+                    // if some orders not uploaded
+                    if($api->getStatusCode() == 460) {
+                        self::eventLog('ICrmOrderActions::uploadOrders', 'IntaroCrm\RestApi::orderUpload', $api->getLastError());
+                    }
+                    
                     COption::SetOptionString(self::$MODULE_ID, self::$CRM_ORDER_LAST_ID, $lastOrderId);
                     
                     return true; // end of pack
@@ -126,11 +136,16 @@ class ICrmOrderActions
                 $orders = $api->orderUpload($resOrders);
 
                 // error pushing orders
-                if (!$orders) {
+                if (($api->getStatusCode() != 200) || ($api->getStatusCode() != 460)) {
                     //handle err
                     self::eventLog('ICrmOrderActions::uploadOrders', 'IntaroCrm\RestApi::orderUpload', $api->getLastError());
                     return false; // in pack mode return errors
                 }
+
+                // if some orders not uploaded
+                if ($api->getStatusCode() == 460) {
+                    self::eventLog('ICrmOrderActions::uploadOrders', 'IntaroCrm\RestApi::orderUpload', $api->getLastError());
+                }
             } 
         }
         
@@ -276,6 +291,10 @@ class ICrmOrderActions
         if($arFields['CANCELED'] == 'Y')
             $arFields['STATUS_ID'] = $arFields['CANCELED'];
         
+        $createdAt =  \datetime::createfromformat('Y-m-d H:i:s', $arFields['DATE_INSERT']);
+        if($createdAt)
+            $createdAt = $createdAt->format('d-m-Y H:i:s');
+        
         $resOrder = self::clearArr(array(
             'contactName'     => $resOrder['contactName'],
             'phone'           => $resOrder['phone'],
@@ -291,6 +310,7 @@ class ICrmOrderActions
             'deliveryType'    => $arParams['optionsDelivTypes'][$resultDeliveryTypeId],
             'status'          => $arParams['optionsPayStatuses'][$arFields['STATUS_ID']],
             'statusComment'   => $arFields['REASON_CANCELED'],
+            'createdAt'       => $createdAt,
             'deliveryAddress' => $resOrderDeliveryAddress,
             'items'           => $items
         ));
diff --git a/intaro.intarocrm/install/version.php b/intaro.intarocrm/install/version.php
index dcb85652..e7a7ee90 100755
--- a/intaro.intarocrm/install/version.php
+++ b/intaro.intarocrm/install/version.php
@@ -1,5 +1,5 @@
 <?
 $arModuleVersion = array(
 	'VERSION' => '0.3.5',
-	'VERSION_DATE' => '2013-07-24 16:38:00',
+	'VERSION_DATE' => '2013-07-24 17:28:00',
 );