RetailCRM-Mirror/opencart-module
1
0
Fork 0
mirror of https://github.com/retailcrm/opencart-module.git synced 2025-01-23 03:01:41 +03:00
Code Issues Projects Releases Wiki Activity

bug fix

Browse Source
This commit is contained in:
Akolzin Dmitry 2019-03-21 10:00:00 +03:00
parent d58b66a01b
commit adf390c286
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/upload/admin/model/extension/retailcrm/history/v4_5.php
View File

@ -4,9 +4,6 @@ require_once __DIR__ . '/../history.php';
class ModelExtensionRetailcrmHistoryV45 extends ModelExtensionRetailcrmHistory class ModelExtensionRetailcrmHistoryV45 extends ModelExtensionRetailcrmHistory
{ {
/** @var bool */
public static $history_run = false;
protected $createResult; protected $createResult;
protected $settings; protected $settings;
protected $moduleTitle; protected $moduleTitle;
@ -475,9 +472,9 @@ class ModelExtensionRetailcrmHistoryV45 extends ModelExtensionRetailcrmHistory
if (isset($this->settings[$this->moduleTitle . '_status_changes']) if (isset($this->settings[$this->moduleTitle . '_status_changes'])
&& $this->settings[$this->moduleTitle . '_status_changes'] && $this->settings[$this->moduleTitle . '_status_changes']
) { ) {
static::$history_run = true; \retailcrm\Retailcrm::$history_run = true;
$this->opencartApiClient->addHistory($order['externalId'], $data['order_status_id']); $this->opencartApiClient->addHistory($order['externalId'], $data['order_status_id']);
static::$history_run = false; \retailcrm\Retailcrm::$history_run = false;
} }
} }
} }

7
src/upload/catalog/controller/extension/module/retailcrm.php
View File

@ -31,8 +31,7 @@ class ControllerExtensionModuleRetailcrm extends Controller {
* @return void * @return void
*/ */
public function order_create($trigger, $data, $order_id = null) { public function order_create($trigger, $data, $order_id = null) {
if (\retailcrm\Retailcrm::$history_run === true) {
if (ModelExtensionRetailcrmHistoryV45::$history_run === true) {
return; return;
} }
@ -80,6 +79,10 @@ class ControllerExtensionModuleRetailcrm extends Controller {
* @return void * @return void
*/ */
public function order_edit($trigger, $parameter2 = null) { public function order_edit($trigger, $parameter2 = null) {
if (\retailcrm\Retailcrm::$history_run === true) {
return;
}
$order_id = $parameter2[0]; $order_id = $parameter2[0];
$this->load->model('checkout/order'); $this->load->model('checkout/order');

7
src/upload/system/library/retailcrm/retailcrm.php
View File

@ -8,6 +8,9 @@ class Retailcrm {
protected $apiClient; protected $apiClient;
protected $registry; protected $registry;
/** @var bool */
public static $history_run = false;
public function __construct($registry) { public function __construct($registry) {
$this->registry = $registry; $this->registry = $registry;
} }
@ -23,7 +26,7 @@ class Retailcrm {
* @param string $apiKey (default = null) * @param string $apiKey (default = null)
* @param string $apiVersion (default = null) * @param string $apiVersion (default = null)
* *
* @return mixed object | boolean * @return mixed object | boolean
*/ */
public function getApiClient($apiUrl = null, $apiKey = null, $apiVersion = null) { public function getApiClient($apiUrl = null, $apiKey = null, $apiVersion = null) {
$this->load->model('setting/setting'); $this->load->model('setting/setting');
@ -128,7 +131,7 @@ class Retailcrm {
} }
} }
} }
// Совмещаем или добавляем необязательные опции, учитывая тот факт что обязательных опций может и не быть. // Совмещаем или добавляем необязательные опции, учитывая тот факт что обязательных опций может и не быть.
foreach($notRequiredOptions as $notRequiredOption) { foreach($notRequiredOptions as $notRequiredOption) {
// Если обязательных опцией не оказалось и первая итерация // Если обязательных опцией не оказалось и первая итерация