From a2dad50d204fe7f21ba18ef83cdc77ab9c729fb7 Mon Sep 17 00:00:00 2001 From: Son NK <> Date: Tue, 23 Feb 2021 19:40:40 +0100 Subject: [PATCH] take into account apple sub --- app/dashboard/templates/dashboard/setting.html | 3 +++ app/dashboard/views/setting.py | 3 +++ 2 files changed, 6 insertions(+) diff --git a/app/dashboard/templates/dashboard/setting.html b/app/dashboard/templates/dashboard/setting.html index 9704f979..16322884 100644 --- a/app/dashboard/templates/dashboard/setting.html +++ b/app/dashboard/templates/dashboard/setting.html @@ -48,6 +48,9 @@ Upgrade {% endif %} + {% elif apple_sub and apple_sub.is_valid() %} + You are on the Premium plan which expires {{ apple_sub.expires_date | dt }} + ({{ apple_sub.expires_date.format("YYYY-MM-DD") }}). {% elif coinbase_sub and coinbase_sub.is_active() %} You are on the Premium plan which expires {{ coinbase_sub.end_at | dt }} ({{ coinbase_sub.end_at.format("YYYY-MM-DD") }}). diff --git a/app/dashboard/views/setting.py b/app/dashboard/views/setting.py index e5bbb7bc..5f06ef70 100644 --- a/app/dashboard/views/setting.py +++ b/app/dashboard/views/setting.py @@ -41,6 +41,7 @@ from app.models import ( SenderFormatEnum, SLDomain, CoinbaseSubscription, + AppleSubscription, ) from app.utils import random_string, sanitize_email @@ -303,6 +304,7 @@ def setting(): return output manual_sub = ManualSubscription.get_by(user_id=current_user.id) + apple_sub = AppleSubscription.get_by(user_id=current_user.id) coinbase_sub = CoinbaseSubscription.get_by(user_id=current_user.id) return render_template( @@ -315,6 +317,7 @@ def setting(): pending_email=pending_email, AliasGeneratorEnum=AliasGeneratorEnum, manual_sub=manual_sub, + apple_sub=apple_sub, coinbase_sub=coinbase_sub, FIRST_ALIAS_DOMAIN=FIRST_ALIAS_DOMAIN, )