Merge pull request #122 from iyzoer/master

v3.1.6

CHANGELOG.md

@@ -1,3 +1,6 @@
+## v.3.1.6
+* Исправлено получение событий из БД для OC 3.0
+
 ## v.3.1.5
 * Исправление ошибок
 

VERSION

@@ -1 +1 @@
-3.1.5
+3.1.6

src/upload/admin/controller/extension/module/retailcrm.php

@@ -860,11 +860,16 @@ class ControllerExtensionModuleRetailcrm extends Controller
      */
     private function checkEvents()
     {
-        $events = $this->{'model_' . $this->modelEvent}->getEvent(
-            $this->moduleTitle,
-            'catalog/model/checkout/order/addOrder/after',
-            'extension/module/retailcrm/order_create'
-        );
+        if (version_compare(VERSION, '3.0', '<')) {
+            $events = $this->{'model_' . $this->modelEvent}->getEvent(
+                $this->moduleTitle,
+                'catalog/model/checkout/order/addOrder/after',
+                'extension/module/retailcrm/order_create'
+            );
+        } else {
+            $this->load->model('extension/retailcrm/event');
+            $events = $this->model_extension_retailcrm_event->getEventByCode($this->moduleTitle);
+        }
 
         if (!empty($events)) {
             return true;

src/upload/admin/model/extension/retailcrm/event.php

@@ -0,0 +1,8 @@
+<?php
+
+class ModelExtensionRetailcrmEvent extends Model{
+    public function getEventByCode($code) {
+        $query = $this->db->query("SELECT DISTINCT * FROM `" . DB_PREFIX . "event` WHERE `code` = '" . $this->db->escape($code) . "' LIMIT 1");
+        return $query->row;
+    }
+}

tests/admin/ModelRetailcrmEventAdminTest.php

@@ -0,0 +1,25 @@
+<?php
+
+class ModelRetailcrmEventAdminTest extends OpenCartTest
+{
+    const CODE = 'test';
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $eventModel = $this->loadModel('extension/event');
+        $eventModel->addEvent(self::CODE, 'test', 'test');
+    }
+
+    public function testGetEvent()
+    {
+        $eventModel = $this->loadModel('extension/retailcrm/event');
+        $event = $eventModel->getEventByCode(self::CODE);
+
+        $this->assertNotEmpty($event);
+        $this->assertEquals(self::CODE, $event['code']);
+        $this->assertEquals('test', $event['trigger']);
+        $this->assertEquals('test', $event['action']);
+    }
+}