Merge branch 'master' of https://bitbucket.org/yackob03/quay

2013-11-11 16:57:41 +00:00 · 2013-11-11 16:57:41 +00:00 · 47a74c0056
commit 47a74c0056
parent e703ef0970 1f1565fdaa
1 changed files with 4 additions and 2 deletions
--- a/endpoints/api.py
+++ b/endpoints/api.py
@ -1217,8 +1217,10 @@ def subscribe(user, plan, token, accepted_plans):
    cus = stripe.Customer.retrieve(user.stripe_id)

    if plan_found['price'] == 0:
-      cus.cancel_subscription()
-      cus.save()
+      if cus.subscription is not None:
+        # We only have to cancel the subscription if they actually have one
+        cus.cancel_subscription()
+        cus.save()

      response_json = {
        'plan': plan,