Поправили timezone и проблема ушла

diff --git a/docker-compose.yml b/docker-compose.yml
index 51b6753357963e8858bd751b92053021367751a0..42072072defe1f519a76d0167ee723b4b83ca392 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,6 +9,8 @@ services:
     volumes:
       - ./erp24:/www
       - ./docker/nginx/conf:/etc/nginx
+    environment:
+      TZ: Europe/Moscow
   nginx_api1-yii_erp24:
     build: ./docker/nginx_api1
     restart: always
@@ -18,6 +20,8 @@ services:
     volumes:
       - ./erp24:/www
       - ./docker/nginx_api1/conf:/etc/nginx
+    environment:
+      TZ: Europe/Moscow
   nginx_api2-yii_erp24:
     build: ./docker/nginx_api2
     restart: always
@@ -27,6 +31,8 @@ services:
     volumes:
       - ./erp24:/www
       - ./docker/nginx_api2/conf:/etc/nginx
+    environment:
+      TZ: Europe/Moscow
   nginx_api3-yii_erp24:
     build: ./docker/nginx_api3
     restart: always
@@ -35,6 +41,8 @@ services:
     volumes:
       - ./erp24:/www
       - ./docker/nginx_api3/conf:/etc/nginx
+    environment:
+      TZ: Europe/Moscow
   php-yii_erp24:
     build: ./docker/php
     restart: always
@@ -65,7 +73,8 @@ services:
     ports:
       - 127.0.0.1:8091:80
     environment:
-      - PMA_ARBITRARY=1
+      PMA_ARBITRARY: 1
+      TZ: Europe/Moscow
     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

diff --git a/docker/db/dev.db-pgsql.env b/docker/db/dev.db-pgsql.env
index f6c696d6d30bf88ba637d6523a033196b4fea085..b8706f248619467a5cc64fe80b9c6e50572a26ce 100644 (file)
--- a/docker/db/dev.db-pgsql.env
+++ b/docker/db/dev.db-pgsql.env
@@ -5,4 +5,5 @@ PGADMIN_DEFAULT_PASSWORD=admin
 POSTGRES_DB=erp24
 POSTGRES_HOSTNAME=db-pgsql-yii_erp24
 POSTGRES_PORT=5432
-POSTGRES_SCHEMA=erp24
\ No newline at end of file
+POSTGRES_SCHEMA=erp24
+PGTZ=Europe/Moscow
\ No newline at end of file

diff --git a/erp24/actions/bonus/Add20TelegramCreatedAtIsNullAction.php b/erp24/actions/bonus/Add20TelegramCreatedAtIsNullAction.php
index b61d5e5a24b1222c1c642bfabef00e6a716b28ab..ec43fe6857fbbcca970682ae7e526c8993c829e4 100644 (file)
--- a/erp24/actions/bonus/Add20TelegramCreatedAtIsNullAction.php
+++ b/erp24/actions/bonus/Add20TelegramCreatedAtIsNullAction.php
@@ -24,9 +24,7 @@ class Add20TelegramCreatedAtIsNullAction extends Action
         foreach ($users as $user) {
             /** @var $user Users */
             $ub = UsersBonus::find()->where(['phone' => $user->phone])
-                ->andWhere(['between', 'date',
-                    date('Y-m-d H:i:00', strtotime('-3 hour', strtotime($user->date_first_sale))),
-                    date('Y-m-d H:i:59', strtotime($user->date_first_sale))])->all();
+                ->andWhere(['date' => $user->date_first_sale])->all();
             $has20 = false;
             $has10 = null;
             foreach ($ub as $usersBonus) {