Merge pull request #130 from iyzoer/master

Fixes #129 Fix catalog order controller
retailcrm · Jan 25, 2019 · f79ed21 · f79ed21
2 parents db80810 + 615d9c7
commit f79ed21
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -39,4 +39,4 @@ deploy:
   on:
     php: 7.1
     branch: master
-    condition: "$DEPLOY = true"
+    condition: "$DEPLOY = true"
diff --git a/src/upload/catalog/controller/extension/module/retailcrm.php b/src/upload/catalog/controller/extension/module/retailcrm.php
@@ -58,11 +58,11 @@ public function order_create($trigger, $data, $order_id = null) {
         if (file_exists(DIR_APPLICATION . 'model/extension/retailcrm/custom/order.php')) {
             $this->load->model('extension/retailcrm/custom/order');
             $order = $this->model_extension_retailcrm_custom_order->processOrder($data);
-            $this->model_extension_retailcrm_custom_order->sendToCrm($order, $data, $this->retailcrmApiClient);
+            $this->model_extension_retailcrm_custom_order->sendToCrm($order, $this->retailcrmApiClient, $data);
         } else {
             $this->load->model('extension/retailcrm/order');
             $order = $this->model_extension_retailcrm_order->processOrder($data);
-            $this->model_extension_retailcrm_order->sendToCrm($order, $data, $this->retailcrmApiClient);
+            $this->model_extension_retailcrm_order->sendToCrm($order, $this->retailcrmApiClient, $data);
         }
     }
 
@@ -110,11 +110,11 @@ public function order_edit($trigger, $parameter2 = null) {
             if (file_exists(DIR_APPLICATION . 'model/extension/retailcrm/custom/order.php')) {
                 $this->load->model('extension/retailcrm/custom/order');
                 $order = $this->model_extension_retailcrm_custom_order->processOrder($data, false);
-                $this->model_extension_retailcrm_custom_order->sendToCrm($order, $this->retailcrmApiClient, false);
+                $this->model_extension_retailcrm_custom_order->sendToCrm($order, $this->retailcrmApiClient, $data, false);
             } else {
                 $this->load->model('extension/retailcrm/order');
                 $order = $this->model_extension_retailcrm_order->processOrder($data, false);
-                $this->model_extension_retailcrm_order->sendToCrm($order, $this->retailcrmApiClient, false);
+                $this->model_extension_retailcrm_order->sendToCrm($order, $this->retailcrmApiClient, $data, false);
             }
         }
     }