houseassassin/Solo_bot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/Vladless/Solo_bot into dev

Browse Source
This commit is contained in:
Vladless
2025-06-22 08:36:02 +03:00
parent 4e0f7fb2ee b720680af0
commit 7e129e534e
1 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
handlers/keys/key_renew.py
+25 -10
View File
@@ -46,7 +46,7 @@ moscow_tz = pytz.timezone("Europe/Moscow")
@router.callback_query(F.data.startswith("renew_key|"))
async def process_callback_renew_key(callback_query: CallbackQuery, session: AsyncSession):
async def process_callback_renew_key(callback_query: CallbackQuery, state: FSMContext, session: AsyncSession):
tg_id = callback_query.message.chat.id
key_name = callback_query.data.split("|")[1]
@@ -61,6 +61,11 @@ async def process_callback_renew_key(callback_query: CallbackQuery, session: Asy
server_id = record["server_id"]
tariff_id = record.get("tariff_id")
await state.update_data(
renew_key_name=key_name,
renew_client_id=client_id
)
logger.info(f"[RENEW] Получение тарифов для server_id={server_id}")
try:
@@ -110,7 +115,7 @@ async def process_callback_renew_key(callback_query: CallbackQuery, session: Asy
builder.row(
InlineKeyboardButton(
text=f"{t['name']} — {t['price_rub']}₽",
callback_data=f"renew_plan|{t['id']}|{client_id}|{key_name}",
callback_data=f"renew_plan|{t['id']}",
)
)
@@ -119,7 +124,7 @@ async def process_callback_renew_key(callback_query: CallbackQuery, session: Asy
builder.row(
InlineKeyboardButton(
text=subgroup,
callback_data=f"renew_subgroup|{safe}|{client_id}|{key_name}",
callback_data=f"renew_subgroup|{safe}",
)
)
@@ -145,12 +150,14 @@ async def process_callback_renew_key(callback_query: CallbackQuery, session: Asy
@router.callback_query(F.data.startswith("renew_subgroup|"))
async def show_tariffs_in_renew_subgroup(callback: CallbackQuery, session: AsyncSession):
async def show_tariffs_in_renew_subgroup(callback: CallbackQuery, state: FSMContext, session: AsyncSession):
try:
parts = callback.data.split("|")
subgroup = parts[1].replace("_", " ")
client_id = parts[2]
key_name = parts[3]
data = await state.get_data()
client_id = data.get("renew_client_id")
key_name = data.get("renew_key_name")
if not client_id or not key_name:
await callback.message.answer("❌ Данные для подгруппы не найдены.")
@@ -201,7 +208,7 @@ async def show_tariffs_in_renew_subgroup(callback: CallbackQuery, session: Async
builder.row(
InlineKeyboardButton(
text=f"{t['name']} — {t['price_rub']}₽",
callback_data=f"renew_plan|{t['id']}|{client_id}|{key_name}",
callback_data=f"renew_plan|{t['id']}",
)
)
@@ -225,11 +232,19 @@ async def show_tariffs_in_renew_subgroup(callback: CallbackQuery, session: Async
@router.callback_query(F.data.startswith("renew_plan|"))
async def process_callback_renew_plan(callback_query: CallbackQuery, session: Any):
async def process_callback_renew_plan(callback_query: CallbackQuery, state: FSMContext, session: Any):
tg_id = callback_query.from_user.id
tariff_id, client_id, key_name = callback_query.data.split("|")[1:]
tariff_id = callback_query.data.split("|")[1]
tariff_id = int(tariff_id)
data = await state.get_data()
client_id = data.get("renew_client_id")
key_name = data.get("renew_key_name")
if not client_id or not key_name:
await callback_query.message.answer("❌ Данные для продления не найдены.")
return
try:
tariff = await get_tariff_by_id(session, tariff_id)
if not tariff or not tariff["is_active"]:
@@ -435,4 +450,4 @@ async def complete_key_renewal(
)
except Exception as e:
logger.error(f"[Error] Ошибка в complete_key_renewal: {e}")
logger.error(f"[Error] Ошибка в complete_key_renewal: {e}")