Merge 4d4736f042 into 424b1302cb

db/schema.rb

@@ -250,6 +250,18 @@ ActiveRecord::Schema.define(version: 20160624151257) do
     t.datetime "updated_at"
   end
 
+  create_table "payments", force: :cascade do |t|
+    t.string   "full_name",                      null: false
+    t.string   "last4"
+    t.integer  "amount",                         null: false
+    t.string   "authorization_code"
+    t.integer  "status",             default: 0, null: false
+    t.integer  "user_id",                        null: false
+    t.integer  "conference_id",                  null: false
+    t.datetime "created_at",                     null: false
+    t.datetime "updated_at",                     null: false
+  end
+
   create_table "programs", force: :cascade do |t|
     t.integer  "conference_id"
     t.integer  "rating",            default: 0
@@ -399,6 +411,7 @@ ActiveRecord::Schema.define(version: 20160624151257) do
     t.datetime "created_at"
     t.integer  "quantity",      default: 1
     t.integer  "user_id"
+    t.integer  "payment_id"
   end
 
   create_table "tickets", force: :cascade do |t|