From fc4447d925603d86e3ffd45982449ed0b4466c54 Mon Sep 17 00:00:00 2001
From: Grisha Pomadchin <gr.pomadchin@gmail.com>
Date: Thu, 22 May 2014 18:29:03 +0400
Subject: [PATCH] multiship format fix

---
 intaro.intarocrm/classes/general/ICrmOrderActions.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/intaro.intarocrm/classes/general/ICrmOrderActions.php b/intaro.intarocrm/classes/general/ICrmOrderActions.php
index d5f01aa1..180fe864 100755
--- a/intaro.intarocrm/classes/general/ICrmOrderActions.php
+++ b/intaro.intarocrm/classes/general/ICrmOrderActions.php
@@ -955,11 +955,10 @@ class ICrmOrderActions
 
                 if(isset($order['delivery']) && $order['delivery'] && isset($order['delivery']['integrationCode']) &&
                    $order['delivery']['integrationCode'] == self::$CRM_MULTISHIP_INTEGRATION_CODE &&
-                   isset($order['delivery']['data']) && $order['delivery']['data']) {
+                   isset($order['delivery']['data']) && $order['delivery']['data'] &&
+                   isset($order['delivery']['data']['service']) && $order['delivery']['data']['service']) {
                     if(CModule::IncludeModule(self::$MULTISHIP_MODULE_VER)) {
-                      $data = json_decode($order['delivery']['data'], true);
-                      if(isset($data['service']) && $data['service'])
-                          $resultDeliveryTypeId = $resultDeliveryTypeId . ':' . $data['service'];
+                        $resultDeliveryTypeId = $resultDeliveryTypeId . ':' . $order['delivery']['data']['service'];
                     }
                 }