diff --git a/app/controllers/admin/conference_controller.rb b/app/controllers/admin/conference_controller.rb index 232d0eec..78602847 100644 --- a/app/controllers/admin/conference_controller.rb +++ b/app/controllers/admin/conference_controller.rb @@ -186,7 +186,7 @@ module Admin :vpositions_attributes, :use_volunteers, :color, :sponsorship_levels_attributes, :sponsors_attributes, :targets, :targets_attributes, - :campaigns, :campaigns_attributes, :registration_limit) + :campaigns, :campaigns_attributes, :registration_limit, :payment_method) end end end diff --git a/app/views/admin/conference/edit.html.haml b/app/views/admin/conference/edit.html.haml index dfc6d72a..ab1ba08f 100644 --- a/app/views/admin/conference/edit.html.haml +++ b/app/views/admin/conference/edit.html.haml @@ -23,4 +23,13 @@ = f.input :end_date, :as => :string, :input_html => { :id => "conference-end-datepicker", :readonly => "readonly" } = f.inputs name: "Registrations" do = f.input :registration_limit, as: :number, in: 0..9999, hint: "Limit the number of registrations to the conference (0 no limit)" + = f.inputs name: "Tickets" do + = f.label :payment_method + .btn-group{"data-toggle" => :payment_method, class: "pull-right"} + %label.btn.btn-default + = f.radio_button :payment_method, 'online' + Pay Online + %label.btn.btn-default + = f.radio_button :payment_method, 'offline' + Pay at the venue = f.action :submit, :as => :button, :button_html => {:class => "btn btn-primary"} diff --git a/app/views/admin/conference/new.html.haml b/app/views/admin/conference/new.html.haml index 0b397d4f..b2d005aa 100644 --- a/app/views/admin/conference/new.html.haml +++ b/app/views/admin/conference/new.html.haml @@ -10,5 +10,14 @@ = f.input :timezone, as: :time_zone, hint: 'Please select in what time zone your conference will take place.' = f.input :start_date, as: :string, input_html: { id: 'conference-start-datepicker', required: 'required' } = f.input :end_date, as: :string, input_html: { id: 'conference-end-datepicker', required: 'required' } + = f.inputs name: "Tickets" do + = f.label :payment_method + .btn-group{"data-toggle" => :payment_method, class: "pull-right"} + %label.btn.btn-default + = f.radio_button :payment_method, 'online' + Pay Online + %label.btn.btn-default + = f.radio_button :payment_method, 'offline' + Pay at the venue = f.actions do = f.action :submit, button_html: {class: 'btn btn-success pull-right'}