Merge pull request #96 from izzzzzi/main

Add back button for coupons
This commit is contained in:
Vladislav Lisitsyn
2024-11-18 22:51:16 +03:00
committed by GitHub
2 changed files with 20 additions and 5 deletions
+12 -1
View File
@@ -17,11 +17,15 @@ router = Router()
@router.callback_query(F.data == "coupons_editor", IsAdminFilter())
async def show_coupon_management_menu(callback_query: types.CallbackQuery):
async def show_coupon_management_menu(
callback_query: types.CallbackQuery, state: FSMContext
):
try:
await callback_query.message.delete()
except Exception as e:
logger.error(f"Ошибка при удалении сообщения: {e}")
finally:
await state.clear()
builder = InlineKeyboardBuilder()
builder.row(
@@ -155,12 +159,18 @@ async def process_coupon_data(message: types.Message, state: FSMContext):
text = message.text.strip()
parts = text.split()
builder = InlineKeyboardBuilder()
builder.row(InlineKeyboardButton(text="🔙 Назад", callback_data="coupons_editor"))
markup = builder.as_markup()
if len(parts) != 3:
await message.answer(
"<b>❌ Некорректный формат!</b> Пожалуйста, введите данные в формате:\n"
"<b>код</b> <b>сумма</b> <b>лимит</b>\n"
"Пример: <b>'COUPON1 50 5'</b>",
parse_mode="HTML",
reply_markup=markup,
)
return
@@ -173,6 +183,7 @@ async def process_coupon_data(message: types.Message, state: FSMContext):
"<b>⚠️ Проверьте правильность введенных данных.</b>\n"
"Сумма должна быть числом, а лимит — целым числом.",
parse_mode="HTML",
reply_markup=markup,
)
return
+8 -4
View File
@@ -118,8 +118,10 @@ async def confirm_create_new_key(callback_query: CallbackQuery, state: FSMContex
@dp.callback_query(F.data == "cancel_create_key")
async def cancel_create_key(callback_query: CallbackQuery, state: FSMContext):
await process_callback_view_profile(callback_query, state)
async def cancel_create_key(
callback_query: CallbackQuery, state: FSMContext, admin: bool
):
await process_callback_view_profile(callback_query, state, admin)
await callback_query.answer()
@@ -291,6 +293,8 @@ async def handle_instructions(callback_query: CallbackQuery):
@dp.callback_query(F.data == "back_to_main")
async def handle_back_to_main(callback_query: CallbackQuery, state: FSMContext):
await process_callback_view_profile(callback_query, state)
async def handle_back_to_main(
callback_query: CallbackQuery, state: FSMContext, admin: bool
):
await process_callback_view_profile(callback_query, state, admin)
await callback_query.answer()