diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f935322..bb794544 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 2023-06-22 v.6.3.15 +- Исправлено зависание агента выгрузки заказов + ## 2023-06-12 v.6.3.14 - Исправлена ошибка при изменении торгового предложения в товаре diff --git a/intaro.retailcrm/classes/general/RCrmActions.php b/intaro.retailcrm/classes/general/RCrmActions.php index d5cec5bd..11c7050f 100644 --- a/intaro.retailcrm/classes/general/RCrmActions.php +++ b/intaro.retailcrm/classes/general/RCrmActions.php @@ -220,6 +220,8 @@ class RCrmActions * Agent function * * @return self name + * + * @throws \Throwable */ public static function orderAgent() { @@ -227,12 +229,22 @@ class RCrmActions define('NO_AGENT_CHECK', true); } - $service = ManagerService::getInstance(); - $service->synchronizeManagers(); + try { + $service = ManagerService::getInstance(); + $service->synchronizeManagers(); - RetailCrmHistory::customerHistory(); - RetailCrmHistory::orderHistory(); - self::uploadOrdersAgent(); + RetailCrmHistory::customerHistory(); + RetailCrmHistory::orderHistory(); + self::uploadOrdersAgent(); + } catch (\Throwable $exception) { + RCrmActions::eventLog( + 'RCrmActions', + 'orderAgent', + $exception->getMessage() . PHP_EOL . + 'File: ' . $exception->getFile() . PHP_EOL . + 'Line: ' . $exception->getLine() . PHP_EOL + ); + } return 'RCrmActions::orderAgent();'; } diff --git a/intaro.retailcrm/description.ru b/intaro.retailcrm/description.ru index a8c09c58..c90f6ab4 100644 --- a/intaro.retailcrm/description.ru +++ b/intaro.retailcrm/description.ru @@ -1 +1 @@ -- Исправлена ошибка при изменении торгового предложения в товаре \ No newline at end of file +- Исправлено зависание агента выгрузки заказов \ No newline at end of file diff --git a/intaro.retailcrm/install/index.php b/intaro.retailcrm/install/index.php index c2bfff77..c43f1d34 100644 --- a/intaro.retailcrm/install/index.php +++ b/intaro.retailcrm/install/index.php @@ -1082,7 +1082,10 @@ class intaro_retailcrm extends CModule $dateAgent->add($intAgent); CAgent::AddAgent( - 'RCrmActions::orderAgent();', $this->MODULE_ID, 'N', 600, // interval - 10 mins + 'RCrmActions::orderAgent();', + $this->MODULE_ID, + 'N', + 600, // interval - 10 mins $dateAgent->format('d.m.Y H:i:s'), // date of first check 'Y', // agent is active $dateAgent->format('d.m.Y H:i:s'), // date of first start diff --git a/intaro.retailcrm/install/version.php b/intaro.retailcrm/install/version.php index d04c2c01..a5868d5e 100644 --- a/intaro.retailcrm/install/version.php +++ b/intaro.retailcrm/install/version.php @@ -1,6 +1,6 @@ '6.3.14', - 'VERSION_DATE' => '2023-06-12 20:00:00' + 'VERSION' => '6.3.15', + 'VERSION_DATE' => '2023-06-22 15:30:00' ];