diff options
Diffstat (limited to 'handlers/user/payments.py')
| -rw-r--r-- | handlers/user/payments.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/handlers/user/payments.py b/handlers/user/payments.py index 87ea236..e15a882 100644 --- a/handlers/user/payments.py +++ b/handlers/user/payments.py | |||
| @@ -15,13 +15,13 @@ from sqlalchemy.sql.functions import count | |||
| 15 | 15 | ||
| 16 | from libs.invoice import get_payment_status | 16 | from libs.invoice import get_payment_status |
| 17 | from libs.msg import eclipse_text | 17 | from libs.msg import eclipse_text |
| 18 | from libs.user import mention | 18 | from libs.user import load_user_cache |
| 19 | from models import Invoice, Payment, PaymentStatus, User | 19 | from models import Invoice, Payment, PaymentStatus, User |
| 20 | from models.callback_data import ( | 20 | from models.callback_data import ( |
| 21 | PayInvoiceClb, | ||
| 21 | PaymentItemClb, | 22 | PaymentItemClb, |
| 22 | PaymentPageClb, | 23 | PaymentPageClb, |
| 23 | PaymentStatusClb, | 24 | PaymentStatusClb, |
| 24 | PayInvoiceClb, | ||
| 25 | ) | 25 | ) |
| 26 | 26 | ||
| 27 | router = Router(name="payments") | 27 | router = Router(name="payments") |
| @@ -213,7 +213,7 @@ async def item( | |||
| 213 | 213 | ||
| 214 | invoice = await session.get(Invoice, payment.invoice_id) | 214 | invoice = await session.get(Invoice, payment.invoice_id) |
| 215 | assert invoice is not None | 215 | assert invoice is not None |
| 216 | chat = await bot.get_chat(payment.user_id) | 216 | user_cache = await load_user_cache(bot, payment.user_id) |
| 217 | 217 | ||
| 218 | status_buttons = [] | 218 | status_buttons = [] |
| 219 | if payment.status != PaymentStatus.ACCEPTED: | 219 | if payment.status != PaymentStatus.ACCEPTED: |
| @@ -242,12 +242,10 @@ async def item( | |||
| 242 | text="Назад к выбору", | 242 | text="Назад к выбору", |
| 243 | callback_data=PaymentPageClb(page=callback_data.page).pack(), | 243 | callback_data=PaymentPageClb(page=callback_data.page).pack(), |
| 244 | ) | 244 | ) |
| 245 | reply_markup = InlineKeyboardMarkup( | 245 | reply_markup = InlineKeyboardMarkup(inline_keyboard=[status_buttons, [back_button]]) |
| 246 | inline_keyboard=[status_buttons, [back_button]] | ||
| 247 | ) | ||
| 248 | 246 | ||
| 249 | caption = ( | 247 | caption = ( |
| 250 | f"Платёж от {mention(chat)}\n" | 248 | f"Платёж от {user_cache.mention}\n" |
| 251 | f"Счёт: {eclipse_text(invoice.message.text, 30)}\n" | 249 | f"Счёт: {eclipse_text(invoice.message.text, 30)}\n" |
| 252 | f"Дата: {payment.datetime.strftime('%d %b %y г.')}\n" | 250 | f"Дата: {payment.datetime.strftime('%d %b %y г.')}\n" |
| 253 | f"Статус: {PAYMENT_STATUS[payment.status]}" | 251 | f"Статус: {PAYMENT_STATUS[payment.status]}" |
