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

Merge branch 'v2.2' into v2.2

Browse Source
This commit is contained in:
Akolzin Dmitry 2017-09-22 16:52:55 +02:00 committed by GitHub
commit 9ac3fe699b
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/model/retailcrm/customer.php
View File

@ -16,7 +16,7 @@ class ModelRetailcrmCustomer extends Model {
$this->retailcrmApi = new RetailcrmProxy( $this->retailcrmApi = new RetailcrmProxy(
$settings['retailcrm_url'], $settings['retailcrm_url'],
$settings['retailcrm_apikey'], $settings['retailcrm_apikey'],
$this->serLogs() $this->setLogs()
); );
$customersToCrm = array(); $customersToCrm = array();

2
admin/model/retailcrm/history.php
View File

@ -41,7 +41,7 @@ class ModelRetailcrmHistory extends Model
$crm = new RetailcrmProxy( $crm = new RetailcrmProxy(
$settings['retailcrm_url'], $settings['retailcrm_url'],
$settings['retailcrm_apikey'], $settings['retailcrm_apikey'],
$this->serLogs() $this->setLogs()
); );
$lastRun = !empty($history['retailcrm_history']) $lastRun = !empty($history['retailcrm_history'])

6
admin/model/retailcrm/order.php
View File

@ -15,9 +15,9 @@ class ModelRetailcrmOrder extends Model {
require_once DIR_SYSTEM . 'library/retailcrm/bootstrap.php'; require_once DIR_SYSTEM . 'library/retailcrm/bootstrap.php';
$this->retailcrmApi = new RetailcrmProxy( $this->retailcrmApi = new RetailcrmProxy(
$this->settings['retailcrm_url'], $settings['retailcrm_url'],
$this->settings['retailcrm_apikey'], $settings['retailcrm_apikey'],
$this->serLogs() $this->setLogs()
); );
$ordersToCrm = array(); $ordersToCrm = array();