diff --git a/handlers/buttons/profile.py b/handlers/buttons/profile.py index 3b6d80ab..ffde912a 100644 --- a/handlers/buttons/profile.py +++ b/handlers/buttons/profile.py @@ -1,7 +1,7 @@ ADD_SUB = "➕ Подписка" MY_SUBS = "📱 Мои подписки" BALANCE = "💰 Баланс" -BALANCE_HISTORY = "📊 История пополнения" +BALANCE_HISTORY = "📊 История пополнений" PAYMENT = "💳 Пополнить баланс" INVITE = "👥 Пригласить" GIFTS = "🎁 Подарить" diff --git a/handlers/keys/key_management.py b/handlers/keys/key_management.py index a0a48c1c..babc620b 100644 --- a/handlers/keys/key_management.py +++ b/handlers/keys/key_management.py @@ -12,7 +12,7 @@ from handlers.payments.yookassa_pay import process_custom_amount_input from py3xui import AsyncApi from bot import bot -from client import delete_client +from panels.three_xui import delete_client from config import ( ADMIN_PASSWORD, ADMIN_USERNAME, @@ -113,7 +113,7 @@ async def handle_key_creation( builder = InlineKeyboardBuilder() for index, (plan_id, price) in enumerate(RENEWAL_PRICES.items()): discount_text = "" - if plan_id in DISCOUNTS: + if DISCOUNTS and plan_id in DISCOUNTS: discount_percentage = DISCOUNTS[plan_id] discount_text = f" ({discount_percentage}% скидка)" if index == len(RENEWAL_PRICES) - 1: diff --git a/handlers/keys/key_utils.py b/handlers/keys/key_utils.py index b86d95ab..4e619f92 100644 --- a/handlers/keys/key_utils.py +++ b/handlers/keys/key_utils.py @@ -7,7 +7,7 @@ from py3xui import AsyncApi from config import ADMIN_PASSWORD, ADMIN_USERNAME, DATABASE_URL, LIMIT_IP, PUBLIC_LINK, SUPERNODE, TOTAL_GB from py3xui import AsyncApi -from client import ClientConfig, add_client, delete_client, extend_client_key, get_client_traffic, toggle_client +from panels.three_xui import ClientConfig, add_client, delete_client, extend_client_key, get_client_traffic, toggle_client from config import ADMIN_PASSWORD, ADMIN_USERNAME, LIMIT_IP, PUBLIC_LINK, SUPERNODE, TOTAL_GB, DATABASE_URL from database import get_servers, store_key from handlers.utils import get_least_loaded_cluster diff --git a/handlers/keys/keys.py b/handlers/keys/keys.py index 10251fa1..e8fbb26a 100644 --- a/handlers/keys/keys.py +++ b/handlers/keys/keys.py @@ -137,7 +137,7 @@ def build_keys_response(records): response_message += f"• {key_display} ({formatted_date_full})\n" - response_message += "\n" + response_message += "\n\nНажмите на ✏️, чтобы переименовать подписку." else: response_message = NO_SUBSCRIPTIONS_MSG diff --git a/client.py b/panels/three_xui.py similarity index 100% rename from client.py rename to panels/three_xui.py