<%= alert %>
- <% end %> <%= yield %>diff --git a/app/models/campaign.rb b/app/models/campaign.rb index b446d829..e9c3e13b 100644 --- a/app/models/campaign.rb +++ b/app/models/campaign.rb @@ -112,7 +112,7 @@ def expiration_date_cannot_be_in_the_past end def payments_can_be_activated - if self.production_flag && !Settings.find_by_id(1).payments_activated? + if self.production_flag && !Settings.first.payments_activated? errors.add(:base, "cannot activate payments") end end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 756f19aa..52dd19a1 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -20,13 +20,10 @@ <%= render 'layouts/social_js' %> <%= render 'layouts/navbar' %> <%= render 'theme/views/header' %> - <% flash.to_hash().slice(:success, :info, :notice, :error).each do |key, value| %> + <% flash.to_hash().slice(:success, :info, :notice, :error, :alert).each do |key, value| %> <% if !value.blank? %>
<%= alert %>
- <% end %> <%= yield %>