Merge pull request #124 from hteppl/mics-updates

Небольшие изменения

handlers/admin/admin_panel.py

@@ -81,6 +81,9 @@ async def user_stats_menu(callback_query: CallbackQuery, session: Any):
         total_payments_week = await session.fetchval(
             "SELECT COALESCE(SUM(amount), 0) FROM payments WHERE created_at >= date_trunc('week', CURRENT_DATE)"
         )
+        total_payments_month = await session.fetchval(
+            "SELECT COALESCE(SUM(amount), 0) FROM payments WHERE created_at >= date_trunc('month', CURRENT_DATE)"
+        )
         total_payments_all_time = await session.fetchval(
             "SELECT COALESCE(SUM(amount), 0) FROM payments"
         )
@@ -103,6 +106,7 @@ async def user_stats_menu(callback_query: CallbackQuery, session: Any):
             f"💰 Финансовая статистика:\n"
             f"   📅 За день: <b>{total_payments_today} ₽</b>\n"
             f"   📆 За неделю: <b>{total_payments_week} ₽</b>\n"
+            f"   📆 За месяц: <b>{total_payments_month} ₽</b>\n"
             f"   🏦 За все время: <b>{total_payments_all_time} ₽</b>\n"
         )
 

handlers/admin/admin_user_editor.py

@@ -55,7 +55,8 @@ async def prompt_username(callback_query: CallbackQuery, state: FSMContext):
 async def handle_username_input(
     message: types.Message, state: FSMContext, session: Any
 ):
-    username = message.text.strip().lstrip("@")
+    # Extract the username from a message text by removing leading '@' and the Telegram URL prefix
+    username = message.text.strip().lstrip('@').replace('https://t.me/', '')
     user_record = await session.fetchrow(
         "SELECT tg_id FROM users WHERE username = $1", username
     )
@@ -338,7 +339,7 @@ async def process_key_edit(callback_query: CallbackQuery, session: Any):
             callback_data=f"delete_key_admin|{email}",
         )
     )
-    builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="admin"))
+    builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="user_editor"))
 
     await callback_query.message.answer(
         response_message, reply_markup=builder.as_markup()