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

2013-11-11 17:53:29 -05:00 · 2013-11-11 17:53:29 -05:00 · 743e95c50e
commit 743e95c50e
parent 0f473a3a82 64cbc735fb
4 changed files with 34 additions and 14 deletions
--- a/endpoints/api.py
+++ b/endpoints/api.py
@ -1218,8 +1218,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,