Merge branch 'croolicjah-account_error_fix'

zappycode · Jun 10, 2021 · ab77d35 · ab77d35
2 parents e0188bb + 8b068be
commit ab77d35
Showing 1 changed file with 14 additions and 14 deletions.
diff --git a/sitewide/views.py b/sitewide/views.py
@@ -118,23 +118,23 @@ def account(request):
 
         if user.stripe_subscription_id and membership_warning:
             stripe_sub = user.check_stripe()
-
-            if stripe_sub[0] == 'active':
-                membership = {
-                   "type": "stripe",
-                   "expiration_date": stripe_sub[1]
-                }
-                membership_warning = None
+            if stripe_sub:
+                if stripe_sub[0] == 'active':
+                    membership = {
+                       "type": "stripe",
+                       "expiration_date": stripe_sub[1]
+                    }
+                    membership_warning = None
 
         if user.paypal_subscription_id and membership_warning:
             paypal_sub = user.check_paypal()
-
-            if paypal_sub[0] == "active" or (paypal_sub[0] == "cancelled" and paypal_sub[1] >= datetime.now()):
-                membership = {
-                     "type": "paypal",
-                     "expiration_date": paypal_sub[1]
-                }
-                membership_warning = None
+            if paypal_sub:
+                if paypal_sub[0] == "active" or (paypal_sub[0] == "cancelled" and paypal_sub[1] >= datetime.now()):
+                    membership = {
+                         "type": "paypal",
+                         "expiration_date": paypal_sub[1]
+                    }
+                    membership_warning = None
 
         if membership_warning:
             if Invite.has_invite(request.user):