From 5134a056c4335dcea5a325caf7566f38e624f214 Mon Sep 17 00:00:00 2001 From: fomichev Date: Wed, 25 Dec 2024 17:40:51 +0300 Subject: [PATCH] =?utf8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B8=D0=BC=D0=B5=D0=BD?= =?utf8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D1=82=D0=B0=D0=B1=D0=BB?= =?utf8?q?=D0=B8=D1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/commands/CronController.php | 6 +++--- erp24/controllers/UsersMessageManagementController.php | 6 +++--- ...e.php => m241224_140248_create_users_telegram_table.php} | 4 ++-- erp24/records/Users.php | 6 +++--- .../records/{UsersTelegramChatId.php => UsersTelegram.php} | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) rename erp24/migrations/{m241224_140248_create_users_telegram_chat_id_table.php => m241224_140248_create_users_telegram_table.php} (92%) rename erp24/records/{UsersTelegramChatId.php => UsersTelegram.php} (93%) diff --git a/erp24/commands/CronController.php b/erp24/commands/CronController.php index 45f54d90..20831862 100644 --- a/erp24/commands/CronController.php +++ b/erp24/commands/CronController.php @@ -16,7 +16,7 @@ use yii_app\records\ReplacementInvoiceProducts; use yii_app\records\SentKogort; use yii_app\records\Users; use yii_app\records\UsersMessageManagement; -use yii_app\records\UsersTelegramChatId; +use yii_app\records\UsersTelegram; use yii_app\records\UsersTelegramLog; class CronController extends Controller @@ -384,10 +384,10 @@ class CronController extends Controller $isBlocked = (int)$remoteUser['is_blocked']; $isRegistered = (int)$remoteUser['is_registered']; - $user = UsersTelegramChatId::findOne(['chat_id' => $chatId]); + $user = UsersTelegram::findOne(['chat_id' => $chatId]); if (!$user) { - $user = new UsersTelegramChatId([ + $user = new UsersTelegram([ 'chat_id' => $chatId, 'phone' => $phone, 'username' => $username ?? 'Клиент из чатбота', diff --git a/erp24/controllers/UsersMessageManagementController.php b/erp24/controllers/UsersMessageManagementController.php index 05e0d98d..da9daa0c 100644 --- a/erp24/controllers/UsersMessageManagementController.php +++ b/erp24/controllers/UsersMessageManagementController.php @@ -21,7 +21,7 @@ use yii_app\records\Users; use yii_app\records\UsersEvents; use yii_app\records\UsersMessageManagement; use yii_app\records\UsersMessageManagementLogs; -use yii_app\records\UsersTelegramChatId; +use yii_app\records\UsersTelegram; use yii_app\records\UsersTelegramLog; class UsersMessageManagementController extends Controller @@ -420,10 +420,10 @@ class UsersMessageManagementController extends Controller $isBlocked = (int)$remoteUser['is_blocked']; $isRegistered = (int)$remoteUser['is_registered']; - $user = UsersTelegramChatId::findOne(['chat_id' => $chatId]); + $user = UsersTelegram::findOne(['chat_id' => $chatId]); if (!$user) { - $user = new UsersTelegramChatId([ + $user = new UsersTelegram([ 'chat_id' => $chatId, 'phone' => $phone, 'username' => $username ?? 'Клиент из чатбота', diff --git a/erp24/migrations/m241224_140248_create_users_telegram_chat_id_table.php b/erp24/migrations/m241224_140248_create_users_telegram_table.php similarity index 92% rename from erp24/migrations/m241224_140248_create_users_telegram_chat_id_table.php rename to erp24/migrations/m241224_140248_create_users_telegram_table.php index 53217ec1..075758d3 100644 --- a/erp24/migrations/m241224_140248_create_users_telegram_chat_id_table.php +++ b/erp24/migrations/m241224_140248_create_users_telegram_table.php @@ -5,9 +5,9 @@ use yii\db\Migration; /** * Class m241224_140248_add_telegram_chat_id_to_users_table */ -class m241224_140248_create_users_telegram_chat_id_table extends Migration +class m241224_140248_create_users_telegram_table extends Migration { - const TABLE_NAME = 'erp24.users_telegram_chat_id'; + const TABLE_NAME = 'erp24.users_telegram'; /** * {@inheritdoc} diff --git a/erp24/records/Users.php b/erp24/records/Users.php index 0084b30f..9f9860c1 100755 --- a/erp24/records/Users.php +++ b/erp24/records/Users.php @@ -515,7 +515,7 @@ class Users extends \yii\db\ActiveRecord $step1 = $messagesSettings ? $messagesSettings->day_before_step1 : 10; $step2 = $messagesSettings ? $messagesSettings->day_before_step2 : 4; - $usersQuery = UsersTelegramChatId::find()->andWhere(['phone' => $phones]); + $usersQuery = UsersTelegram::find()->andWhere(['phone' => $phones]); $usersQuery->andWhere(['is_blocked' => 0]); $usersQuery->andWhere(['is_registered' => 1]); @@ -546,7 +546,7 @@ class Users extends \yii\db\ActiveRecord $step3 = $messagesSettings ? $messagesSettings->day_before_step3 : 2; // Подзапрос базы пользователей с учетом подписки на телеграм - $usersQuery = UsersTelegramChatId::find()->andWhere(['phone' => $phones]); + $usersQuery = UsersTelegram::find()->andWhere(['phone' => $phones]); $usersQuery->andWhere(['is_blocked' => 0]); $usersQuery->andWhere(['is_registered' => 1]); @@ -595,7 +595,7 @@ class Users extends \yii\db\ActiveRecord }, $phones); } - $users = UsersTelegramChatId::find() + $users = UsersTelegram::find() ->where(['phone' => $phones]) ->all(); diff --git a/erp24/records/UsersTelegramChatId.php b/erp24/records/UsersTelegram.php similarity index 93% rename from erp24/records/UsersTelegramChatId.php rename to erp24/records/UsersTelegram.php index 43740d4f..46598797 100644 --- a/erp24/records/UsersTelegramChatId.php +++ b/erp24/records/UsersTelegram.php @@ -14,14 +14,14 @@ use Yii; * @property int $is_blocked Заблокирован: 0 - нет, 1 - да * @property int $is_registered Зарегистрирован: 0 - нет, 1 - да */ -class UsersTelegramChatId extends \yii\db\ActiveRecord +class UsersTelegram extends \yii\db\ActiveRecord { /** * {@inheritdoc} */ public static function tableName() { - return 'users_telegram_chat_id'; + return 'users_telegram'; } /** -- 2.39.5