From ecab3ea6edcdb1235105b1e437dae9a3d9c5b171 Mon Sep 17 00:00:00 2001
From: Son NK <>
Date: Wed, 3 Jun 2020 21:32:15 +0200
Subject: [PATCH] take into account the case premium user obtains a lifetime
 license

- do not show subscription expired date
- show lifetime plan message on settings page
---
 app/dashboard/templates/dashboard/setting.html | 8 ++++++--
 templates/header.html                          | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/dashboard/templates/dashboard/setting.html b/app/dashboard/templates/dashboard/setting.html
index c151f617..6be24b01 100644
--- a/app/dashboard/templates/dashboard/setting.html
+++ b/app/dashboard/templates/dashboard/setting.html
@@ -178,6 +178,9 @@
           <a href="{{ url_for('dashboard.billing') }}" class="btn btn-outline-primary">
             Manage Subscription
           </a>
+          {% if current_user.lifetime %}
+            You have however lifetime access to the Premium plan now so make sure to cancel the previous plan :).
+          {% endif %}
         {% elif manual_sub %}
           You are on the Premium plan which expires {{ manual_sub.end_at | dt }}
           ({{ manual_sub.end_at.format("YYYY-MM-DD") }}).
@@ -190,7 +193,7 @@
           You have lifetime access to the Premium plan.
           {% if not current_user.paid_lifetime %}
             <br>
-              To support Simple Login you can switch to a paid plan. <br>
+            To support Simple Login you can switch to a paid plan. <br>
             <a href="{{ url_for('dashboard.pricing') }}" class="btn btn-sm btn-outline-primary">Upgrade</a>
           {% endif %}
         {% elif current_user.in_trial() %}
@@ -244,7 +247,8 @@
         <div class="card-title">Replace reverse alias</div>
         <div class="mb-3">
           When replying to a forwarded email, the <b>reverse-alias</b> is usually included in the attached message.
-          You can turn on this option to <b>replace</b> the reverse-alias by the alias. However this breaks PGP-signed emails
+          You can turn on this option to <b>replace</b> the reverse-alias by the alias. However this breaks PGP-signed
+          emails
           so please only enable it if you know what you're doing :).
         </div>
         <form method="post">
diff --git a/templates/header.html b/templates/header.html
index 3b50c0ef..2446681f 100644
--- a/templates/header.html
+++ b/templates/header.html
@@ -70,7 +70,7 @@
 
                 <small class="text-success d-block mt-1">Premium
                   {% set sub = current_user.get_subscription() %}
-                  {% if sub and sub.cancelled %}
+                  {% if sub and sub.cancelled and not current_user.lifetime %}
                     until {{ sub.next_bill_date.strftime("%Y-%m-%d") }}
                   {% endif %}
                 </small>