From cef25ed23bde9f7df645c5b1f0b6192b422f1245 Mon Sep 17 00:00:00 2001 From: Armando Fox Date: Mon, 4 Dec 2023 20:37:17 -0800 Subject: [PATCH] fix formatting errors in min/max explanations --- app/models/valid_voucher.rb | 6 +++--- .../20231205042317_adjust_default_max_sales_per_txn.rb | 5 +++++ db/schema.rb | 10 +++++----- 3 files changed, 13 insertions(+), 8 deletions(-) create mode 100644 db/migrate/20231205042317_adjust_default_max_sales_per_txn.rb diff --git a/app/models/valid_voucher.rb b/app/models/valid_voucher.rb index 8fbe06f74..f7082d1e6 100644 --- a/app/models/valid_voucher.rb +++ b/app/models/valid_voucher.rb @@ -194,13 +194,13 @@ def adjust_for_advance_reservations def adjust_for_capacity self.max_sales_for_this_patron = seats_of_type_remaining() + min_max = display_min_and_max_sales_per_txn self.explanation = case max_sales_for_this_patron when 0 then "No seats remaining for tickets of this type" - when INFINITE then "No performance-specific limit applies" - else "#{max_sales_for_this_patron} remaining" + when INFINITE then "No performance-specific limit applies #{min_max}".strip + else "#{max_sales_for_this_patron} remaining #{min_max}".strip end - self.explanation << " " << display_min_and_max_sales_per_txn self.visible = true end diff --git a/db/migrate/20231205042317_adjust_default_max_sales_per_txn.rb b/db/migrate/20231205042317_adjust_default_max_sales_per_txn.rb new file mode 100644 index 000000000..60abd6d50 --- /dev/null +++ b/db/migrate/20231205042317_adjust_default_max_sales_per_txn.rb @@ -0,0 +1,5 @@ +class AdjustDefaultMaxSalesPerTxn < ActiveRecord::Migration + def change + change_column :valid_vouchers, :max_sales_per_txn, :integer, :default => ValidVoucher::INFINITE, :allow_nil => false + end +end diff --git a/db/schema.rb b/db/schema.rb index dc62535de..3d9bc10b4 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: 20230925030503) do +ActiveRecord::Schema.define(version: 20231205042317) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -319,11 +319,11 @@ t.string "promo_code", limit: 1023 t.datetime "start_sales" t.datetime "end_sales" - t.integer "max_sales_for_type" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "max_sales_for_type", default: 100000 + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.integer "min_sales_per_txn", default: 1 - t.integer "max_sales_per_txn", default: 999 + t.integer "max_sales_per_txn", default: 100000 end add_index "valid_vouchers", ["showdate_id"], name: "index_valid_vouchers_on_showdate_id", using: :btree