<%= t(".fiscal_year_start_hint") %>
+ <% end %>Please note, we are still working on translations for various languages.
<% end %> <% end %> diff --git a/config/locales/views/settings/en.yml b/config/locales/views/settings/en.yml index 79e7c69d3..61d521519 100644 --- a/config/locales/views/settings/en.yml +++ b/config/locales/views/settings/en.yml @@ -58,6 +58,9 @@ en: month_start_day: Budget month starts on month_start_day_hint: Set when your budget month starts (e.g., payday) month_start_day_warning: Your budgets and MTD calculations will use this custom start day instead of the 1st of each month. + fiscal_year_start_month: Financial year starts in + fiscal_year_start_day: Financial year starts on + fiscal_year_start_hint: Set the start of your financial year for FYTD calculations (e.g., March 1 for a March - February fiscal year) currencies_title: "%{moniker} Currencies" currencies_subtitle: Choose which currencies appear in money fields for your %{moniker} base_currency_label: Base currency diff --git a/db/migrate/20260421000000_add_fiscal_year_start_to_families.rb b/db/migrate/20260421000000_add_fiscal_year_start_to_families.rb new file mode 100644 index 000000000..1153f2f7b --- /dev/null +++ b/db/migrate/20260421000000_add_fiscal_year_start_to_families.rb @@ -0,0 +1,14 @@ +class AddFiscalYearStartToFamilies < ActiveRecord::Migration[7.2] + def change + add_column :families, :fiscal_year_start_month, :integer, default: 1, null: false + add_column :families, :fiscal_year_start_day, :integer, default: 1, null: false + + add_check_constraint :families, + "fiscal_year_start_month >= 1 AND fiscal_year_start_month <= 12", + name: "fiscal_year_start_month_range" + + add_check_constraint :families, + "fiscal_year_start_day >= 1 AND fiscal_year_start_day <= 28", + name: "fiscal_year_start_day_range" + end +end diff --git a/db/schema.rb b/db/schema.rb index 1c7ecd693..7e5d8fad0 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[7.2].define(version: 2026_04_12_120000) do +ActiveRecord::Schema[7.2].define(version: 2026_04_21_000000) do # These are extensions that must be enabled in order to support this database enable_extension "pgcrypto" enable_extension "plpgsql" @@ -595,7 +595,11 @@ t.string "assistant_type", default: "builtin", null: false t.string "default_account_sharing", default: "shared", null: false t.string "enabled_currencies", array: true + t.integer "fiscal_year_start_month", default: 1, null: false + t.integer "fiscal_year_start_day", default: 1, null: false t.check_constraint "default_account_sharing::text = ANY (ARRAY['shared'::character varying::text, 'private'::character varying::text])", name: "chk_families_default_account_sharing" + t.check_constraint "fiscal_year_start_day >= 1 AND fiscal_year_start_day <= 28", name: "fiscal_year_start_day_range" + t.check_constraint "fiscal_year_start_month >= 1 AND fiscal_year_start_month <= 12", name: "fiscal_year_start_month_range" t.check_constraint "month_start_day >= 1 AND month_start_day <= 28", name: "month_start_day_range" end diff --git a/test/models/family/fiscal_year_test.rb b/test/models/family/fiscal_year_test.rb new file mode 100644 index 000000000..e401b12b7 --- /dev/null +++ b/test/models/family/fiscal_year_test.rb @@ -0,0 +1,83 @@ +require "test_helper" + +class Family::FiscalYearTest < ActiveSupport::TestCase + setup do + @family = families(:dylan_family) + end + + test "fiscal_year_start_month and fiscal_year_start_day default to 1" do + assert_equal 1, @family.fiscal_year_start_month + assert_equal 1, @family.fiscal_year_start_day + end + + test "validates fiscal_year_start_month is between 1 and 12" do + @family.fiscal_year_start_month = 0 + assert_not @family.valid? + + @family.fiscal_year_start_month = 13 + assert_not @family.valid? + + @family.fiscal_year_start_month = 3 + assert @family.valid? + end + + test "validates fiscal_year_start_day is between 1 and 28" do + @family.fiscal_year_start_day = 0 + assert_not @family.valid? + + @family.fiscal_year_start_day = 29 + assert_not @family.valid? + + @family.fiscal_year_start_day = 1 + assert @family.valid? + end + + test "uses_fiscal_year? returns false when start is January 1" do + @family.fiscal_year_start_month = 1 + @family.fiscal_year_start_day = 1 + assert_not @family.uses_fiscal_year? + end + + test "uses_fiscal_year? returns true when start month is not January" do + @family.fiscal_year_start_month = 3 + assert @family.uses_fiscal_year? + end + + test "uses_fiscal_year? returns true when start day is not 1" do + @family.fiscal_year_start_day = 15 + assert @family.uses_fiscal_year? + end + + test "current_fiscal_year_start returns this year's start when today is on or after it" do + @family.fiscal_year_start_month = 3 + @family.fiscal_year_start_day = 1 + + travel_to Date.new(2026, 4, 21) do + assert_equal Date.new(2026, 3, 1), @family.current_fiscal_year_start + end + end + + test "current_fiscal_year_start returns this year's start on the exact boundary date" do + @family.fiscal_year_start_month = 3 + @family.fiscal_year_start_day = 1 + + travel_to Date.new(2026, 3, 1) do + assert_equal Date.new(2026, 3, 1), @family.current_fiscal_year_start + end + end + + test "current_fiscal_year_start rolls back one year when today is before the start" do + @family.fiscal_year_start_month = 7 + @family.fiscal_year_start_day = 1 + + travel_to Date.new(2026, 4, 21) do + assert_equal Date.new(2025, 7, 1), @family.current_fiscal_year_start + end + end + + test "current_fiscal_year_start returns Jan 1 of current year for default settings" do + travel_to Date.new(2026, 4, 21) do + assert_equal Date.new(2026, 1, 1), @family.current_fiscal_year_start + end + end +end diff --git a/test/models/period_test.rb b/test/models/period_test.rb index fa1221eb9..1e7e4797d 100644 --- a/test/models/period_test.rb +++ b/test/models/period_test.rb @@ -81,4 +81,36 @@ class PeriodTest < ActiveSupport::TestCase assert_equal 5.years.ago.to_date, period.start_date assert_equal Date.current, period.end_date end + + test "fiscal_year_to_date has correct labels" do + mock_family = mock("family") + mock_family.expects(:current_fiscal_year_start).returns(Date.current.beginning_of_year) + Current.expects(:family).at_least_once.returns(mock_family) + + period = Period.from_key("fiscal_year_to_date") + assert_equal "Financial Year", period.label + assert_equal "FYTD", period.label_short + end + + test "fiscal_year_to_date uses family's fiscal year start" do + mock_family = mock("family") + mock_family.expects(:current_fiscal_year_start).returns(Date.new(2026, 3, 1)) + Current.expects(:family).at_least_once.returns(mock_family) + + travel_to Date.new(2026, 4, 21) do + period = Period.from_key("fiscal_year_to_date") + assert_equal Date.new(2026, 3, 1), period.start_date + assert_equal Date.current, period.end_date + end + end + + test "fiscal_year_to_date falls back to beginning of year when no family" do + Current.expects(:family).returns(nil) + + travel_to Date.new(2026, 4, 21) do + period = Period.from_key("fiscal_year_to_date") + assert_equal Date.new(2026, 1, 1), period.start_date + assert_equal Date.current, period.end_date + end + end end