diff --git a/CHANGELOG.md b/CHANGELOG.md index ff261ab..2822ad4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## v3.6.10 +* Изменена валидация ключа коллектора + ## v3.6.9 * Добавлена проверка корректности введеного ключа при подключении Daemon Collector diff --git a/VERSION b/VERSION index cff2619..c47e8b5 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.6.9 +3.6.10 diff --git a/retailcrm/lib/settings/RetailcrmSettingsValidator.php b/retailcrm/lib/settings/RetailcrmSettingsValidator.php index cc3f1f9..a7720a8 100644 --- a/retailcrm/lib/settings/RetailcrmSettingsValidator.php +++ b/retailcrm/lib/settings/RetailcrmSettingsValidator.php @@ -404,7 +404,7 @@ class RetailcrmSettingsValidator private function validateCollector($collectorActive, $collectorKey) { - return !$collectorActive || preg_match("/^RC-[0-9]{10}-[0-9]{1,2}$/", $collectorKey); + return !$collectorActive || preg_match('/^RC-[0-9]{11}-[0-9]{1,2}$/', $collectorKey); } private function addError($field, $message) diff --git a/retailcrm/retailcrm.php b/retailcrm/retailcrm.php index e3d7d26..0f9d440 100755 --- a/retailcrm/retailcrm.php +++ b/retailcrm/retailcrm.php @@ -48,7 +48,7 @@ require_once dirname(__FILE__) . '/bootstrap.php'; class RetailCRM extends Module { - const VERSION = '3.6.9'; + const VERSION = '3.6.10'; const API_URL = 'RETAILCRM_ADDRESS'; const API_KEY = 'RETAILCRM_API_TOKEN';