From 0865b39c388a4f064f4b09975e8de1d17af3e472 Mon Sep 17 00:00:00 2001 From: James Mason Date: Mon, 12 Mar 2018 18:24:09 -0700 Subject: [PATCH 1/2] Add timestamps to tickets Resolves #1997 --- .../20180313012253_add_timestamps_to_tickets.rb | 12 ++++++++++++ db/schema.rb | 16 +++++++++------- 2 files changed, 21 insertions(+), 7 deletions(-) create mode 100644 db/migrate/20180313012253_add_timestamps_to_tickets.rb diff --git a/db/migrate/20180313012253_add_timestamps_to_tickets.rb b/db/migrate/20180313012253_add_timestamps_to_tickets.rb new file mode 100644 index 00000000..85e8407e --- /dev/null +++ b/db/migrate/20180313012253_add_timestamps_to_tickets.rb @@ -0,0 +1,12 @@ +class AddTimestampsToTickets < ActiveRecord::Migration[5.0] + def up + add_column :tickets, :created_at, :datetime + add_column :tickets, :updated_at, :datetime + EventType.update_all(created_at: Time.now, updated_at: Time.now) + end + + def down + remove_column :tickets, :created_at + remove_column :tickets, :updated_at + end +end diff --git a/db/schema.rb b/db/schema.rb index 48815a8a..6e9daa7a 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20171201163628) do +ActiveRecord::Schema.define(version: 20180313012253) do create_table "ahoy_events", force: :cascade do |t| t.integer "visit_id" @@ -506,12 +506,14 @@ ActiveRecord::Schema.define(version: 20171201163628) do end create_table "tickets", force: :cascade do |t| - t.integer "conference_id" - t.string "title", null: false - 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 + t.integer "conference_id" + t.string "title", null: false + 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 + t.datetime "created_at" + t.datetime "updated_at" end create_table "tracks", force: :cascade do |t| From cb7960fc3ffc9cbbc3c933ab6bdd90912240abba Mon Sep 17 00:00:00 2001 From: James Mason Date: Tue, 13 Mar 2018 14:29:32 -0700 Subject: [PATCH 2/2] Prevent error when parsing empty params hash Fixes #1999 --- app/controllers/ticket_purchases_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/ticket_purchases_controller.rb b/app/controllers/ticket_purchases_controller.rb index dbf4755e..4221fb4e 100644 --- a/app/controllers/ticket_purchases_controller.rb +++ b/app/controllers/ticket_purchases_controller.rb @@ -6,7 +6,7 @@ class TicketPurchasesController < ApplicationController def create current_user.ticket_purchases.by_conference(@conference).unpaid.destroy_all - message = TicketPurchase.purchase(@conference, current_user, params[:tickets][0]) + message = TicketPurchase.purchase(@conference, current_user, params[:tickets].try(:first)) if message.blank? if current_user.ticket_purchases.by_conference(@conference).unpaid.any? redirect_to new_conference_payment_path,