From 635182e1efc3bb8e2f739540a3dba19817b319be Mon Sep 17 00:00:00 2001
From: Son NK <>
Date: Tue, 20 Oct 2020 17:45:06 +0200
Subject: [PATCH] move lifetime case to first
---
app/dashboard/templates/dashboard/setting.html | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/app/dashboard/templates/dashboard/setting.html b/app/dashboard/templates/dashboard/setting.html
index 0822b618..b9b6c9b9 100644
--- a/app/dashboard/templates/dashboard/setting.html
+++ b/app/dashboard/templates/dashboard/setting.html
@@ -199,7 +199,14 @@
Current Plan
- {% if current_user.get_subscription() %}
+ {% if current_user.lifetime %}
+ You have lifetime access to the Premium plan.
+ {% if not current_user.paid_lifetime %}
+
+ To support Simple Login you can switch to a paid plan.
+
Upgrade
+ {% endif %}
+ {% elif current_user.get_subscription() %}
You are on the {{ current_user.get_subscription().plan_name() }} plan.
Manage Subscription
@@ -215,13 +222,7 @@
To gain additional features and support Simple Login you can upgrade to a Premium plan.
Upgrade
{% endif %}
- {% elif current_user.lifetime %}
- You have lifetime access to the Premium plan.
- {% if not current_user.paid_lifetime %}
-
- To support Simple Login you can switch to a paid plan.
-
Upgrade
- {% endif %}
+
{% elif current_user.in_trial() %}
Your Premium trial expires {{ current_user.trial_end | dt }}.
{% else %}