From fbd4be3503131022fb3d037576239a8f3c64d954 Mon Sep 17 00:00:00 2001 From: siddhantbajaj Date: Mon, 10 Jul 2017 17:45:05 +0530 Subject: [PATCH 1/3] Ticket show page --- app/views/physical_ticket/show.html.haml | 51 ++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/app/views/physical_ticket/show.html.haml b/app/views/physical_ticket/show.html.haml index e69de29b..19b89473 100644 --- a/app/views/physical_ticket/show.html.haml +++ b/app/views/physical_ticket/show.html.haml @@ -0,0 +1,51 @@ +.container + .row + .col-md-12 + .page-header + %h1 + Ticket for + = @conference.title + %p.text-muted + - if @conference.venue + at + %strong + #{@conference.venue.name}, + #{@conference.venue.street}, + #{@conference.venue.city} / #{@conference.venue.country_name}. + %small + = date_string(@conference.start_date, @conference.end_date) + .row + .col-md-6 + - if @conference.picture? + = image_tag(@conference.picture_url, class: 'img-responsive') + - else + = image_tag('/img/osem-logo.png', class: 'img-responsive') + .col-md-6 + %address + %strong + Ticket Type + %br + = @physical_ticket.ticket.title + %br + %strong + Ticket REF. + %br + = @physical_ticket.ticket_purchase.id + %br + %strong + Organization + %br + = @conference.organization.name + %br + %strong + Transaction Date + %br + = @physical_ticket.created_at.strftime('%B %d, %Y') + .row + .col-md-12 + %p.text-right + = link_to 'Generate PDF', + conference_physical_ticket_path(@conference.short_title, + @physical_ticket.id, + format: :pdf), + class: 'button btn btn-default btn-info' From c066aadae2138961952a1495d2afa7953ef2e539 Mon Sep 17 00:00:00 2001 From: siddhantbajaj Date: Tue, 11 Jul 2017 17:05:07 +0530 Subject: [PATCH 2/3] Added TicketScanning Model --- app/models/physical_ticket.rb | 1 + app/models/ticket_scanning.rb | 3 +++ db/migrate/20170711102511_create_ticket_scannings.rb | 9 +++++++++ db/schema.rb | 8 +++++++- 4 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 app/models/ticket_scanning.rb create mode 100644 db/migrate/20170711102511_create_ticket_scannings.rb diff --git a/app/models/physical_ticket.rb b/app/models/physical_ticket.rb index a0874a6e..6142c875 100644 --- a/app/models/physical_ticket.rb +++ b/app/models/physical_ticket.rb @@ -3,4 +3,5 @@ class PhysicalTicket < ActiveRecord::Base has_one :ticket, through: :ticket_purchase has_one :conference, through: :ticket_purchase has_one :user, through: :ticket_purchase + has_many :ticket_scannings end diff --git a/app/models/ticket_scanning.rb b/app/models/ticket_scanning.rb new file mode 100644 index 00000000..6ce9d00c --- /dev/null +++ b/app/models/ticket_scanning.rb @@ -0,0 +1,3 @@ +class TicketScanning < ActiveRecord::Base + belongs_to :physical_ticket +end diff --git a/db/migrate/20170711102511_create_ticket_scannings.rb b/db/migrate/20170711102511_create_ticket_scannings.rb new file mode 100644 index 00000000..d1879f68 --- /dev/null +++ b/db/migrate/20170711102511_create_ticket_scannings.rb @@ -0,0 +1,9 @@ +class CreateTicketScannings < ActiveRecord::Migration + def change + create_table :ticket_scannings do |t| + t.integer :physical_ticket_id, null: false + + t.timestamps null: false + end + end +end diff --git a/db/schema.rb b/db/schema.rb index af227946..b9f8e3f4 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20170629232817) do +ActiveRecord::Schema.define(version: 20170711102511) do create_table "ahoy_events", force: :cascade do |t| t.uuid "visit_id", limit: 16 @@ -468,6 +468,12 @@ ActiveRecord::Schema.define(version: 20170629232817) do t.integer "week" end + create_table "ticket_scannings", force: :cascade do |t| + t.integer "physical_ticket_id", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + create_table "tickets", force: :cascade do |t| t.integer "conference_id" t.string "title", null: false From 43b4204e308ffa7ffafd808d4d8a391214ae3cd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mois=C3=A9s=20D=C3=A9niz=20Alem=C3=A1n?= Date: Wed, 12 Jul 2017 10:33:16 +0200 Subject: [PATCH 3/3] Revert "Ticket show page" --- app/views/physical_ticket/show.html.haml | 51 ------------------------ 1 file changed, 51 deletions(-) diff --git a/app/views/physical_ticket/show.html.haml b/app/views/physical_ticket/show.html.haml index 19b89473..e69de29b 100644 --- a/app/views/physical_ticket/show.html.haml +++ b/app/views/physical_ticket/show.html.haml @@ -1,51 +0,0 @@ -.container - .row - .col-md-12 - .page-header - %h1 - Ticket for - = @conference.title - %p.text-muted - - if @conference.venue - at - %strong - #{@conference.venue.name}, - #{@conference.venue.street}, - #{@conference.venue.city} / #{@conference.venue.country_name}. - %small - = date_string(@conference.start_date, @conference.end_date) - .row - .col-md-6 - - if @conference.picture? - = image_tag(@conference.picture_url, class: 'img-responsive') - - else - = image_tag('/img/osem-logo.png', class: 'img-responsive') - .col-md-6 - %address - %strong - Ticket Type - %br - = @physical_ticket.ticket.title - %br - %strong - Ticket REF. - %br - = @physical_ticket.ticket_purchase.id - %br - %strong - Organization - %br - = @conference.organization.name - %br - %strong - Transaction Date - %br - = @physical_ticket.created_at.strftime('%B %d, %Y') - .row - .col-md-12 - %p.text-right - = link_to 'Generate PDF', - conference_physical_ticket_path(@conference.short_title, - @physical_ticket.id, - format: :pdf), - class: 'button btn btn-default btn-info'