diff --git a/app/models/event.rb b/app/models/event.rb index 686c6aa8..c780afb9 100644 --- a/app/models/event.rb +++ b/app/models/event.rb @@ -7,6 +7,7 @@ # id :bigint not null, primary key # abstract :text # comments_count :integer default(0), not null +# committee_review :text # description :text # guid :string not null # is_highlight :boolean default(FALSE) diff --git a/app/serializers/event_serializer.rb b/app/serializers/event_serializer.rb index 8c30b1a1..9bf196f2 100644 --- a/app/serializers/event_serializer.rb +++ b/app/serializers/event_serializer.rb @@ -7,6 +7,7 @@ # id :bigint not null, primary key # abstract :text # comments_count :integer default(0), not null +# committee_review :text # description :text # guid :string not null # is_highlight :boolean default(FALSE) diff --git a/app/views/payments/new.html.haml b/app/views/payments/new.html.haml index 0401f785..5fb517b5 100644 --- a/app/views/payments/new.html.haml +++ b/app/views/payments/new.html.haml @@ -2,12 +2,18 @@ .row .col-xs-6.col-xs-offset-3 %h1 - Payment Summary : + Payment Summary : = humanized_money_with_symbol @total_amount_to_pay .col-xs-8.col-xs-offset-2.well = render partial: 'payment' .row .col-md-13 + %p.text-center + %strong + If you do not have a credit card, please reach out to use at + = mail_to(@conference.contact.email) + %hr + %p.text-muted.text-center %small All payments are handled securely by our payment processor, diff --git a/db/schema.rb b/db/schema.rb index 5a6741e0..02095546 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -258,6 +258,7 @@ ActiveRecord::Schema.define(version: 2021_04_01_050437) do t.integer "program_id" t.integer "max_attendees" t.integer "comments_count", default: 0, null: false + t.text "committee_review" t.text "submission_text" end @@ -268,6 +269,13 @@ ActiveRecord::Schema.define(version: 2021_04_01_050437) do t.datetime "created_at" end + create_table "events_users", id: false, force: :cascade do |t| + t.bigint "event_id" + t.bigint "user_id" + t.index ["event_id"], name: "index_events_users_on_event_id" + t.index ["user_id"], name: "index_events_users_on_user_id" + end + create_table "lodgings", force: :cascade do |t| t.string "name" t.text "description" diff --git a/spec/factories/events.rb b/spec/factories/events.rb index c8360449..2f68c311 100644 --- a/spec/factories/events.rb +++ b/spec/factories/events.rb @@ -7,6 +7,7 @@ # id :bigint not null, primary key # abstract :text # comments_count :integer default(0), not null +# committee_review :text # description :text # guid :string not null # is_highlight :boolean default(FALSE) diff --git a/spec/models/event_spec.rb b/spec/models/event_spec.rb index 1ed2ac9e..5c6f8f6a 100644 --- a/spec/models/event_spec.rb +++ b/spec/models/event_spec.rb @@ -7,6 +7,7 @@ # id :bigint not null, primary key # abstract :text # comments_count :integer default(0), not null +# committee_review :text # description :text # guid :string not null # is_highlight :boolean default(FALSE) diff --git a/spec/serializers/event_serializer_spec.rb b/spec/serializers/event_serializer_spec.rb index 506134cf..3ad68cad 100644 --- a/spec/serializers/event_serializer_spec.rb +++ b/spec/serializers/event_serializer_spec.rb @@ -7,6 +7,7 @@ # id :bigint not null, primary key # abstract :text # comments_count :integer default(0), not null +# committee_review :text # description :text # guid :string not null # is_highlight :boolean default(FALSE)