RetailCRM-Mirror/bitrix-module
1
0
Fork 0
mirror of synced 2024-11-22 13:26:10 +03:00
Code Issues Projects Releases Wiki Activity

2.2.4 (#29)

Browse Source 
* v.2.2.4 user history fix
This commit is contained in:
Евгений 2017-09-07 13:27:28 +03:00 committed by Alex Lushpai
parent 8d646a735c
commit ef4c4a7d33
6 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -1,3 +1,7 @@
## 2017-09-07 v.2.2.4
* Исправлена работа истории пользователей
* Убраны события для старого API
## 2017-09-04 v.2.2.3 ## 2017-09-04 v.2.2.3
* Исправлена работа истории * Исправлена работа истории

10
intaro.retailcrm/classes/general/history/RetailCrmHistory_v4.php
View File

@ -28,17 +28,17 @@ class RetailCrmHistory
public static function customerHistory() public static function customerHistory()
{ {
if (!CModule::IncludeModule("iblock")) { if (!CModule::IncludeModule("iblock")) {
RCrmActions::eventLog('RetailCrmHistory::orderHistory', 'iblock', 'module not found'); RCrmActions::eventLog('RetailCrmHistory::customerHistory', 'iblock', 'module not found');
return false; return false;
} }
if (!CModule::IncludeModule("sale")) { if (!CModule::IncludeModule("sale")) {
RCrmActions::eventLog('RetailCrmHistory::orderHistory', 'sale', 'module not found'); RCrmActions::eventLog('RetailCrmHistory::customerHistory', 'sale', 'module not found');
return false; return false;
} }
if (!CModule::IncludeModule("catalog")) { if (!CModule::IncludeModule("catalog")) {
RCrmActions::eventLog('RetailCrmHistory::orderHistory', 'catalog', 'module not found'); RCrmActions::eventLog('RetailCrmHistory::customerHistory', 'catalog', 'module not found');
return false; return false;
} }
@ -56,7 +56,7 @@ class RetailCrmHistory
} }
while (true) { while (true) {
$customerHistory = RCrmActions::apiMethod($api, 'ordersHistory', __METHOD__, $historyFilter); $customerHistory = RCrmActions::apiMethod($api, 'customersHistory', __METHOD__, $historyFilter);
$customerH = isset($customerHistory['history']) ? $customerHistory['history'] : array(); $customerH = isset($customerHistory['history']) ? $customerHistory['history'] : array();
@ -132,7 +132,7 @@ class RetailCrmHistory
); );
$registeredUserID = $newUser->Add($arFields); $registeredUserID = $newUser->Add($arFields);
if ($registeredUserID === false) { if ($registeredUserID === false) {
RCrmActions::eventLog('RetailCrmHistory::orderHistory', 'CUser::Register', 'Error register user'); RCrmActions::eventLog('RetailCrmHistory::customerHistory', 'CUser::Register', 'Error register user');
continue; continue;
} }

8
intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php
View File

@ -28,17 +28,17 @@ class RetailCrmHistory
public static function customerHistory() public static function customerHistory()
{ {
if (!CModule::IncludeModule("iblock")) { if (!CModule::IncludeModule("iblock")) {
RCrmActions::eventLog('RetailCrmHistory::orderHistory', 'iblock', 'module not found'); RCrmActions::eventLog('RetailCrmHistory::customerHistory', 'iblock', 'module not found');
return false; return false;
} }
if (!CModule::IncludeModule("sale")) { if (!CModule::IncludeModule("sale")) {
RCrmActions::eventLog('RetailCrmHistory::orderHistory', 'sale', 'module not found'); RCrmActions::eventLog('RetailCrmHistory::customerHistory', 'sale', 'module not found');
return false; return false;
} }
if (!CModule::IncludeModule("catalog")) { if (!CModule::IncludeModule("catalog")) {
RCrmActions::eventLog('RetailCrmHistory::orderHistory', 'catalog', 'module not found'); RCrmActions::eventLog('RetailCrmHistory::customerHistory', 'catalog', 'module not found');
return false; return false;
} }
@ -56,7 +56,7 @@ class RetailCrmHistory
} }
while (true) { while (true) {
$customerHistory = RCrmActions::apiMethod($api, 'ordersHistory', __METHOD__, $historyFilter); $customerHistory = RCrmActions::apiMethod($api, 'customersHistory', __METHOD__, $historyFilter);
$customerH = isset($customerHistory['history']) ? $customerHistory['history'] : array(); $customerH = isset($customerHistory['history']) ? $customerHistory['history'] : array();

3
intaro.retailcrm/description.ru
View File

@ -1 +1,2 @@
- Исправлена работа истории - Убраны старые обработчики событий
- Исправлена работа истории пользователей

4
intaro.retailcrm/install/index.php
View File

@ -810,8 +810,6 @@ class intaro_retailcrm extends CModule
RegisterModule($this->MODULE_ID); RegisterModule($this->MODULE_ID);
RegisterModuleDependences("sale", "OnOrderUpdate", $this->MODULE_ID, "RetailCrmEvent", "onUpdateOrder"); RegisterModuleDependences("sale", "OnOrderUpdate", $this->MODULE_ID, "RetailCrmEvent", "onUpdateOrder");
RegisterModuleDependences("sale", "OnBeforeOrderAdd", $this->MODULE_ID, "RetailCrmEvent", "onBeforeOrderAdd");
RegisterModuleDependences("sale", "OnOrderSave", $this->MODULE_ID, "RetailCrmEvent", "OnOrderSave");
RegisterModuleDependences("main", "OnAfterUserUpdate", $this->MODULE_ID, "RetailCrmEvent", "OnAfterUserUpdate"); RegisterModuleDependences("main", "OnAfterUserUpdate", $this->MODULE_ID, "RetailCrmEvent", "OnAfterUserUpdate");
RegisterModuleDependences("sale", "OnSaleOrderEntitySaved", $this->MODULE_ID, "RetailCrmEvent", "orderSave"); RegisterModuleDependences("sale", "OnSaleOrderEntitySaved", $this->MODULE_ID, "RetailCrmEvent", "orderSave");
RegisterModuleDependences("sale", "OnSaleOrderEntityDelete", $this->MODULE_ID, "RetailCrmEvent", "orderDelete"); RegisterModuleDependences("sale", "OnSaleOrderEntityDelete", $this->MODULE_ID, "RetailCrmEvent", "orderDelete");
@ -1014,8 +1012,6 @@ class intaro_retailcrm extends CModule
COption::RemoveOption($this->MODULE_ID, $this->HISTORY_TIME); COption::RemoveOption($this->MODULE_ID, $this->HISTORY_TIME);
UnRegisterModuleDependences("sale", "OnOrderUpdate", $this->MODULE_ID, "RetailCrmEvent", "onUpdateOrder"); UnRegisterModuleDependences("sale", "OnOrderUpdate", $this->MODULE_ID, "RetailCrmEvent", "onUpdateOrder");
UnRegisterModuleDependences("sale", "OnBeforeOrderAdd", $this->MODULE_ID, "RetailCrmEvent", "onBeforeOrderAdd");
UnRegisterModuleDependences("sale", "OnOrderSave", $this->MODULE_ID, "RetailCrmEvent", "OnOrderSave");
UnRegisterModuleDependences("main", "OnAfterUserUpdate", $this->MODULE_ID, "RetailCrmEvent", "OnAfterUserUpdate"); UnRegisterModuleDependences("main", "OnAfterUserUpdate", $this->MODULE_ID, "RetailCrmEvent", "OnAfterUserUpdate");
UnRegisterModuleDependences("sale", "OnSaleOrderEntitySaved", $this->MODULE_ID, "RetailCrmEvent", "orderSave"); UnRegisterModuleDependences("sale", "OnSaleOrderEntitySaved", $this->MODULE_ID, "RetailCrmEvent", "orderSave");
UnRegisterModuleDependences("sale", "OnSaleOrderEntityDelete", $this->MODULE_ID, "RetailCrmEvent", "orderDelete"); UnRegisterModuleDependences("sale", "OnSaleOrderEntityDelete", $this->MODULE_ID, "RetailCrmEvent", "orderDelete");

4
intaro.retailcrm/install/version.php
View File

@ -1,5 +1,5 @@
<? <?
$arModuleVersion = array( $arModuleVersion = array(
"VERSION" => "2.2.3", "VERSION" => "2.2.4",
"VERSION_DATE" => "2017-09-05 12:00:00" "VERSION_DATE" => "2017-09-07 12:00:00"
); );