Skip to content

Commit

Permalink
Merge pull request armandofox#111 from cs169/187386170_remove_quick_d…
Browse files Browse the repository at this point in the history
…onation_banner_and_explanation

[Finishes #187386170] Remove quick donation banner and explanation fields
  • Loading branch information
armandofox authored Apr 17, 2024
2 parents 5535e67 + d180621 commit 8f39d59
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 45 deletions.
2 changes: 0 additions & 2 deletions app/views/options/index.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@
default_retail_account_code |
default_donation_account_code |
default_donation_account_code_with_subscriptions |
quick_donation_banner |
quick_donation_explanation |
quick_donation_redirect |
donation_ack_from |
) |
Expand Down
11 changes: 0 additions & 11 deletions config/locales/en.option_descriptions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,17 +107,6 @@ en:
Auto-generated confirmation emails for online donations will appear to be
signed by this person. Example: "Bob Jones, Development Chair"
quick_donation_banner: >
The banner text that appears at the top of the "donate instantly"
(donate by credit card without logging in) page.
quick_donation_explanation: >
Explanatory text that appears on the "donate instantly" page. Basic
HTML is allowed. For example, you could direct patrons who wish to
donate by check to download a form or call the development office.
quick_donation_redirect: >
If not blank, the absolute URL to which the patron is redirected after
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
class RemoveQuickDonationFieldsFromOptions < ActiveRecord::Migration
def change
end
end
61 changes: 29 additions & 32 deletions db/schema.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.

ActiveRecord::Schema.define(version: 20240225093946) do

# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
ActiveRecord::Schema.define(version: 20240417020007) do

create_table "account_codes", force: :cascade do |t|
t.string "name", limit: 255, default: "", null: false
Expand Down Expand Up @@ -68,14 +65,14 @@
t.integer "ticket_sales_import_id"
end

add_index "customers", ["ticket_sales_import_id"], name: "index_customers_on_ticket_sales_import_id", using: :btree
add_index "customers", ["ticket_sales_import_id"], name: "index_customers_on_ticket_sales_import_id"

create_table "customers_labels", id: false, force: :cascade do |t|
t.integer "customer_id"
t.integer "label_id"
end

add_index "customers_labels", ["customer_id", "label_id"], name: "index_customers_labels_on_customer_id_and_label_id", unique: true, using: :btree
add_index "customers_labels", ["customer_id", "label_id"], name: "index_customers_labels_on_customer_id_and_label_id", unique: true

create_table "items", force: :cascade do |t|
t.integer "vouchertype_id", default: 0, null: false
Expand All @@ -99,15 +96,15 @@
t.datetime "sold_on"
end

add_index "items", ["account_code_id"], name: "index_items_on_account_code_id", using: :btree
add_index "items", ["bundle_id"], name: "index_items_on_bundle_id", using: :btree
add_index "items", ["customer_id"], name: "index_items_on_customer_id", using: :btree
add_index "items", ["finalized"], name: "index_items_on_finalized", using: :btree
add_index "items", ["order_id"], name: "index_items_on_order_id", using: :btree
add_index "items", ["processed_by_id"], name: "index_items_on_processed_by_id", using: :btree
add_index "items", ["seat"], name: "index_items_on_seat", using: :btree
add_index "items", ["showdate_id"], name: "index_items_on_showdate_id", using: :btree
add_index "items", ["vouchertype_id"], name: "index_items_on_vouchertype_id", using: :btree
add_index "items", ["account_code_id"], name: "index_items_on_account_code_id"
add_index "items", ["bundle_id"], name: "index_items_on_bundle_id"
add_index "items", ["customer_id"], name: "index_items_on_customer_id"
add_index "items", ["finalized"], name: "index_items_on_finalized"
add_index "items", ["order_id"], name: "index_items_on_order_id"
add_index "items", ["processed_by_id"], name: "index_items_on_processed_by_id"
add_index "items", ["seat"], name: "index_items_on_seat"
add_index "items", ["showdate_id"], name: "index_items_on_showdate_id"
add_index "items", ["vouchertype_id"], name: "index_items_on_vouchertype_id"

create_table "labels", force: :cascade do |t|
t.string "name", limit: 255
Expand Down Expand Up @@ -225,11 +222,11 @@
t.text "from_import"
end

add_index "orders", ["customer_id"], name: "index_orders_on_customer_id", using: :btree
add_index "orders", ["external_key"], name: "index_orders_on_external_key", using: :btree
add_index "orders", ["processed_by_id"], name: "index_orders_on_processed_by_id", using: :btree
add_index "orders", ["purchaser_id"], name: "index_orders_on_purchaser_id", using: :btree
add_index "orders", ["ticket_sales_import_id"], name: "index_orders_on_ticket_sales_import_id", using: :btree
add_index "orders", ["customer_id"], name: "index_orders_on_customer_id"
add_index "orders", ["external_key"], name: "index_orders_on_external_key"
add_index "orders", ["processed_by_id"], name: "index_orders_on_processed_by_id"
add_index "orders", ["purchaser_id"], name: "index_orders_on_purchaser_id"
add_index "orders", ["ticket_sales_import_id"], name: "index_orders_on_ticket_sales_import_id"

create_table "seating_zones", force: :cascade do |t|
t.string "name"
Expand Down Expand Up @@ -264,8 +261,8 @@
t.string "house_seats", limit: 8192
end

add_index "showdates", ["seatmap_id"], name: "index_showdates_on_seatmap_id", using: :btree
add_index "showdates", ["show_id"], name: "index_showdates_on_show_id", using: :btree
add_index "showdates", ["seatmap_id"], name: "index_showdates_on_seatmap_id"
add_index "showdates", ["show_id"], name: "index_showdates_on_show_id"

create_table "shows", force: :cascade do |t|
t.string "name", limit: 255
Expand Down Expand Up @@ -295,7 +292,7 @@
t.datetime "created_at"
end

add_index "ticket_sales_imports", ["processed_by_id"], name: "index_ticket_sales_imports_on_processed_by_id", using: :btree
add_index "ticket_sales_imports", ["processed_by_id"], name: "index_ticket_sales_imports_on_processed_by_id"

create_table "txns", force: :cascade do |t|
t.integer "customer_id", default: 1, null: false
Expand All @@ -311,12 +308,12 @@
t.string "txn_type", limit: 255
end

add_index "txns", ["customer_id"], name: "index_txns_on_customer_id", using: :btree
add_index "txns", ["entered_by_id"], name: "index_txns_on_entered_by_id", using: :btree
add_index "txns", ["order_id"], name: "index_txns_on_order_id", using: :btree
add_index "txns", ["show_id"], name: "index_txns_on_show_id", using: :btree
add_index "txns", ["showdate_id"], name: "index_txns_on_showdate_id", using: :btree
add_index "txns", ["voucher_id"], name: "index_txns_on_voucher_id", using: :btree
add_index "txns", ["customer_id"], name: "index_txns_on_customer_id"
add_index "txns", ["entered_by_id"], name: "index_txns_on_entered_by_id"
add_index "txns", ["order_id"], name: "index_txns_on_order_id"
add_index "txns", ["show_id"], name: "index_txns_on_show_id"
add_index "txns", ["showdate_id"], name: "index_txns_on_showdate_id"
add_index "txns", ["voucher_id"], name: "index_txns_on_voucher_id"

create_table "valid_vouchers", force: :cascade do |t|
t.integer "showdate_id"
Expand All @@ -331,8 +328,8 @@
t.integer "max_sales_per_txn", default: 100000
end

add_index "valid_vouchers", ["showdate_id"], name: "index_valid_vouchers_on_showdate_id", using: :btree
add_index "valid_vouchers", ["vouchertype_id"], name: "index_valid_vouchers_on_vouchertype_id", using: :btree
add_index "valid_vouchers", ["showdate_id"], name: "index_valid_vouchers_on_showdate_id"
add_index "valid_vouchers", ["vouchertype_id"], name: "index_valid_vouchers_on_vouchertype_id"

create_table "vouchertypes", force: :cascade do |t|
t.string "name", limit: 255
Expand All @@ -352,6 +349,6 @@
t.integer "seating_zone_id"
end

add_index "vouchertypes", ["account_code_id"], name: "index_vouchertypes_on_account_code_id", using: :btree
add_index "vouchertypes", ["account_code_id"], name: "index_vouchertypes_on_account_code_id"

end

0 comments on commit 8f39d59

Please sign in to comment.