Fix new subscriptions

rohitpaulk · rohitpaulk · commit aa09cb33b7e8 · 2015-01-11T14:48:23.000+05:30
Strong Parameters for account params

Fix if condition in save_with_payment

When save_with_payment is called, stripe_customer_token might not be available, so we should check for just stripe_card_token.
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
@@ -15,7 +15,7 @@ def new
   def create
     redirect_to teamname_path(slug: @team.slug) if @plan.free?
 
-    @account           = @team.build_account(params[:account])
+    @account           = @team.build_account(account_params)
     @account.admin_id  = current_user.id
     # TODO: (whatupdave) this doesn't look like it's being used any more. Remove if possible
     # @account.trial_end = Date.new(2013, 1, 1).to_time.to_i if session[:discount] == ENV['DISCOUNT_TOKEN']
@@ -38,7 +38,7 @@ def create
   end
 
   def update
-    if @account.update_attributes(params[:account]) && @account.save_with_payment(@plan)
+    if @account.update_attributes(account_params) && @account.save_with_payment(@plan)
       redirect_to new_team_opportunity_path(@team), notice: "You are subscribed to #{@plan.name}." + plan_capability(@plan, @team)
     else
       flash[:error] = @account.errors.full_messages.join("\n")
@@ -107,4 +107,8 @@ def paying_user_context
     # Honeybadger.context(user_email: current_user.try(:email)) if current_user
   end
 
+  def account_params
+    params.require(:teams_account).permit(:stripe_card_token)
+  end
+
 end
diff --git a/app/models/teams/account.rb b/app/models/teams/account.rb
@@ -36,7 +36,7 @@ def subscribe_to!(plan, force=false)
   end
 
   def save_with_payment(plan=nil)
-    if valid?
+    if stripe_card_token
       create_customer unless plan.try(:one_time?)
       subscribe_to!(plan) unless plan.nil?
       save!
