From 1bccfc7393181b5c58e88226aa4c2640361bee50 Mon Sep 17 00:00:00 2001
From: fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Wed, 25 Dec 2024 16:39:50 +0300
Subject: [PATCH] =?utf8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?=
 =?utf8?q?=D0=B2=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=D1=8B=20=D1=84=D0=BE?=
 =?utf8?q?=D1=80=D0=BC=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20?=
 =?utf8?q?=D0=BA=D0=BE=D0=B3=D0=BE=D1=80=D1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/records/Users.php | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/erp24/records/Users.php b/erp24/records/Users.php
index 7661aeb9..0084b30f 100755
--- a/erp24/records/Users.php
+++ b/erp24/records/Users.php
@@ -515,9 +515,9 @@ class Users extends \yii\db\ActiveRecord
 
         $step1 = $messagesSettings ? $messagesSettings->day_before_step1 : 10;
         $step2 = $messagesSettings ? $messagesSettings->day_before_step2 : 4;
-        $usersQuery = Users::find()->andWhere(['phone' => $phones]);
-
-        $usersQuery->andWhere(['telegram_is_subscribed' => 0]);
+        $usersQuery = UsersTelegramChatId::find()->andWhere(['phone' => $phones]);
+        $usersQuery->andWhere(['is_blocked' => 0]);
+        $usersQuery->andWhere(['is_registered' => 1]);
 
 
         $excludeSalesPhone = Sales::find()
@@ -546,11 +546,9 @@ class Users extends \yii\db\ActiveRecord
         $step3 = $messagesSettings ? $messagesSettings->day_before_step3 : 2;
 
         // Подзапрос базы пользователей с учетом подписки на телеграм
-        $usersQuery = (new \yii\db\Query())
-            ->select(['phone'])
-            ->from('users')
-            ->where(['phone' => $phones])
-            ->andWhere(['telegram_is_subscribed' => 0]);
+        $usersQuery = UsersTelegramChatId::find()->andWhere(['phone' => $phones]);
+        $usersQuery->andWhere(['is_blocked' => 0]);
+        $usersQuery->andWhere(['is_registered' => 1]);
 
         // Исключаем телефоны с продажами в период от 4 до 2 дней до даты
         $excludeSalesPhone = Sales::find()
@@ -597,7 +595,7 @@ class Users extends \yii\db\ActiveRecord
             }, $phones);
         }
 
-        $users = Users::find()
+        $users = UsersTelegramChatId::find()
             ->where(['phone' => $phones])
             ->all();
 
@@ -628,7 +626,7 @@ class Users extends \yii\db\ActiveRecord
                 'deals_count' => $dealsCount,
                 'total_sum' => $totalSum,
                 'memorable_date' => $memorableDateExists,
-                'name' => $user['name']
+                'name' => $user['first_name'] ?? ($user['username'] ?? ''),
             ];
         }
 
-- 
2.39.5