From: fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Wed, 29 Jan 2025 10:13:52 +0000 (+0300)
Subject: Окружение в докере и обновление функции
X-Git-Tag: 1.7^2~1
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=f145911ef1693c4e1bd47ab7f886bfb4dba04929;p=erp24_rep%2Fyii-erp24%2F.git

Окружение в докере и обновление функции
---

diff --git a/docker-compose.yml b/docker-compose.yml
index 38d9ac34..50869762 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,6 +11,7 @@ services:
       - ./docker/nginx/conf:/etc/nginx
     environment:
       TZ: Europe/Moscow
+      APP_ENV: development
   nginx_api1-yii_erp24:
     build: ./docker/nginx_api1
     restart: always
@@ -22,6 +23,7 @@ services:
       - ./docker/nginx_api1/conf:/etc/nginx
     environment:
       TZ: Europe/Moscow
+      APP_ENV: development
   nginx_api2-yii_erp24:
     build: ./docker/nginx_api2
     restart: always
@@ -33,6 +35,7 @@ services:
       - ./docker/nginx_api2/conf:/etc/nginx
     environment:
       TZ: Europe/Moscow
+      APP_ENV: development
   nginx_api3-yii_erp24:
     build: ./docker/nginx_api3
     restart: always
@@ -43,6 +46,7 @@ services:
       - ./docker/nginx_api3/conf:/etc/nginx
     environment:
       TZ: Europe/Moscow
+      APP_ENV: development
   nginx_media-yii_erp24:
     build: ./docker/nginx_media
     restart: always
@@ -54,6 +58,7 @@ services:
       - ./docker/nginx_media/conf:/etc/nginx
     environment:
       TZ: Europe/Moscow
+      APP_ENV: development
   rabbitmq-yii_erp24:
     image: rabbitmq:3-management
     restart: always
@@ -64,6 +69,7 @@ services:
       RABBITMQ_DEFAULT_USER: admin  # Логин для доступа
       RABBITMQ_DEFAULT_PASS: 3qqHK2MRgGgxUdVT61  # Пароль для доступа
       TZ: Europe/Moscow
+      APP_ENV: development
     volumes:
       - rabbitmq_data:/var/lib/rabbitmq  # Сохранение данных RabbitMQ
   php-yii_erp24:
@@ -76,6 +82,7 @@ services:
       - docker/db/dev.db-pgsql.env
     environment:
       MODE: 'dev'
+      APP_ENV: development
     volumes:
       - ./erp24:/www
       - ./docker/php/conf/php-fpm.conf:/usr/local/etc/php-fpm.conf
@@ -92,6 +99,7 @@ services:
       - docker/db/dev.db-pgsql.env
     environment:
       MODE: 'dev'
+      APP_ENV: development
     volumes:
       - ./erp24:/www
       - ./docker/supervisor/conf/supervisord.conf:/etc/supervisor/supervisord.conf
@@ -114,6 +122,7 @@ services:
     environment:
       PMA_ARBITRARY: 1
       TZ: Europe/Moscow
+      APP_ENV: development
     volumes:
       #php loads files alphabetically, add "zz-" to override settings
       - ./docker/phpmyadmin/conf/zz-phpmyadmin.ini:/usr/local/etc/php/conf.d/zz-phpmyadmin.ini
@@ -146,6 +155,7 @@ services:
     working_dir: /www
     environment:
       TZ: Europe/Moscow
+      APP_ENV: development
     command: npm run dev
 
 
diff --git a/erp24/services/TelegramService.php b/erp24/services/TelegramService.php
index eaf28c5c..237674df 100644
--- a/erp24/services/TelegramService.php
+++ b/erp24/services/TelegramService.php
@@ -40,7 +40,7 @@ class TelegramService
 
     public static function isDevEnv(): bool
     {
-        return getenv('APP_ENV') === 'development';
+        return getenv('APP_ENV') === 'development' || $_ENV['APP_ENV'] === 'development' || false;
     }