diff --git a/.gitignore b/.gitignore index d1d5219f..c2cb268e 100644 --- a/.gitignore +++ b/.gitignore @@ -9,8 +9,9 @@ /.idea/* /intaro.retailcrm/log/* +/tmp/ /vendor/ .env .phpunit.result.cache /release/ -coverage.xml \ No newline at end of file +coverage.xml diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f307b66..30dd36e6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 2023-01-10 v.6.1.15 +- Добавлен фильтр активности менеджеров + ## 2023-01-24 v.6.1.14 - Исправление обновления и отправки заказа в црм систему diff --git a/Makefile b/Makefile index 102c84b5..9e6a5449 100755 --- a/Makefile +++ b/Makefile @@ -43,4 +43,9 @@ endif cleanup: @rm -rf $(ROOT_DIR)/release/$(CURRENT_VERSION) - @rm $(ROOT_DIR)/release/$(CURRENT_VERSION).tar.gz \ No newline at end of file + @rm $(ROOT_DIR)/release/$(CURRENT_VERSION).tar.gz + +run_local_tests: + docker-compose up -d --build + docker exec app_test make install_bitrix deps test + docker-compose down diff --git a/docker-compose.yml b/docker-compose.yml index 773314d3..3cc0d28b 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,7 @@ version: '3' services: bitrix: + container_name: app_test build: ./.docker env_file: - .env diff --git a/intaro.retailcrm/description.ru b/intaro.retailcrm/description.ru index bf6191b4..e7554ac1 100644 --- a/intaro.retailcrm/description.ru +++ b/intaro.retailcrm/description.ru @@ -1 +1 @@ -- исправление отправки заказа в црм систему \ No newline at end of file +- Добавлен фильтр активности менеджеров diff --git a/intaro.retailcrm/install/version.php b/intaro.retailcrm/install/version.php index 74f5adc4..009f5447 100644 --- a/intaro.retailcrm/install/version.php +++ b/intaro.retailcrm/install/version.php @@ -1,6 +1,6 @@ '6.1.14', - 'VERSION_DATE' => '2023-01-24 14:30:00' + 'VERSION' => '6.1.15', + 'VERSION_DATE' => '2023-01-26 12:00:00' ]; diff --git a/intaro.retailcrm/lib/service/managerservice.php b/intaro.retailcrm/lib/service/managerservice.php index 2fc103a9..cc7d791a 100644 --- a/intaro.retailcrm/lib/service/managerservice.php +++ b/intaro.retailcrm/lib/service/managerservice.php @@ -23,7 +23,7 @@ use RetailcrmConstants; class ManagerService { protected static $instance; - + /** * @var \Intaro\RetailCrm\Repository\ManagerRepository */ @@ -59,17 +59,17 @@ class ManagerService if (self::$instance === null) { self::$instance = new self(); } - + return self::$instance; } - + /** * Синхронизирует пользователей CRM и Битрикс */ public function synchronizeManagers(): void { $currentPage = 1; - + RetailcrmConfigProvider::setUsersMap([]); do { @@ -135,7 +135,7 @@ class ManagerService */ private function getCrmUsersPage(int $pageNumber): array { - $response = $this->client->usersList([], $pageNumber); + $response = $this->client->usersList(['active' => 1], $pageNumber); if (!$response->isSuccessful()) { return [];