Fixed key display in admin panel / Fixed earnings calculation in statistics

handlers/admin/management/management_handler.py

@@ -440,7 +440,7 @@ async def back_to_database_menu(callback: CallbackQuery):
 async def show_remnawave_clients(callback: CallbackQuery, session: AsyncSession):
     await callback.answer()
 
-    result = await session.execute(select(Server).where(Server.panel_type == "remnawave", Server.enabled is True))
+    result = await session.execute(select(Server).where(Server.panel_type == "remnawave", Server.enabled.is_(True)))
     servers = result.scalars().all()
 
     if not servers:

handlers/admin/stats/stats_handler.py

@@ -149,11 +149,11 @@ async def handle_stats(callback_query: CallbackQuery, session: AsyncSession):
 
         total_referrals = await count_total_referrals(session)
 
-        total_payments_today = await sum_payments_since(session, today_start_utc)
-        total_payments_yesterday = await sum_payments_between(session, yesterday_start_utc, yesterday_end_utc)
-        total_payments_week = await sum_payments_since(session, week_start_utc)
-        total_payments_month = await sum_payments_since(session, month_start_utc)
-        total_payments_last_month = await sum_payments_between(session, last_month_start_utc, last_month_end_utc)
+        total_payments_today = await sum_payments_since(session, today_start.replace(tzinfo=None))
+        total_payments_yesterday = await sum_payments_between(session, yesterday_start.replace(tzinfo=None), yesterday_end.replace(tzinfo=None))
+        total_payments_week = await sum_payments_since(session, week_start.replace(tzinfo=None))
+        total_payments_month = await sum_payments_since(session, month_start.replace(tzinfo=None))
+        total_payments_last_month = await sum_payments_between(session, last_month_start.replace(tzinfo=None), last_month_end.replace(tzinfo=None))
         total_payments_all_time = await sum_total_payments(session)
         hot_leads_count = await count_hot_leads(session)
 
@@ -264,7 +264,7 @@ async def send_daily_stats_report(session: AsyncSession):
         end_utc = end.astimezone(pytz.UTC).replace(tzinfo=None)
 
         registrations_today = await count_users_registered_between(session, start_utc, end_utc)
-        payments_today = await sum_payments_between(session, start_utc, end_utc)
+        payments_today = await sum_payments_between(session, start.replace(tzinfo=None), end.replace(tzinfo=None))
         active_keys = await count_active_keys(session)
 
         text = (

handlers/admin/users/users_handler.py

@@ -578,7 +578,7 @@ async def handle_key_edit(
     text = (
         "<b>🔑 Информация о подписке</b>\n\n"
         "<blockquote>"
-        f"🔗 <b>Ключ:</b> {key_value}\n"
+        f"🔗 <b>Ключ:</b> <code>{key_value}</code>\n"
         f"📆 <b>Создан:</b> {created_at} (МСК)\n"
         f"⏰ <b>Истекает:</b> {expiry_date} (МСК)\n"
         f"🌐 <b>Кластер:</b> {key_details.get('cluster_name', '—')}\n"

handlers/keys/key_utils.py

@@ -620,7 +620,7 @@ async def update_key_on_cluster(
             )
             result.scalar_one_or_none()
 
-            total_gb_bytes = int(traffic_limit * 1024**3) if traffic_limit else 0
+            total_gb_bytes = int(traffic_limit * 1024**3) if traffic_limit is not None else 0
             device_limit_value = device_limit if device_limit is not None else None
 
             config = ClientConfig(

handlers/keys/subscriptions.py

@@ -73,7 +73,7 @@ async def get_subscription_urls(
     urls = []
     if USE_COUNTRY_SELECTION:
         result = await session.execute(
-            select(Server.subscription_url).where(Server.server_name == server_id, Server.enabled is True)
+            select(Server.subscription_url).where(Server.server_name == server_id, Server.enabled.is_(True))
         )
         server_data = result.scalar()
         if server_data: