RetailCRM-Mirror/opencart-module
1
0
Fork 0
mirror of https://github.com/retailcrm/opencart-module.git synced 2024-11-21 20:56:07 +03:00
Code Issues Projects Releases Wiki Activity

Добавил полчение события из БД для OC 3.0

Browse Source
This commit is contained in:
Akolzin Dmitry 2018-12-05 17:10:00 +03:00
parent 3e55de0e3a
commit cfcac1e013
4 changed files with 46 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

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

15
src/upload/admin/controller/extension/module/retailcrm.php
View File

@ -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;

8
src/upload/admin/model/extension/retailcrm/event.php Normal file
View File

@ -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;
}
}

25
tests/admin/ModelRetailcrmEventAdminTest.php Normal file
View File

@ -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']);
}
}