diff --git a/app/controllers/leagues_controller.rb b/app/controllers/leagues_controller.rb index ead56ee..c5b9a2f 100644 --- a/app/controllers/leagues_controller.rb +++ b/app/controllers/leagues_controller.rb @@ -942,7 +942,7 @@ def league_params :description, {commissioner_ids: []}, :male_limit, :female_limit, :max_grank_age, :allow_pairs, :covid_vax_required, :track_spirit_scores, :display_spirit_scores, :self_rank_type, :eos_tourney, :mst_tourney, :eos_champion_id, :mst_champion_id, {core_options: [:type, :male_limit, :female_limit, :rank_limit, :male_rank_constant, :female_rank_constant]}, - :solicit_donations, :donation_earmark + :solicit_donations, :donation_earmark, :donation_pitch ] if permitted_to? :assign_comps, self diff --git a/app/views/registrations/_form.html.haml b/app/views/registrations/_form.html.haml index e7033bb..6ca78d4 100644 --- a/app/views/registrations/_form.html.haml +++ b/app/views/registrations/_form.html.haml @@ -34,7 +34,7 @@ = f.check_box :waiver_accepted, value: 1, label: raw('I have read, understand, and accept the
AFDC\'s liability waiver and refund policy.') - if @registration.errors[:waiver_accepted].any? = f.alert_message @registration.errors[:waiver_accepted].first - - if @registration.new_record? + - if @registration.status == 'registering' || @registration.status == 'registering_waitlisted' = f.submit "Register", disable_with: 'Registering...', class: "btn btn-primary" - else = f.submit "Update", disable_with: 'Updating...', class: "btn btn-primary" diff --git a/app/views/registrations/pay.html.erb b/app/views/registrations/pay.html.erb index 415a949..55f5c7d 100644 --- a/app/views/registrations/pay.html.erb +++ b/app/views/registrations/pay.html.erb @@ -27,7 +27,10 @@ <% if donation %>
-
Tax-deductible Donation
+
+ Tax-deductible Donation + NON-REFUNDABLE +
<%= number_to_currency donation.amount %>
<%= hidden_field_tag 'donation_amount', donation.amount %>