Fixed type hints, added cart item counter on main
This commit is contained in:
@@ -22,20 +22,29 @@ router = Router()
|
||||
|
||||
|
||||
@router.message(Command("start"))
|
||||
async def main_menu(msg: Message, state: FSMContext):
|
||||
async def main_menu(
|
||||
msg: Message, state: FSMContext, session: AsyncSession, order_service: OrderService
|
||||
):
|
||||
await state.clear()
|
||||
|
||||
cart_items = await order_service.get_cart_items_count(session, msg.from_user.id)
|
||||
await msg.answer(
|
||||
"hii!", reply_markup=main_menu_kb(msg.from_user.id)
|
||||
"hii!", reply_markup=main_menu_kb(cart_items)
|
||||
) # TODO: Write a welcome message
|
||||
|
||||
|
||||
@router.callback_query(F.data.startswith("menu:"))
|
||||
async def main_menu_cb(cb: CallbackQuery, state: FSMContext):
|
||||
async def main_menu_cb(
|
||||
cb: CallbackQuery,
|
||||
state: FSMContext,
|
||||
session: AsyncSession,
|
||||
order_service: OrderService,
|
||||
):
|
||||
await state.clear()
|
||||
|
||||
cart_items = await order_service.get_cart_items_count(session, cb.from_user.id)
|
||||
await cb.message.edit_text(
|
||||
"hii!", reply_markup=main_menu_kb(cb.from_user.id)
|
||||
"hii!", reply_markup=main_menu_kb(cart_items)
|
||||
) # TODO: Write a welcome message
|
||||
|
||||
|
||||
@@ -198,8 +207,16 @@ async def product_card(
|
||||
return
|
||||
|
||||
if not os.path.isfile(product.img_path):
|
||||
await cb.answer("something has gone wrong, try again later...")
|
||||
return # TODO: Add logging + Admin notifications
|
||||
await cb.message.edit_text(
|
||||
get_product_description(product),
|
||||
reply_markup=render_product_interactions(
|
||||
product_id=product.id,
|
||||
category_id=product.category_id,
|
||||
show_cart=bool(order_item),
|
||||
cart_amount=order_item,
|
||||
),
|
||||
)
|
||||
return
|
||||
|
||||
await cb.message.delete()
|
||||
msg = await cb.message.answer_photo(
|
||||
|
||||
Reference in New Issue
Block a user