send email to all admins.

seuros · seuros · commit 986427d1cb14 · 2015-07-23T14:01:00.000+01:00
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
@@ -14,10 +14,7 @@ def new
   def create
     redirect_to teamname_path(slug: @team.slug) if @plan.free?
 
-    @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']
+    @account = @team.build_account(account_params)
 
     if @account.save_with_payment(@plan)
       unless @team.is_member?(current_user)
@@ -62,7 +59,7 @@ def send_invoice
     team, period = Team.find(params[:team_id]), 1.month.ago
 
     if team.account.send_invoice_for(period)
-      flash[:notice] = "sent invoice for #{period.strftime("%B")} to #{team.account.admin.email}"
+      flash[:notice] = "sent invoice for #{period.strftime("%B")} to the team's admins "
     else
       flash[:error] = 'There was an error in sending an invoice'
     end
@@ -72,13 +69,16 @@ def send_invoice
 
   private
   def lookup_account
-    @team = (current_user && current_user.team) || (params[:team_id] && Team.find(params[:team_id]))
-    return redirect_to employers_path if @team.nil?
+    begin
+      @team = Team.includes(:account).find(params[:team_id])
+    rescue ActiveRecord::RecordNotFound
+      redirect_to employers_path if @team.nil?
+    end
     @account = @team.account
   end
 
   def ensure_account_admin
-    is_admin? || current_user.team && current_user.team.admin?(current_user)
+    is_admin? || @team.admins.exists?(user_id: current_user)
   end
 
   def determine_plan
diff --git a/app/mailers/notifier_mailer.rb b/app/mailers/notifier_mailer.rb
@@ -209,11 +209,11 @@ def invoice(team_id, time, invoice_id=nil)
     headers['X-Mailgun-Variables'] = {email_type: INVOICE_EVENT}.to_json
     #track_campaign("new_applicant")
     @team = Team.find(team_id)
-    @admin = @team.account.admin
+    team_admin_emails = @team.admin_accounts.pluck :email
     @invoice = invoice_id.nil? ? @team.account.invoice_for(Time.at(time)) : Stripe::Invoice.retrieve(invoice_id).to_hash.with_indifferent_access
     @customer = @team.account.customer
 
-    mail to: @admin.email, bcc: admin_emails, subject: "Invoice for Coderwall enhanced team profile subscription"
+    mail to: team_admin_emails, bcc: admin_emails, subject: "Invoice for Coderwall enhanced team profile subscription"
   end
 
 
@@ -268,6 +268,6 @@ def badge_for_message(badge)
   end
 
   def admin_emails
-    YAML.load(ENV['NOTIFIER_ADMIN_EMAILS'])
+    User.admins.pluck(:email)
   end
 end
diff --git a/app/models/teams/account.rb b/app/models/teams/account.rb
@@ -123,11 +123,11 @@ def add_analytics
   end
 
   def send_invoice(invoice_id)
-    NotifierMailer.invoice(self.team.id, nil, invoice_id).deliver
+    NotifierMailer.invoice(team_id, nil, invoice_id).deliver
   end
 
   def send_invoice_for(time = Time.now)
-    NotifierMailer.invoice(self.team.id, time.to_i).deliver
+    NotifierMailer.invoice(team_id, time.to_i).deliver
   end
 
   def invoice_for(time)
