diff --git a/endpoints/api.py b/endpoints/api.py index 1fee46686..1f1222a92 100644 --- a/endpoints/api.py +++ b/endpoints/api.py @@ -1249,7 +1249,7 @@ def subscribe(user, plan, token, accepted_plans): if not user.stripe_id: # Check if a non-paying user is trying to subscribe to a free plan if not plan_found['price'] == 0: - # They want a real paying plan, create the customerand plan + # They want a real paying plan, create the customer and plan # simultaneously card = token cus = stripe.Customer.create(email=user.email, plan=plan, card=card) diff --git a/static/js/app.js b/static/js/app.js index c1d77bd77..087e299e3 100644 --- a/static/js/app.js +++ b/static/js/app.js @@ -240,7 +240,7 @@ quayApp = angular.module('quay', ['restangular', 'angularMoment', 'angulartics', if (callbacks['started']) { callbacks['started'](); } - planService.setSubscription(orgname, planId, callbacks['success'], callbacks['failure']); + planService.setSubscription(orgname, planId, callbacks['success'], callbacks['failure'], token); }); }; diff --git a/util/invoice.py b/util/invoice.py index 6cefa5099..773c428f1 100644 --- a/util/invoice.py +++ b/util/invoice.py @@ -13,7 +13,7 @@ def renderInvoiceToHtml(invoice, user): if not price: return '$0' - return '$' + '{.2f}'.format(price / 100) + return '$' + '{0:.2f}'.format(float(price) / 100) def get_range(line): if line.period and line.period.start and line.period.end: