xync-bot 0.3.24.dev7__tar.gz → 0.3.24.dev9__tar.gz

{xync_bot-0.3.24.dev7/xync_bot.egg-info → xync_bot-0.3.24.dev9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-bot
-Version: 0.3.24.dev7
+Version: 0.3.24.dev9
 Summary: Telegram bot with web app for xync net
 Author-email: Artemiev <mixartemev@gmail.com>
 License-Expression: GPL-3.0-or-later

{xync_bot-0.3.24.dev7 → xync_bot-0.3.24.dev9}/xync_bot/routers/__init__.py

@@ -67,7 +67,7 @@ class Store:
         cur_creds: dict[int, list[int]] = None  # pmcur_id:[cred_ids]
 
     class Current:
-        is_target: bool = None
+        is_target: bool = True
         is_fiat: bool = None
         msg_to_del: Message = None
 
@@ -86,7 +86,13 @@ class Store:
         cred_dtl: str = None
         cred_id: int = None
 
+    class Payreq:
+        id: int = None
+        created_at: int = None
+        payed_at: int = None
+
     glob: Global
     perm: Permanent = Permanent()
     pay: Payment = Payment()
+    pr: Payreq = Payreq()
     curr: Current = Current()

{xync_bot-0.3.24.dev7 → xync_bot-0.3.24.dev9}/xync_bot/routers/pay/dep.py

@@ -103,7 +103,7 @@ async def edit(msg: Message, txt: str, rm: InlineKeyboardMarkup):
 
 
 async def ans(cbq: CallbackQuery, txt: str = None):
-    await cbq.answer(txt, cache_time=99)
+    await cbq.answer(txt, cache_time=0)
 
 
 async def dlt(msg: Message):

{xync_bot-0.3.24.dev7 → xync_bot-0.3.24.dev9}/xync_bot/routers/pay/handler.py

@@ -8,7 +8,6 @@ from aiogram.types import Message, CallbackQuery
 from aiogram.fsm.context import FSMContext
 from xync_bot.routers.pay.dep import fill_creds, fill_actors, dlt, ans
 from xync_schema import models
-from aiogram.utils.keyboard import InlineKeyboardBuilder
 
 from xync_bot import Store
 from xync_bot.routers.pay import cd, dep, window
@@ -163,8 +162,8 @@ async def process_time_selection(query: CallbackQuery, callback_data: cd.Time, s
         cred_id=store.pay.cred_id,
         user=store.perm.user,
     )
-    pay_req, *_ = await gather(
-        models.PayReq.create(**pr_data), ans(query, None), state.set_state(dep.PaymentState.timer)
+    (pay_req, _), *__ = await gather(
+        models.PayReq.update_or_create(**pr_data), ans(query, None), state.set_state(dep.PaymentState.timer)
     )
 
     await state.update_data(
@@ -187,11 +186,8 @@ async def payment_confirmed(query: CallbackQuery, state: FSMContext):
         pay_req = await models.PayReq.get(id=data["pay_req_id"])
         pay_req.payed_at = payed_at
         await pay_req.save()
-
-    builder = InlineKeyboardBuilder()
-    builder.button(text="Новый платеж💸", callback_data=cd.PayNav(to=cd.PayStep.t_type))
-    await query.message.answer("✅ Платеж успешно подтвержден", reply_markup=builder.as_markup())
     await state.clear()
+    await window.success(query.message)
 
 
 @pay.callback_query(cd.Action.filter(F.act.__eq__(cd.ActionType.not_received)))

{xync_bot-0.3.24.dev7 → xync_bot-0.3.24.dev9}/xync_bot/routers/pay/window.py

@@ -215,3 +215,12 @@ async def run_timer(message, state: FSMContext):
             await message.edit_text("⏳ Время вышло!", reply_markup=builder.as_markup())
         except Exception:
             pass
+
+
+async def success(msg: Message):
+    rm = InlineKeyboardMarkup(
+        inline_keyboard=[
+            [InlineKeyboardButton(text="Новый платеж💸", callback_data=cd.PayNav(to=cd.PayStep.t_type).pack())]
+        ]
+    )
+    await msg.edit_text("✅ Платеж успешно подтвержден", reply_markup=rm)

{xync_bot-0.3.24.dev7 → xync_bot-0.3.24.dev9/xync_bot.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-bot
-Version: 0.3.24.dev7
+Version: 0.3.24.dev9
 Summary: Telegram bot with web app for xync net
 Author-email: Artemiev <mixartemev@gmail.com>
 License-Expression: GPL-3.0-or-later