diff --git a/app/controllers/campaigns_controller.rb b/app/controllers/campaigns_controller.rb index 162e12ab..3ae499ae 100644 --- a/app/controllers/campaigns_controller.rb +++ b/app/controllers/campaigns_controller.rb @@ -219,7 +219,7 @@ def check_published end def check_exp - if @campaign.expired? + if @campaign.expired? && !@campaign.accept_closed_project_payment? redirect_to campaign_home_url(@campaign), :flash => { :error => "Campaign is expired!" } end end diff --git a/app/models/campaign.rb b/app/models/campaign.rb index e9c3e13b..71bc2877 100644 --- a/app/models/campaign.rb +++ b/app/models/campaign.rb @@ -15,7 +15,7 @@ class Campaign < ActiveRecord::Base :stats_number_of_contributions, :stats_raised_amount, :stats_tilt_percent, :stats_unique_contributors, :published_flag, :collect_shipping_flag, :production_flag, :include_rewards, :reward_reference, :collect_additional_info, :additional_info_label, - :include_comments, :comments_shortname, :include_rewards_claimed + :include_comments, :comments_shortname, :include_rewards_claimed, :accept_closed_project_payment attr_accessor :main_image_delete, :video_placeholder_delete, :facebook_image_delete diff --git a/app/views/admin/campaigns/_form.html.erb b/app/views/admin/campaigns/_form.html.erb index e46517a4..fc7796c9 100644 --- a/app/views/admin/campaigns/_form.html.erb +++ b/app/views/admin/campaigns/_form.html.erb @@ -355,7 +355,11 @@ <% end %> - +
Accept payments after campaign has tilted and expired
+ + <%= f.check_box :accept_closed_project_payment %> +