Browse Source

Fixed two bugs that were introduced when we changed the conference registration process to accommodate virtual conferences.

master
April Wick 5 days ago
parent
commit
52c3d0c7a0
  1. 2
      app/controllers/conferences_controller.rb
  2. 2
      app/views/registration_steps/_payment_form.html.haml

2
app/controllers/conferences_controller.rb

@ -27,7 +27,7 @@ module RegistrationSteps
:review :review
] ]
available = all_southpole_steps.select { |step| send("#{step}_available?", registration) } available = all_southpole_steps.select { |step| send("#{step}_available?", registration) }
else+ available = RegistrationSteps.all_registration_steps.select { |step| send("#{step}_available?", registration) } else available = RegistrationSteps.all_registration_steps.select { |step| send("#{step}_available?", registration) }
end end
return available return available
end end

2
app/views/registration_steps/_payment_form.html.haml

@ -10,7 +10,7 @@
- unless @currencies.present? && @currencies.length > 1 - unless @currencies.present? && @currencies.length > 1
%p.center=_"articles.conference_registration.paragraphs.currency_details", :p, vars: { currency: (_"currencies.#{(@currencies || [@currency]).first}.displayName-count-other") } %p.center=_"articles.conference_registration.paragraphs.currency_details", :p, vars: { currency: (_"currencies.#{(@currencies || [@currency]).first}.displayName-count-other") }
= save_registration_step do = save_registration_step do
- if @conference.slug == "South2022" - if @this_conference.slug == "South2022"
%iframe{:src => "https://opencollective.com/embed/bikebike-everywhere/donate?email=#{current_user.email}&name=#{current_user.firstname} #{current_user.lastname}", :style => "width: 100%; min-height: 100vh;"} %iframe{:src => "https://opencollective.com/embed/bikebike-everywhere/donate?email=#{current_user.email}&name=#{current_user.firstname} #{current_user.lastname}", :style => "width: 100%; min-height: 100vh;"}
= textfield :notes, @notes, required: true = textfield :notes, @notes, required: true
- else - else

Loading…
Cancel
Save