From 1d5b52f7b28581b205d673dac3c16a8985b57467 Mon Sep 17 00:00:00 2001 From: DevProject Agent Date: Sun, 14 Jun 2026 20:01:21 +0400 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20=D0=9C=D0=B5=D0=BD=D1=8E:?= =?UTF-8?q?=20=D1=83=D0=B1=D1=80=D0=B0=D0=BD=20/start,=20=D0=B4=D0=BE?= =?UTF-8?q?=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=20=D0=BE=D0=B1=D1=80=D0=B0?= =?UTF-8?q?=D0=B1=D0=BE=D1=82=D1=87=D0=B8=D0=BA=20=D1=83=D1=81=D0=BB=D1=83?= =?UTF-8?q?=D0=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - menu.py: убрана кнопка /start из главного меню - services.py: добавлен хендлер на кнопку "📋 Услуги" - booking.py: добавлен лог при подтверждении бронирования --- app/handlers/booking.py | 1 + app/handlers/services.py | 24 ++++++++++++++++++++++-- app/keyboards/menu.py | 2 +- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/app/handlers/booking.py b/app/handlers/booking.py index e51b2ec..fa3c7c6 100644 --- a/app/handlers/booking.py +++ b/app/handlers/booking.py @@ -190,6 +190,7 @@ async def confirm_booking_callback( state: FSMContext ): data = await state.get_data() + logger.info("User {uid} confirmed booking: {data}", uid=callback.from_user.id, data=data) editing_booking_id = data.get( "editing_booking_id" diff --git a/app/handlers/services.py b/app/handlers/services.py index c4e3675..931807f 100644 --- a/app/handlers/services.py +++ b/app/handlers/services.py @@ -1,3 +1,23 @@ -from aiogram import Router +from aiogram import Router, F +from aiogram.types import Message +from aiogram.fsm.context import FSMContext + +from app.keyboards.menu import menu +from app.keyboards.services import get_services_keyboard +from app.logger import logger + router = Router() -from app.logger import logger \ No newline at end of file + + +@router.message(F.text == "\U0001f4cb \u0423\u0441\u043b\u0443\u0433\u0438") +async def show_services(message: Message, state: FSMContext): + await state.clear() + logger.info("User {uid} requested services list", uid=message.from_user.id) + await message.answer( + "\U0001f4cb \u041d\u0430\u0448\u0438 \u0443\u0441\u043b\u0443\u0433\u0438:\n\n" + "\U0001f4aa \u041c\u0430\u0441\u0441\u0430\u0436 - \u0440\u0430\u0441\u0441\u043b\u0430\u0431\u043b\u044f\u044e\u0449\u0438\u0439 \u0438 \u043b\u0435\u0447\u0435\u0431\u043d\u044b\u0439\n" + "\U0001f388 SPA - \u043a\u043e\u043c\u043f\u043b\u0435\u043a\u0441\u043d\u044b\u0435 \u043f\u0440\u043e\u0446\u0435\u0434\u0443\u0440\u044b\n" + "\U0001f484 \u041a\u043e\u0441\u043c\u0435\u0442\u043e\u043b\u043e\u0433\u0438\u044f - \u0443\u0445\u043e\u0434 \u0437\u0430 \u043b\u0438\u0446\u043e\u043c\n\n" + "\u0427\u0442\u043e\u0431\u044b \u0437\u0430\u043f\u0438\u0441\u0430\u0442\u044c\u0441\u044f, \u043d\u0430\u0436\u043c\u0438\u0442\u0435 \u00ab\u0417\u0430\u043f\u0438\u0441\u0430\u0442\u044c\u0441\u044f\u00bb", + reply_markup=get_services_keyboard() + ) diff --git a/app/keyboards/menu.py b/app/keyboards/menu.py index ad34937..c40033d 100644 --- a/app/keyboards/menu.py +++ b/app/keyboards/menu.py @@ -2,9 +2,9 @@ from aiogram.types import ReplyKeyboardMarkup, KeyboardButton menu = ReplyKeyboardMarkup( keyboard=[ - [KeyboardButton(text="/start")], [KeyboardButton(text="\U0001f4cb \u0423\u0441\u043b\u0443\u0433\u0438")], [KeyboardButton(text="\U0001f4c5 \u0417\u0430\u043f\u0438\u0441\u0430\u0442\u044c\u0441\u044f")], + [KeyboardButton(text="\U0001f464 \u041f\u0440\u043e\u0444\u0438\u043b\u044c")], [KeyboardButton(text="\U0001f4c4 \u041c\u043e\u0438 \u0437\u0430\u043f\u0438\u0441\u0438")], [KeyboardButton(text="\U0001f4de \u041a\u043e\u043d\u0442\u0430\u043a\u0442\u044b")], [KeyboardButton(text="\u2139\ufe0f \u041e \u043d\u0430\u0441")],