chore: minor fixes and formatting
This commit is contained in:
@@ -1,7 +1,9 @@
|
||||
from aiogram import Router, F
|
||||
from aiogram.types import CallbackQuery, Message
|
||||
import contextlib
|
||||
|
||||
from aiogram import F, Router
|
||||
from aiogram.filters import Command
|
||||
from aiogram.fsm.context import FSMContext
|
||||
from aiogram.types import CallbackQuery, Message
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
from misc.kb import main_menu_kb
|
||||
@@ -20,12 +22,11 @@ async def user_main_menu(
|
||||
):
|
||||
await state.clear()
|
||||
|
||||
cart_items = await order_items_repo.get_items_count_by_customer(
|
||||
session, msg.from_user.id
|
||||
)
|
||||
cart_items = await order_items_repo.get_items_count_by_customer(session, msg.from_user.id)
|
||||
await msg.answer(
|
||||
"hii!", reply_markup=main_menu_kb(cart_items)
|
||||
) # TODO: Write a welcome message
|
||||
"<b>Добрый день!</b>\n" 'Нажмите "Каталог" чтобы выбрать товар или воспользуйтесь поиском.',
|
||||
reply_markup=main_menu_kb(cart_items),
|
||||
)
|
||||
|
||||
|
||||
@router.callback_query(F.data.startswith("menu:"))
|
||||
@@ -37,14 +38,11 @@ async def user_main_menu_cb(
|
||||
):
|
||||
await state.clear()
|
||||
|
||||
try:
|
||||
with contextlib.suppress(Exception):
|
||||
await cb.message.reply_to_message.delete()
|
||||
except Exception:
|
||||
...
|
||||
|
||||
cart_items = await order_items_repo.get_items_count_by_customer(
|
||||
session, cb.from_user.id
|
||||
)
|
||||
cart_items = await order_items_repo.get_items_count_by_customer(session, cb.from_user.id)
|
||||
await cb.message.edit_text(
|
||||
"hii!", reply_markup=main_menu_kb(cart_items)
|
||||
) # TODO: Write a welcome message
|
||||
"<b>Добрый день!</b>\n" 'Нажмите "Каталог" чтобы выбрать товар или воспользуйтесь поиском.',
|
||||
reply_markup=main_menu_kb(cart_items),
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user