Добавил в методы формирования когорт

diff --git a/erp24/records/Users.php b/erp24/records/Users.php
index 7661aeb973e5e9111b1c090b69b3968f30d65c4d..0084b30f5d604eb6ee160ee4093d0badbb6a8dbf 100755 (executable)
--- 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'] ?? ''),
             ];
         }