From cb82637b8ed85896024da4d4988ba7fab0ed0f78 Mon Sep 17 00:00:00 2001 From: Machka Pasla <161734431+machka-pasla@users.noreply.github.com> Date: Mon, 23 Jun 2025 23:59:17 +0300 Subject: [PATCH] Fix payment notifications --- bot/handlers/user/subscription.py | 5 ++++- bot/handlers/webhooks/tribute.py | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/bot/handlers/user/subscription.py b/bot/handlers/user/subscription.py index 91b0185..ea1423c 100644 --- a/bot/handlers/user/subscription.py +++ b/bot/handlers/user/subscription.py @@ -468,7 +468,10 @@ async def stars_successful_payment_handler( await session.commit() applied_referee_days = referral_bonus_info.get("referee_bonus_applied_days") if referral_bonus_info else None - final_end = referral_bonus_info.get("referee_new_end_date") if referral_bonus_info else activation_details["end_date"] + final_end = (referral_bonus_info.get("referee_new_end_date") + if referral_bonus_info else None) + if not final_end: + final_end = activation_details["end_date"] current_lang = i18n_data.get("current_language", settings.DEFAULT_LANGUAGE) i18n: JsonI18n = i18n_data.get("i18n_instance") diff --git a/bot/handlers/webhooks/tribute.py b/bot/handlers/webhooks/tribute.py index 90c6c4c..e61f075 100644 --- a/bot/handlers/webhooks/tribute.py +++ b/bot/handlers/webhooks/tribute.py @@ -86,7 +86,10 @@ async def tribute_webhook_route(request: web.Request): _ = lambda k, **kw: i18n.gettext(lang, k, **kw) applied_ref_days = referral_bonus.get('referee_bonus_applied_days') if referral_bonus else None - final_end = referral_bonus.get('referee_new_end_date') if referral_bonus else activation_details.get('end_date') + final_end = (referral_bonus.get('referee_new_end_date') + if referral_bonus else None) + if not final_end: + final_end = activation_details.get('end_date') if final_end: if applied_ref_days: