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

Merge pull request #151 from sergeygw1990/master

Browse Source 
Fixes: #147 Возврат остатка товара при отмене заказа
This commit is contained in:
Alex Lushpai 2019-04-19 10:02:58 +03:00 committed by GitHub
commit 39d596e49d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 3 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.3.2
* Добавлен возврат остатка товара при отмене заказа
## v.3.3.1 ## v.3.3.1
* Исправлен баг с передачей данных заказа в retailCRM при получении истории изменений от retailCRM * Исправлен баг с передачей данных заказа в retailCRM при получении истории изменений от retailCRM

2
VERSION
View File

@ -1 +1 @@
3.3.1 3.3.2

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

@ -467,13 +467,13 @@ class ModelExtensionRetailcrmHistoryV45 extends ModelExtensionRetailcrmHistory
$data['order_status_id'] = $tmpOrder['order_status_id']; $data['order_status_id'] = $tmpOrder['order_status_id'];
} }
$this->editOrder($order['externalId'], $data);
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']
) { ) {
$this->opencartApiClient->addHistory($order['externalId'], $data['order_status_id']); $this->opencartApiClient->addHistory($order['externalId'], $data['order_status_id']);
} }
$this->editOrder($order['externalId'], $data);
} }
} }