houseassassin/Solo_bot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HOTFIX "Консистентность касс"

Browse Source 
- исправление edit_or_send_message в кассах
- добавление ожидаемого платежа
- исправление heleket (мусорил в базе)
This commit is contained in:
Boris Kovalskii
2026-01-25 14:43:40 +10:00
committed by GitHub
parent 17928f8fbf
commit fcb786399b
8 changed files with 124 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files
handlers/payments/freekassa/freekassa_pay.py
-4
View File
@@ -135,7 +135,6 @@ async def process_amount_selection(callback_query: types.CallbackQuery, state: F
target_message=callback_query.message,
text="Ошибка: данные повреждены.",
reply_markup=types.InlineKeyboardMarkup(),
force_text=True,
)
return
@@ -150,7 +149,6 @@ async def process_amount_selection(callback_query: types.CallbackQuery, state: F
target_message=callback_query.message,
text="Некорректная сумма.",
reply_markup=types.InlineKeyboardMarkup(),
force_text=True,
)
return
@@ -175,7 +173,6 @@ async def process_amount_selection(callback_query: types.CallbackQuery, state: F
target_message=callback_query.message,
text=DEFAULT_PAYMENT_MESSAGE.format(amount=amount),
reply_markup=confirm_keyboard,
force_text=True,
)
logger.info(f"Payment link sent to user {callback_query.message.chat.id}.")
@@ -280,7 +277,6 @@ async def process_custom_amount_selection(callback_query: types.CallbackQuery, s
target_message=callback_query.message,
text=ENTER_SUM,
reply_markup=builder.as_markup(),
force_text=True,
)
await state.set_state(ReplenishBalanceState.waiting_for_payment_confirmation_freekassa)
handlers/payments/heleket/handlers.py
+2 -2
View File
@@ -14,7 +14,7 @@ from logger import logger
from ..constants import ALLOWED_TEMP_PAYMENT_STATES
from .service import (
HELEKET_PAYMENT_METHODS,
get_heleket_methods,
generate_heleket_payment_link,
process_callback_pay_heleket,
router as service_router,
@@ -75,7 +75,7 @@ async def handle_custom_amount_input_heleket(
)
return
enabled_methods = [m for m in HELEKET_PAYMENT_METHODS if m["enable"]]
enabled_methods = [m for m in get_heleket_methods() if m["enable"]]
if not enabled_methods:
await edit_or_send_message(
target_message=message,
handlers/payments/heleket/service.py
+49 -57
View File
@@ -64,17 +64,28 @@ class ReplenishBalanceHeleket(StatesGroup):
entering_custom_amount = State()
PROVIDERS = get_providers(PROVIDERS_ENABLED)
HELEKET_PAYMENT_METHODS = [
{
"enable": bool(PROVIDERS.get("HELEKET", {}).get("enabled")),
"currency": (PROVIDERS.get("HELEKET", {}).get("currency") or "USD"),
"to_currency": None,
"name": "crypto",
"button": HELEKET,
"desc": HELEKET_CRYPTO_DESCRIPTION,
},
]
def _is_heleket_enabled() -> bool:
try:
from core.bootstrap import PAYMENTS_CONFIG
return bool(PAYMENTS_CONFIG.get("HELEKET", PROVIDERS_ENABLED.get("HELEKET", False)))
except ImportError:
return bool(PROVIDERS_ENABLED.get("HELEKET", False))
def get_heleket_methods() -> list[dict]:
return [
{
"enable": _is_heleket_enabled(),
"currency": "USD",
"to_currency": None,
"name": "crypto",
"button": HELEKET,
"desc": HELEKET_CRYPTO_DESCRIPTION,
},
]
HELEKET_PAYMENT_METHODS = get_heleket_methods()
async def process_callback_pay_heleket(
@@ -86,18 +97,17 @@ async def process_callback_pay_heleket(
await state.clear()
if not method_name:
enabled_methods = [m["name"] for m in HELEKET_PAYMENT_METHODS if m["enable"]]
methods = get_heleket_methods()
enabled_methods = [m["name"] for m in methods if m["enable"]]
if len(enabled_methods) == 1:
method_name = enabled_methods[0]
if method_name:
method = next((m for m in HELEKET_PAYMENT_METHODS if m["name"] == method_name and m["enable"]), None)
methods = get_heleket_methods()
method = next((m for m in methods if m["name"] == method_name and m["enable"]), None)
if not method:
try:
await callback_query.message.delete()
except Exception:
pass
await callback_query.message.answer(
await edit_or_send_message(
target_message=callback_query.message,
text="Ошибка: выбранный способ оплаты недоступен.",
reply_markup=InlineKeyboardMarkup(inline_keyboard=[]),
)
@@ -115,40 +125,36 @@ async def process_callback_pay_heleket(
opts=opts
)
try:
await callback_query.message.delete()
except Exception:
pass
new_msg = await callback_query.message.answer(
await edit_or_send_message(
target_message=callback_query.message,
text=method["desc"],
reply_markup=builder,
)
await state.update_data(
heleket_method=method_name,
message_id=new_msg.message_id,
chat_id=new_msg.chat.id,
message_id=callback_query.message.message_id,
chat_id=callback_query.message.chat.id,
)
await state.set_state(ReplenishBalanceHeleket.choosing_amount)
return
builder = InlineKeyboardBuilder()
for method in HELEKET_PAYMENT_METHODS:
for method in get_heleket_methods():
if method["enable"]:
builder.row(
InlineKeyboardButton(text=method["button"], callback_data=f"heleket_method|{method['name']}")
)
builder.row(InlineKeyboardButton(text=BACK, callback_data="balance"))
try:
await callback_query.message.delete()
except Exception:
pass
new_msg = await callback_query.message.answer(
await edit_or_send_message(
target_message=callback_query.message,
text="Выберите способ оплаты через Heleket:",
reply_markup=builder.as_markup(),
)
await state.update_data(message_id=new_msg.message_id, chat_id=new_msg.chat.id)
await state.update_data(
message_id=callback_query.message.message_id,
chat_id=callback_query.message.chat.id,
)
await state.set_state(ReplenishBalanceHeleket.choosing_method)
except Exception as e:
@@ -166,7 +172,6 @@ async def process_method_selection(callback_query: types.CallbackQuery, state: F
target_message=callback_query.message,
text="Ошибка: выбранный способ оплаты недоступен.",
reply_markup=InlineKeyboardMarkup(inline_keyboard=[]),
force_text=True,
)
return
@@ -189,7 +194,6 @@ async def process_method_selection(callback_query: types.CallbackQuery, state: F
target_message=callback_query.message,
text=method["desc"],
reply_markup=builder,
force_text=True,
)
await state.update_data(message_id=callback_query.message.message_id, chat_id=callback_query.message.chat.id)
await state.set_state(ReplenishBalanceHeleket.choosing_amount)
@@ -211,7 +215,6 @@ async def process_custom_amount_button(callback_query: types.CallbackQuery, stat
target_message=callback_query.message,
text=f"Пожалуйста, введите сумму пополнения в {currency_text}.",
reply_markup=builder.as_markup(),
force_text=True,
)
await state.set_state(ReplenishBalanceHeleket.entering_custom_amount)
@@ -227,7 +230,6 @@ async def handle_custom_amount_input(message: types.Message, state: FSMContext,
target_message=message,
text="Ошибка: выбранный способ оплаты недоступен.",
reply_markup=InlineKeyboardMarkup(inline_keyboard=[]),
force_text=True,
)
return
@@ -247,7 +249,6 @@ async def handle_custom_amount_input(message: types.Message, state: FSMContext,
target_message=message,
text=f"❌ Минимальная сумма для оплаты криптовалютой — {currency_symbol}{min_amount}.",
reply_markup=InlineKeyboardMarkup(inline_keyboard=[]),
force_text=True,
)
return
except Exception:
@@ -255,7 +256,6 @@ async def handle_custom_amount_input(message: types.Message, state: FSMContext,
target_message=message,
text="❌ Некорректная сумма. Введите целое число больше 0.",
reply_markup=InlineKeyboardMarkup(inline_keyboard=[]),
force_text=True,
)
return
@@ -273,7 +273,6 @@ async def handle_custom_amount_input(message: types.Message, state: FSMContext,
target_message=message,
text="❌ Произошла ошибка при создании платежа. Попробуйте позже или выберите другой способ оплаты.",
reply_markup=InlineKeyboardMarkup(inline_keyboard=[]),
force_text=True,
)
return
@@ -286,7 +285,6 @@ async def handle_custom_amount_input(message: types.Message, state: FSMContext,
target_message=message,
text=HELEKET_PAYMENT_MESSAGE.format(amount=amount_text),
reply_markup=confirm_keyboard,
force_text=True,
)
await state.set_state(ReplenishBalanceHeleket.waiting_for_payment_confirmation)
@@ -300,7 +298,6 @@ async def process_amount_selection(callback_query: types.CallbackQuery, state: F
target_message=callback_query.message,
text="Некорректная сумма.",
reply_markup=InlineKeyboardMarkup(inline_keyboard=[]),
force_text=True,
)
return
@@ -312,7 +309,6 @@ async def process_amount_selection(callback_query: types.CallbackQuery, state: F
target_message=callback_query.message,
text="Ошибка: выбранный способ оплаты недоступен.",
reply_markup=InlineKeyboardMarkup(inline_keyboard=[]),
force_text=True,
)
return
@@ -321,7 +317,6 @@ async def process_amount_selection(callback_query: types.CallbackQuery, state: F
target_message=callback_query.message,
text="❌ Минимальная сумма для оплаты криптовалютой — 10₽ (≈0.1$).",
reply_markup=InlineKeyboardMarkup(inline_keyboard=[]),
force_text=True,
)
return
@@ -333,7 +328,6 @@ async def process_amount_selection(callback_query: types.CallbackQuery, state: F
target_message=callback_query.message,
text="❌ Произошла ошибка при создании платежа. Попробуйте позже или выберите другой способ оплаты.",
reply_markup=InlineKeyboardMarkup(inline_keyboard=[]),
force_text=True,
)
return
@@ -347,7 +341,6 @@ async def process_amount_selection(callback_query: types.CallbackQuery, state: F
target_message=callback_query.message,
text=HELEKET_PAYMENT_MESSAGE.format(amount=amount_text),
reply_markup=confirm_keyboard,
force_text=True,
)
await state.set_state(ReplenishBalanceHeleket.waiting_for_payment_confirmation)
@@ -371,17 +364,6 @@ async def generate_heleket_payment_link(amount: int, tg_id: int, method: dict) -
rate = await get_rub_rate(pay_cur, session=session)
payment_amount = (Decimal(str(amount)) * rate).quantize(Decimal("0.01"), rounding=ROUND_HALF_UP)
async with async_session_maker() as dbs:
await add_payment(
session=dbs,
tg_id=tg_id,
amount=float(amount),
payment_system="HELEKET",
status="pending",
currency="RUB",
payment_id=unique_order_id,
)
data = {
"amount": str(payment_amount),
"currency": method["currency"],
@@ -412,6 +394,16 @@ async def generate_heleket_payment_link(amount: int, tg_id: int, method: dict) -
if resp_json.get("state") == 0:
payment_url = resp_json.get("result", {}).get("url")
if payment_url:
async with async_session_maker() as dbs:
await add_payment(
session=dbs,
tg_id=tg_id,
amount=float(amount),
payment_system="HELEKET",
status="pending",
currency="RUB",
payment_id=unique_order_id,
)
logger.info(f"Heleket payment URL created for user {tg_id}")
return payment_url
else:
handlers/payments/heleket/webhook.py
+6 -22
View File
@@ -124,26 +124,12 @@ async def process_heleket_webhook(data: dict) -> bool:
payment = await get_payment_by_payment_id(session, order_id)
if payment:
if payment.get("status") == "success":
logger.info(
f"Heleket: платёж {order_id} уже обработан"
)
logger.info(f"Heleket: платёж {order_id} уже обработан")
return True
ok = await update_payment_status(
session=session,
internal_id=int(payment["id"]),
new_status="success",
)
ok = await update_payment_status(session=session, internal_id=int(payment["id"]), new_status="success")
if not ok:
logger.error(
f"Heleket: не удалось обновить статус "
f"платежа {order_id}"
)
logger.error(f"Heleket: не удалось обновить статус платежа {order_id}")
return False
await update_balance(session, tg_id, balance_amount)
await send_payment_success_notification(
tg_id, balance_amount, session
)
await session.commit()
else:
await add_payment(
session=session,
@@ -155,11 +141,9 @@ async def process_heleket_webhook(data: dict) -> bool:
payment_id=order_id,
metadata=None,
)
await update_balance(session, tg_id, balance_amount)
await send_payment_success_notification(
tg_id, balance_amount, session
)
await session.commit()
await update_balance(session, tg_id, balance_amount)
await send_payment_success_notification(tg_id, balance_amount, session)
logger.info(
f"Heleket: платёж {order_id} для пользователя {tg_id} "
f"успешно обработан, баланс пополнен на {balance_amount} RUB"
handlers/payments/kassai/handlers.py
+2 -6
View File
@@ -14,7 +14,7 @@ from logger import logger
from ..constants import ALLOWED_TEMP_PAYMENT_STATES
from .service import (
KASSAI_PAYMENT_METHODS,
get_kassai_methods,
generate_kassai_payment_link,
process_callback_pay_kassai,
router as service_router,
@@ -105,11 +105,7 @@ async def _handle_custom_amount_input_kassai(
return
method = next(
(
m
for m in KASSAI_PAYMENT_METHODS
if m["name"] == method_name and m["enable"]
),
(m for m in get_kassai_methods() if m["name"] == method_name and m["enable"]),
None,
)
if not method:
handlers/payments/kassai/service.py
+52 -56
View File
@@ -20,6 +20,7 @@ from config import (
KASSAI_SUCCESS_URL,
PROVIDERS_ENABLED,
)
from database import add_payment, async_session_maker
from database.models import User
from handlers.buttons import BACK, KASSAI_CARDS, KASSAI_SBP, PAY_2
from handlers.payments.currency_rates import (
@@ -63,23 +64,34 @@ class ReplenishBalanceKassaiState(StatesGroup):
entering_custom_amount = State()
PROVIDERS = get_providers(PROVIDERS_ENABLED)
KASSAI_PAYMENT_METHODS = [
{
"enable": bool(PROVIDERS.get("KASSAI_CARDS", {}).get("enabled")),
"method": 36,
"name": "cards",
"button": KASSAI_CARDS,
"desc": KASSAI_CARDS_DESCRIPTION,
},
{
"enable": bool(PROVIDERS.get("KASSAI_SBP", {}).get("enabled")),
"method": 44,
"name": "sbp",
"button": KASSAI_SBP,
"desc": KASSAI_SBP_DESCRIPTION,
},
]
def _is_kassai_enabled(provider: str) -> bool:
try:
from core.bootstrap import PAYMENTS_CONFIG
return bool(PAYMENTS_CONFIG.get(provider, PROVIDERS_ENABLED.get(provider, False)))
except ImportError:
return bool(PROVIDERS_ENABLED.get(provider, False))
def get_kassai_methods() -> list[dict]:
return [
{
"enable": _is_kassai_enabled("KASSAI_CARDS"),
"method": 36,
"name": "cards",
"button": KASSAI_CARDS,
"desc": KASSAI_CARDS_DESCRIPTION,
},
{
"enable": _is_kassai_enabled("KASSAI_SBP"),
"method": 44,
"name": "sbp",
"button": KASSAI_SBP,
"desc": KASSAI_SBP_DESCRIPTION,
},
]
KASSAI_PAYMENT_METHODS = get_kassai_methods()
@router.callback_query(F.data == "pay_kassai")
@@ -96,20 +108,14 @@ async def process_callback_pay_kassai(
await state.clear()
if method_name:
methods = get_kassai_methods()
method = next(
(
m
for m in KASSAI_PAYMENT_METHODS
if m["name"] == method_name and m["enable"]
),
(m for m in methods if m["name"] == method_name and m["enable"]),
None,
)
if not method:
try:
await callback_query.message.delete()
except Exception:
pass
await callback_query.message.answer(
await edit_or_send_message(
target_message=callback_query.message,
text="Ошибка: выбранный способ оплаты недоступен.",
reply_markup=InlineKeyboardMarkup(inline_keyboard=[]),
)
@@ -127,24 +133,21 @@ async def process_callback_pay_kassai(
opts=opts,
)
try:
await callback_query.message.delete()
except Exception:
pass
new_msg = await callback_query.message.answer(
await edit_or_send_message(
target_message=callback_query.message,
text=method["desc"],
reply_markup=builder,
)
await state.update_data(
kassai_method=method_name,
message_id=new_msg.message_id,
chat_id=new_msg.chat.id,
message_id=callback_query.message.message_id,
chat_id=callback_query.message.chat.id,
)
await state.set_state(ReplenishBalanceKassaiState.choosing_amount)
return
builder = InlineKeyboardBuilder()
for method in KASSAI_PAYMENT_METHODS:
for method in get_kassai_methods():
if method["enable"]:
builder.row(
InlineKeyboardButton(
@@ -154,16 +157,14 @@ async def process_callback_pay_kassai(
)
builder.row(InlineKeyboardButton(text=BACK, callback_data="balance"))
try:
await callback_query.message.delete()
except Exception:
pass
new_msg = await callback_query.message.answer(
await edit_or_send_message(
target_message=callback_query.message,
text="Выберите способ оплаты через KassaAI:",
reply_markup=builder.as_markup(),
)
await state.update_data(
message_id=new_msg.message_id, chat_id=new_msg.chat.id
message_id=callback_query.message.message_id,
chat_id=callback_query.message.chat.id,
)
await state.set_state(ReplenishBalanceKassaiState.choosing_method)
@@ -188,7 +189,6 @@ async def process_method_selection(callback_query: types.CallbackQuery, state: F
target_message=callback_query.message,
text="Ошибка: выбранный способ оплаты недоступен.",
reply_markup=InlineKeyboardMarkup(inline_keyboard=[]),
force_text=True,
)
return
@@ -211,7 +211,6 @@ async def process_method_selection(callback_query: types.CallbackQuery, state: F
target_message=callback_query.message,
text=method["desc"],
reply_markup=builder,
force_text=True,
)
await state.update_data(message_id=callback_query.message.message_id, chat_id=callback_query.message.chat.id)
await state.set_state(ReplenishBalanceKassaiState.choosing_amount)
@@ -233,7 +232,6 @@ async def process_custom_amount_button(callback_query: types.CallbackQuery, stat
target_message=callback_query.message,
text=f"Пожалуйста, введите сумму пополнения в {currency_text}.",
reply_markup=builder.as_markup(),
force_text=True,
)
await state.set_state(ReplenishBalanceKassaiState.entering_custom_amount)
@@ -249,7 +247,6 @@ async def handle_custom_amount_input(message: types.Message, state: FSMContext,
target_message=message,
text="Ошибка: выбранный способ оплаты недоступен.",
reply_markup=InlineKeyboardMarkup(inline_keyboard=[]),
force_text=True,
)
return
@@ -269,7 +266,6 @@ async def handle_custom_amount_input(message: types.Message, state: FSMContext,
target_message=message,
text=f"❌ Минимальная сумма для оплаты картой — {currency_symbol}{min_amount}.",
reply_markup=InlineKeyboardMarkup(inline_keyboard=[]),
force_text=True,
)
return
elif method_name == "sbp":
@@ -280,7 +276,6 @@ async def handle_custom_amount_input(message: types.Message, state: FSMContext,
target_message=message,
text=f"❌ Минимальная сумма для оплаты через СБП — {currency_symbol}{min_amount}.",
reply_markup=InlineKeyboardMarkup(inline_keyboard=[]),
force_text=True,
)
return
except Exception:
@@ -288,7 +283,6 @@ async def handle_custom_amount_input(message: types.Message, state: FSMContext,
target_message=message,
text="❌ Некорректная сумма. Введите целое число больше 0.",
reply_markup=InlineKeyboardMarkup(inline_keyboard=[]),
force_text=True,
)
return
@@ -306,7 +300,6 @@ async def handle_custom_amount_input(message: types.Message, state: FSMContext,
target_message=message,
text="❌ Произошла ошибка при создании платежа. Попробуйте позже или выберите другой способ оплаты.",
reply_markup=InlineKeyboardMarkup(inline_keyboard=[]),
force_text=True,
)
return
@@ -319,7 +312,6 @@ async def handle_custom_amount_input(message: types.Message, state: FSMContext,
target_message=message,
text=KASSAI_PAYMENT_MESSAGE.format(amount=amount_text),
reply_markup=confirm_keyboard,
force_text=True,
)
await state.set_state(ReplenishBalanceKassaiState.waiting_for_payment_confirmation)
@@ -333,7 +325,6 @@ async def process_amount_selection(callback_query: types.CallbackQuery, state: F
target_message=callback_query.message,
text="Некорректная сумма.",
reply_markup=InlineKeyboardMarkup(inline_keyboard=[]),
force_text=True,
)
return
@@ -345,7 +336,6 @@ async def process_amount_selection(callback_query: types.CallbackQuery, state: F
target_message=callback_query.message,
text="Ошибка: выбранный способ оплаты недоступен.",
reply_markup=InlineKeyboardMarkup(inline_keyboard=[]),
force_text=True,
)
return
@@ -354,7 +344,6 @@ async def process_amount_selection(callback_query: types.CallbackQuery, state: F
target_message=callback_query.message,
text="❌ Минимальная сумма для оплаты картой — 50₽.",
reply_markup=InlineKeyboardMarkup(inline_keyboard=[]),
force_text=True,
)
return
elif method_name == "sbp" and amount < 10:
@@ -362,7 +351,6 @@ async def process_amount_selection(callback_query: types.CallbackQuery, state: F
target_message=callback_query.message,
text="❌ Минимальная сумма для оплаты через СБП — 10₽.",
reply_markup=InlineKeyboardMarkup(inline_keyboard=[]),
force_text=True,
)
return
@@ -374,7 +362,6 @@ async def process_amount_selection(callback_query: types.CallbackQuery, state: F
target_message=callback_query.message,
text="❌ Произошла ошибка при создании платежа. Попробуйте позже или выберите другой способ оплаты.",
reply_markup=InlineKeyboardMarkup(inline_keyboard=[]),
force_text=True,
)
return
@@ -388,7 +375,6 @@ async def process_amount_selection(callback_query: types.CallbackQuery, state: F
target_message=callback_query.message,
text=KASSAI_PAYMENT_MESSAGE.format(amount=amount_text),
reply_markup=confirm_keyboard,
force_text=True,
)
await state.set_state(ReplenishBalanceKassaiState.waiting_for_payment_confirmation)
@@ -434,6 +420,16 @@ async def generate_kassai_payment_link(amount: int, tg_id: int, method: dict) ->
if resp_json.get("type") == "success":
payment_url = resp_json.get("location")
if payment_url:
async with async_session_maker() as dbs:
await add_payment(
session=dbs,
tg_id=tg_id,
amount=float(amount),
payment_system="KASSAI",
status="pending",
currency="RUB",
payment_id=unique_payment_id,
)
logger.info(f"KassaAI payment URL created for user {tg_id}")
return payment_url
logger.error(f"KassaAI: No location in response: {resp_json}")
handlers/payments/kassai/webhook.py
+6 -22
View File
@@ -89,26 +89,12 @@ async def kassai_webhook(request: web.Request):
payment = await get_payment_by_payment_id(session, order_id)
if payment:
if payment.get("status") == "success":
logger.info(
f"KassaAI: платёж {order_id} уже обработан"
)
logger.info(f"KassaAI: платёж {order_id} уже обработан")
return web.Response(text=KASSAI_WEBHOOK_RESPONSE)
ok = await update_payment_status(
session=session,
internal_id=int(payment["id"]),
new_status="success",
)
ok = await update_payment_status(session=session, internal_id=int(payment["id"]), new_status="success")
if not ok:
logger.error(
f"KassaAI: не удалось обновить статус "
f"платежа {order_id}"
)
logger.error(f"KassaAI: не удалось обновить статус платежа {order_id}")
return web.Response(status=500)
await update_balance(session, tg_id, amount)
await send_payment_success_notification(
tg_id, amount, session
)
await session.commit()
else:
await add_payment(
session=session,
@@ -120,11 +106,9 @@ async def kassai_webhook(request: web.Request):
payment_id=order_id,
metadata=None,
)
await update_balance(session, tg_id, amount)
await send_payment_success_notification(
tg_id, amount, session
)
await session.commit()
await update_balance(session, tg_id, amount)
await send_payment_success_notification(tg_id, amount, session)
logger.info(
f"KassaAI: платёж {order_id} успешно обработан, "
f"баланс пользователя {tg_id} пополнен на {amount} RUB"
handlers/payments/robokassa/handlers.py
+7 -6
View File
@@ -61,9 +61,12 @@ async def process_callback_pay_robokassa(callback_query: types.CallbackQuery, st
opts=opts,
)
await callback_query.message.delete()
m = await callback_query.message.answer(text="Выберите сумму пополнения:", reply_markup=markup)
await state.update_data(message_id=m.message_id, chat_id=m.chat.id)
await edit_or_send_message(
target_message=callback_query.message,
text="Выберите сумму пополнения:",
reply_markup=markup,
)
await state.update_data(message_id=callback_query.message.message_id, chat_id=callback_query.message.chat.id)
await state.set_state(ReplenishBalanceState.choosing_amount_robokassa)
@@ -75,7 +78,6 @@ async def process_amount_selection(callback_query: types.CallbackQuery, state: F
target_message=callback_query.message,
text="Некорректная сумма.",
reply_markup=InlineKeyboardMarkup(inline_keyboard=[]),
force_text=True,
)
return
@@ -95,14 +97,13 @@ async def process_amount_selection(callback_query: types.CallbackQuery, state: F
target_message=callback_query.message,
text=DEFAULT_PAYMENT_MESSAGE.format(amount=amount_text),
reply_markup=kb,
force_text=True,
)
@router.callback_query(F.data == "enter_custom_amount_robokassa")
async def process_custom_amount_selection(callback_query: types.CallbackQuery, state: FSMContext):
b = back_keyboard("pay_robokassa")
await edit_or_send_message(target_message=callback_query.message, text=ENTER_SUM, reply_markup=b, force_text=True)
await edit_or_send_message(target_message=callback_query.message, text=ENTER_SUM, reply_markup=b)
await state.set_state(ReplenishBalanceState.waiting_for_payment_confirmation_robokassa)