From c5e3ec75950bd5271786d5c9b69184b9a404811b Mon Sep 17 00:00:00 2001
From: Alexander Smirnov <fredeom@mail.ru>
Date: Wed, 17 Jul 2024 16:43:11 +0300
Subject: [PATCH] =?utf8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB?=
 =?utf8?q?=D0=B8=20timezone=20=D0=B8=20=D0=BF=D1=80=D0=BE=D0=B1=D0=BB?=
 =?utf8?q?=D0=B5=D0=BC=D0=B0=20=D1=83=D1=88=D0=BB=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 docker-compose.yml                                    | 11 ++++++++++-
 docker/db/dev.db-pgsql.env                            |  3 ++-
 .../bonus/Add20TelegramCreatedAtIsNullAction.php      |  4 +---
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 51b67533..42072072 100644
--- 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 f6c696d6..b8706f24 100644
--- 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 b61d5e5a..ec43fe68 100644
--- 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) {
-- 
2.39.5