From 6230fc1392e8e6ff8e1cdb715734c9da74b66b01 Mon Sep 17 00:00:00 2001
From: Grisha Pomadchin <gr.pomadchin@gmail.com>
Date: Wed, 24 Jul 2013 16:40:08 +0400
Subject: [PATCH] updated logic; render order cancel status; sending
 statusComment;

---
 intaro.intarocrm/classes/general/ICrmOrderActions.php | 4 ++++
 intaro.intarocrm/install/version.php                  | 2 +-
 intaro.intarocrm/install/version.php~                 | 5 -----
 3 files changed, 5 insertions(+), 6 deletions(-)
 delete mode 100755 intaro.intarocrm/install/version.php~

diff --git a/intaro.intarocrm/classes/general/ICrmOrderActions.php b/intaro.intarocrm/classes/general/ICrmOrderActions.php
index a69af5d0..6696c224 100755
--- a/intaro.intarocrm/classes/general/ICrmOrderActions.php
+++ b/intaro.intarocrm/classes/general/ICrmOrderActions.php
@@ -273,6 +273,9 @@ class ICrmOrderActions
             );
         }
         
+        if($arFields['CANCELED'] == 'Y')
+            $arFields['STATUS_ID'] = $arFields['CANCELED'];
+        
         $resOrder = self::clearArr(array(
             'contactName'     => $resOrder['contactName'],
             'phone'           => $resOrder['phone'],
@@ -287,6 +290,7 @@ class ICrmOrderActions
             'orderType'       => $arParams['optionsOrderTypes'][$arFields['PERSON_TYPE_ID']],
             'deliveryType'    => $arParams['optionsDelivTypes'][$resultDeliveryTypeId],
             'status'          => $arParams['optionsPayStatuses'][$arFields['STATUS_ID']],
+            'statusComment'   => $arFields['REASON_CANCELED'],
             'deliveryAddress' => $resOrderDeliveryAddress,
             'items'           => $items
         ));
diff --git a/intaro.intarocrm/install/version.php b/intaro.intarocrm/install/version.php
index 979ac045..dcb85652 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 13:41:00',
+	'VERSION_DATE' => '2013-07-24 16:38:00',
 );
diff --git a/intaro.intarocrm/install/version.php~ b/intaro.intarocrm/install/version.php~
deleted file mode 100755
index 39766b70..00000000
--- a/intaro.intarocrm/install/version.php~
+++ /dev/null
@@ -1,5 +0,0 @@
-<?
-$arModuleVersion = array(
-	'VERSION' => '0.4.5',
-	'VERSION_DATE' => '2013-07-24 13:41:00',
-);
\ No newline at end of file