From 89062edc06d13e23a1d1ecb6576c22ab953e100b Mon Sep 17 00:00:00 2001
From: Son Nguyen Kim <nguyenkims@users.noreply.github.com>
Date: Tue, 28 Jun 2022 11:58:04 +0200
Subject: [PATCH] show cancel status in "Current plan" section (#1114)

* show cancel status in "Current plan" section

* do not show upgrade button for canceled paddle sub
---
 app/dashboard/views/setting.py   | 2 ++
 app/models.py                    | 8 --------
 templates/dashboard/setting.html | 5 +++--
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/app/dashboard/views/setting.py b/app/dashboard/views/setting.py
index 9f6fed27..c08ab145 100644
--- a/app/dashboard/views/setting.py
+++ b/app/dashboard/views/setting.py
@@ -370,6 +370,7 @@ def setting():
     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)
+    paddle_sub = current_user.get_paddle_subscription()
     partner_sub = None
     partner_name = None
 
@@ -393,6 +394,7 @@ def setting():
         partner_sub=partner_sub,
         partner_name=partner_name,
         apple_sub=apple_sub,
+        paddle_sub=paddle_sub,
         coinbase_sub=coinbase_sub,
         FIRST_ALIAS_DOMAIN=FIRST_ALIAS_DOMAIN,
         ALIAS_RAND_SUFFIX_LENGTH=ALIAS_RANDOM_SUFFIX_LENGTH,
diff --git a/app/models.py b/app/models.py
index bd8812b8..cd0bbc35 100644
--- a/app/models.py
+++ b/app/models.py
@@ -675,15 +675,7 @@ class User(Base, ModelMixin, UserMixin, PasswordOracle):
         return False
 
     def should_show_upgrade_button(self):
-        if self.lifetime:
-            return False
-
         if self.lifetime_or_active_subscription():
-            # user who has canceled can also re-subscribe
-            sub: Subscription = self.get_paddle_subscription()
-            if sub and sub.cancelled:
-                return True
-
             return False
 
         return True
diff --git a/templates/dashboard/setting.html b/templates/dashboard/setting.html
index 8743c915..8b0026a9 100644
--- a/templates/dashboard/setting.html
+++ b/templates/dashboard/setting.html
@@ -27,9 +27,10 @@
         {% if current_user.lifetime %}
           You have lifetime access to the Premium plan.
         {% elif current_user.lifetime_or_active_subscription() %}
-          {% if current_user.get_paddle_subscription() %}
+          {% if paddle_sub %}
             <div>
-              {{ current_user.get_paddle_subscription().plan_name() }} plan subscribed via Paddle.
+              {% if paddle_sub.cancelled %}(Cancelled){% endif %}
+              {{ paddle_sub.plan_name() }} plan subscribed via Paddle.
               <a href="{{ url_for('dashboard.billing') }}">
                 Manage Subscription ➡
               </a>