From 663431dc192e02c936300287817a4745daa05774 Mon Sep 17 00:00:00 2001
From: Grisha Pomadchin <gr.pomadchin@gmail.com>
Date: Wed, 12 Feb 2014 11:06:32 +0400
Subject: [PATCH] fix custom order type funcs

---
 .../classes/general/ICrmOrderActions.php      | 54 +++++++++++++++----
 1 file changed, 45 insertions(+), 9 deletions(-)

diff --git a/intaro.intarocrm/classes/general/ICrmOrderActions.php b/intaro.intarocrm/classes/general/ICrmOrderActions.php
index 72c43cca..73a571ab 100755
--- a/intaro.intarocrm/classes/general/ICrmOrderActions.php
+++ b/intaro.intarocrm/classes/general/ICrmOrderActions.php
@@ -375,15 +375,33 @@ class ICrmOrderActions
         // pushing existing orders
         foreach ($orderHistory as $order) {
 
-            // custom orderType functunion
-            if(function_exists('intarocrm_get_order_type') && function_exists('intarocrm_set_order_type')) {
-                $orderType = intarocrm_set_order_type($order);
-                if($orderType)
-                    $optionsOrderTypes[$order['orderType']] = $orderType;
-            }
-
             if(!isset($order['externalId']) || !$order['externalId']) {
 
+                // custom orderType functunion
+                if(function_exists('intarocrm_set_order_type')) {
+                    $orderType = intarocrm_set_order_type($order);
+                    if($orderType)
+                        $optionsOrderTypes[$order['orderType']] = $orderType;
+                    else {
+                        $dbOrderTypesList = CSalePersonType::GetList(
+                            array(
+                                "SORT" => "ASC",
+                                "NAME" => "ASC"
+                            ),
+                            array(
+                                "ACTIVE" => "Y",
+                            ),
+                            false,
+                            false,
+                            array()
+                        );
+
+                        if ($arOrderTypesList = $dbOrderTypesList->Fetch())
+                            $optionsOrderTypes[$order['orderType']] = $arOrderTypesList['ID'];
+
+                    }
+                }
+
                 // we dont need new orders without any customers (can check only for externalId)
                 if(!isset($order['customer']['externalId']) && !$order['customer']['externalId']) {
                     if (!$order['customer']['email']) {
@@ -472,10 +490,28 @@ class ICrmOrderActions
             if(isset($order['externalId']) && $order['externalId']) {
 
                 // custom orderType functunion
-                if(function_exists('intarocrm_get_order_type') && function_exists('intarocrm_set_order_type')) {
+                if(function_exists('intarocrm_set_order_type')) {
                     $orderType = intarocrm_set_order_type($order);
                     if($orderType)
                         $optionsOrderTypes[$order['orderType']] = $orderType;
+                    else {
+                        $dbOrderTypesList = CSalePersonType::GetList(
+                            array(
+                                "SORT" => "ASC",
+                                "NAME" => "ASC"
+                            ),
+                            array(
+                                "ACTIVE" => "Y",
+                            ),
+                            false,
+                            false,
+                            array()
+                        );
+
+                        if ($arOrderTypesList = $dbOrderTypesList->Fetch())
+                            $optionsOrderTypes[$order['orderType']] = $arOrderTypesList['ID'];
+
+                    }
                 }
 
                 $arFields = CSaleOrder::GetById($order['externalId']);
@@ -1120,7 +1156,7 @@ class ICrmOrderActions
         }
 
         // custom orderType functunion
-        if(function_exists('intarocrm_get_order_type') && function_exists('intarocrm_set_order_type')) {
+        if(function_exists('intarocrm_get_order_type')) {
             $orderType = intarocrm_get_order_type($arFields);
             if($orderType)
                 $resOrder['orderType'] = $orderType;