Merge pull request #1627 from siddhantbajaj/registration-ticket

Added registration-ticket
This commit is contained in:
Ana María Martínez Gómez 2017-08-11 10:02:28 +02:00 committed by GitHub
commit 6efcd04de1
5 changed files with 12 additions and 2 deletions

View file

@ -50,7 +50,7 @@ module Admin
private
def ticket_params
params.require(:ticket).permit(:conference, :title, :url, :description, :conference_id, :price_cents, :price_currency, :price)
params.require(:ticket).permit(:conference, :title, :url, :description, :conference_id, :price_cents, :price_currency, :price, :registration_ticket)
end
end
end

View file

@ -13,5 +13,6 @@
= f.input :description, input_html: { rows: 5, data: { provide: "markdown-editable" } }
= f.input :price
= f.input :price_currency, as: :select, class: 'form-control', collection: ['USD', 'EUR', 'GBP', 'INR', 'CNY'], include_blank: false
= f.input :registration_ticket, hint: 'A registration ticket is with which user register for the conference.'
%p.text-right
= f.action :submit, as: :button, button_html: { class: 'btn btn-primary' }

View file

@ -14,6 +14,7 @@
%th Price
%th Sold
%th Turnover
%th Registration Ticket
%th Actions
%tbody
- @conference.tickets.each do |ticket|
@ -27,6 +28,8 @@
= ticket.tickets_sold
%td
= humanized_money_with_symbol ticket.tickets_turnover
%td
= ticket.registration_ticket? ? 'Yes' : 'No'
%td
.btn-group
= link_to 'Edit', edit_admin_conference_ticket_path(@conference.short_title, ticket.id),

View file

@ -0,0 +1,5 @@
class AddRegistrationTicketToTickets < ActiveRecord::Migration
def change
add_column :tickets, :registration_ticket, :boolean, default: false
end
end

View file

@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 20170721001700) do
ActiveRecord::Schema.define(version: 20170807092805) do
create_table "ahoy_events", force: :cascade do |t|
t.integer "visit_id"
@ -507,6 +507,7 @@ ActiveRecord::Schema.define(version: 20170721001700) do
t.text "description"
t.integer "price_cents", default: 0, null: false
t.string "price_currency", default: "USD", null: false
t.boolean "registration_ticket", default: false
end
create_table "tracks", force: :cascade do |t|