Add invoices command

2 files changed, 8 insertions, 4 deletions

diff --git a/handlers/admin/new_invoice.py b/handlers/admin/new_invoice.py
index 43e47cb..f532bff 100644
--- a/handlers/admin/new_invoice.py
+++ b/handlers/admin/new_invoice.py
@@ -18,7 +18,7 @@ from sqlalchemy.ext.asyncio import AsyncSession
 
 from libs.fsm import get_data, set_data
 from libs.msg import send_invoice
-from models import Invoice, RichText, User
+from models import Invoice, RichText, User, UserRole
 
 router = Router(name="new_invoice")
 
@@ -59,7 +59,7 @@ async def create(
     state: FSMContext,
     session: AsyncSession,
 ) -> None:
-    users = await session.scalars(select(User.id).where(User.id != msg.chat.id))
+    users = await session.scalars(select(User.id).where(User.role != UserRole.ADMIN))
     data = await get_data(state, NewInvoiceData)
 
     if data.rich_text is None:
diff --git a/handlers/admin/payment_status.py b/handlers/admin/payment_status.py
index 23bde15..8784ac4 100644
--- a/handlers/admin/payment_status.py
+++ b/handlers/admin/payment_status.py
@@ -11,14 +11,18 @@ router = Router(name="payment_status")
 
 
 async def accept(clb: CallbackQuery, bot: Bot, payment: Payment) -> None:
+    assert clb.message is not None
+
     payment.status = PaymentStatus.ACCEPTED
-    await bot.send_message(clb.from_user.id, "Оплата пользователя подтверждена.")
+    await clb.message.reply("Оплата пользователя подтверждена.")
     await bot.send_message(payment.user_id, "Файл подтверждения оплаты принят.")
 
 
 async def reject(clb: CallbackQuery, bot: Bot, payment: Payment) -> None:
+    assert clb.message is not None
+
     payment.status = PaymentStatus.REJECTED
-    await bot.send_message(clb.from_user.id, "Оплата пользователя отклонена.")
+    await clb.message.reply("Оплата пользователя отклонена.")
 
     callback_data = PayInvoiceClb(invoice_id=payment.invoice_id).pack()
     await bot.send_message(