summaryrefslogtreecommitdiff
path: root/billing/app/controllers
diff options
context:
space:
mode:
authorjessib <jessib@leap.se>2013-06-11 12:16:13 -0700
committerAzul <azul@leap.se>2013-07-17 10:47:14 +0200
commitd3e4489cc4833c196eeef77f4fe0680c3f7e7a09 (patch)
treeeb71cac652850e60f9a7669aba8beb856a8459ea /billing/app/controllers
parent888baf7539e131a6201dd6f53a152eeaeb8a0f94 (diff)
More cleanup of billing code.
Diffstat (limited to 'billing/app/controllers')
-rw-r--r--billing/app/controllers/subscriptions_controller.rb24
1 files changed, 13 insertions, 11 deletions
diff --git a/billing/app/controllers/subscriptions_controller.rb b/billing/app/controllers/subscriptions_controller.rb
index 9217979..366a457 100644
--- a/billing/app/controllers/subscriptions_controller.rb
+++ b/billing/app/controllers/subscriptions_controller.rb
@@ -1,18 +1,13 @@
class SubscriptionsController < ApplicationController
before_filter :authorize
before_filter :fetch_subscription, :only => [:show, :destroy]
+ before_filter :confirm_no_active_subscription, :only => [:new, :create]
def new
# don't show link to subscribe if they are already subscribed?
- customer = Customer.find_by_user_id(current_user.id)
-
- if subscription = customer.subscriptions # will return active subscription, if it exists
- redirect_to subscription_path(subscription.id), :notice => 'You already have an active subscription'
- else
- credit_card = customer.default_credit_card #safe to assume default?
- @payment_method_token = credit_card.token
- @plans = Braintree::Plan.all
- end
+ credit_card = @customer.default_credit_card #safe to assume default?
+ @payment_method_token = credit_card.token
+ @plans = Braintree::Plan.all
end
# show has no content, so not needed at this point.
@@ -35,9 +30,16 @@ class SubscriptionsController < ApplicationController
def fetch_subscription
@subscription = Braintree::Subscription.find params[:id]
@subscription_customer_id = @subscription.transactions.first.customer_details.id #all of subscriptions transactions should have same customer
- customer = Customer.find_by_user_id(current_user.id)
- access_denied unless customer and customer.braintree_customer_id == @subscription_customer_id
+ @customer = Customer.find_by_user_id(current_user.id)
+ access_denied unless @customer and @customer.braintree_customer_id == @subscription_customer_id
# TODO: will presumably want to allow admins to view/cancel subscriptions for all users
end
+ def confirm_no_active_subscription
+ @customer = Customer.find_by_user_id(current_user.id)
+ if subscription = @customer.subscriptions # will return active subscription, if it exists
+ redirect_to subscription_path(subscription.id), :notice => 'You already have an active subscription'
+ end
+ end
+
end