From 8835251d808862a0ca63703504096f781e66eb3d Mon Sep 17 00:00:00 2001
From: Alex Lushpai <lushpai@gmail.com>
Date: Fri, 11 Mar 2016 14:15:24 +0300
Subject: [PATCH] fix delivery & hook data

---
 admin/controller/module/retailcrm.php   |  3 +--
 admin/model/retailcrm/order.php         |  4 ++--
 catalog/controller/module/retailcrm.php |  6 ++++--
 catalog/model/retailcrm/order.php       | 13 ++++++++-----
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/admin/controller/module/retailcrm.php b/admin/controller/module/retailcrm.php
index d2b78f0..cefd63c 100644
--- a/admin/controller/module/retailcrm.php
+++ b/admin/controller/module/retailcrm.php
@@ -205,7 +205,6 @@ class ControllerModuleRetailcrm extends Controller
             'token=' . $this->session->data['token'], 'SSL'
         );
 
-
         $_data['modules'] = array();
 
         if (isset($this->request->post['retailcrm_module'])) {
@@ -290,7 +289,7 @@ class ControllerModuleRetailcrm extends Controller
             $data['order_status'] = $status['retailcrm_status'][$data['order_status_id']];
 
             $this->load->model('retailcrm/order');
-            $this->model_retailcrm_order->sendToCrm($data, $order['order_id']);
+            $this->model_retailcrm_order->sendToCrm($data, $data['order_id']);
         }
     }
 
diff --git a/admin/model/retailcrm/order.php b/admin/model/retailcrm/order.php
index 5ef90c5..cf89d9a 100644
--- a/admin/model/retailcrm/order.php
+++ b/admin/model/retailcrm/order.php
@@ -86,7 +86,7 @@ class ModelRetailcrmOrder extends Model {
                 );
             }
 
-            if (isset($order_data['order_status_id'])) {
+            if (isset($order_data['order_status_id']) && $order_data['order_status_id'] > 0) {
                 $order['status'] = $settings['retailcrm_status'][$order_data['order_status_id']];
             }
 
@@ -163,7 +163,7 @@ class ModelRetailcrmOrder extends Model {
                 );
             }
 
-            if (isset($order_data['order_status_id'])) {
+            if (isset($order_data['order_status_id']) && $order_data['order_status_id'] > 0) {
                 $order['status'] = $settings['retailcrm_status'][$order_data['order_status_id']];
             }
 
diff --git a/catalog/controller/module/retailcrm.php b/catalog/controller/module/retailcrm.php
index fb1e349..331cfed 100644
--- a/catalog/controller/module/retailcrm.php
+++ b/catalog/controller/module/retailcrm.php
@@ -29,10 +29,12 @@ class ControllerModuleRetailcrm extends Controller
         if (!isset($data['fromApi'])) {
             $this->load->model('setting/setting');
             $status = $this->model_setting_setting->getSetting('retailcrm');
-            $data['order_status'] = $status['retailcrm_status'][$data['order_status_id']];
+            if ($data['order_status_id'] > 0) {
+                $data['order_status'] = $status['retailcrm_status'][$data['order_status_id']];
+            }
 
             $this->load->model('retailcrm/order');
-            $this->model_retailcrm_order->sendToCrm($data, $order['order_id']);
+            $this->model_retailcrm_order->sendToCrm($data, $data['order_id']);
         }
     }
 }
diff --git a/catalog/model/retailcrm/order.php b/catalog/model/retailcrm/order.php
index e021e30..f2df393 100644
--- a/catalog/model/retailcrm/order.php
+++ b/catalog/model/retailcrm/order.php
@@ -44,11 +44,14 @@ class ModelRetailcrmOrder extends Model {
             $order['customerComment'] = $order_data['comment'];
 
             $deliveryCost = 0;
-            $orderTotals = isset($order_data['totals']) ? $order_data['totals'] : $order_data['order_total'] ;
+            $altTotals = isset($order_data['order_total']) ? $order_data['order_total'] : "";
+            $orderTotals = isset($order_data['totals']) ? $order_data['totals'] : $altTotals ;
 
-            foreach ($orderTotals as $totals) {
-                if ($totals['code'] == 'shipping') {
-                    $deliveryCost = $totals['value'];
+            if (!empty($orderTotals)) {
+                foreach ($orderTotals as $totals) {
+                    if ($totals['code'] == 'shipping') {
+                        $deliveryCost = $totals['value'];
+                    }
                 }
             }
 
@@ -86,7 +89,7 @@ class ModelRetailcrmOrder extends Model {
                 );
             }
 
-            if (isset($order_data['order_status_id'])) {
+            if (isset($order_data['order_status_id']) && $order_data['order_status_id'] > 0) {
                 $order['status'] = $settings['retailcrm_status'][$order_data['order_status_id']];
             }