Compare commits

..

1 Commits

Author SHA1 Message Date
652400e50f fix order module
All checks were successful
continuous-integration/drone/push Build is passing
2025-09-26 23:01:02 +03:00

View File

@@ -122,8 +122,8 @@ async def search_by_item(message: Message, state: FSMContext):
reply_markup=create_inline_kb(width=1, **{ reply_markup=create_inline_kb(width=1, **{
f"show_order_{order.id}": f"Заказ: №{order.id}"}))) f"show_order_{order.id}": f"Заказ: №{order.id}"})))
await state.update_data(sent_messages=sent_messages) await state.update_data(sent_messages=sent_messages)
await state.update_data(search_result=selected_orders)
await state.set_state(SearchForm.search_result) await state.set_state(SearchForm.search_result)
await state.update_data(search_result=selected_orders)
else: else:
await message.answer(text="Заказов по вашему запросу не найдено") await message.answer(text="Заказов по вашему запросу не найдено")
await state.clear() await state.clear()
@@ -132,8 +132,8 @@ async def search_by_item(message: Message, state: FSMContext):
@orders_router.callback_query(SearchForm.search_result and (lambda x: "show_order_" in x.data)) @orders_router.callback_query(SearchForm.search_result and (lambda x: "show_order_" in x.data))
async def show_order(callback: CallbackQuery, state: FSMContext, bot: Bot): async def show_order(callback: CallbackQuery, state: FSMContext, bot: Bot):
order_id = int(re.search(r"(\d+)", callback.data).group()) order_id = int(re.search(r"(\d+)", callback.data).group())
orders = await state.get_value("search_result")
order = next(filter(lambda item: order_id == item.id, await state.get_value("selected_orders")), None) order = next(filter(lambda item: order_id == item.id, orders), None)
if order: if order:
await callback.message.answer(text=f"Номер заказа: {order.id}\n" await callback.message.answer(text=f"Номер заказа: {order.id}\n"
@@ -219,4 +219,4 @@ async def add_order_photo(message: Message, bot: Bot):
@orders_router.callback_query(F.data.startswith("finish_work_on_order")) @orders_router.callback_query(F.data.startswith("finish_work_on_order"))
async def finish_work_on_order(callback: CallbackQuery): async def finish_work_on_order(callback: CallbackQuery):
await callback.message.delete() await callback.message.delete()