feat: add 4 example membership fee types to seed script

chore: update gettext
docs: document require_atomic? false in MembershipFeeType actions
2025-12-16 17:26:41 +01:00 · 2025-12-16 17:26:41 +01:00 · 2025-12-16 17:26:41 +01:00 · 2025-12-16 17:26:40 +01:00 · 2025-12-16 17:26:40 +01:00 · 2025-12-16 17:26:40 +01:00
15 changed files with 1279 additions and 630 deletions
--- a/lib/membership/setting.ex
+++ b/lib/membership/setting.ex
@ -95,6 +95,8 @@ defmodule Mv.Membership.Setting do
      description "Updates the membership fee configuration"
      require_atomic? false
      accept [:include_joining_cycle, :default_membership_fee_type_id]
      change Mv.Membership.Setting.Changes.NormalizeDefaultFeeTypeId
    end
  end
@ -141,6 +143,41 @@ defmodule Mv.Membership.Setting do
               end
             end,
             on: [:create, :update]
    # Validate default_membership_fee_type_id exists if set
    validate fn changeset, _context ->
               fee_type_id =
                 Ash.Changeset.get_attribute(changeset, :default_membership_fee_type_id)
               if fee_type_id do
                 case Ash.get(Mv.MembershipFees.MembershipFeeType, fee_type_id) do
                   {:ok, _} ->
                     :ok
                   {:error, %Ash.Error.Invalid{errors: [%Ash.Error.Query.NotFound{} | _]}} ->
                     {:error,
                      field: :default_membership_fee_type_id,
                      message: "Membership fee type not found"}
                   {:error, err} ->
                     # Log unexpected errors (DB timeout, connection errors, etc.)
                     require Logger
                     Logger.warning(
                       "Unexpected error when validating default_membership_fee_type_id: #{inspect(err)}"
                     )
                     # Return generic error to user
                     {:error,
                      field: :default_membership_fee_type_id,
                      message: "Could not validate membership fee type"}
                 end
               else
                 # Optional, can be nil
                 :ok
               end
             end,
             on: [:create, :update]
  end
  attributes do
--- a/lib/membership/setting/changes/normalize_default_fee_type_id.ex
+++ b/lib/membership/setting/changes/normalize_default_fee_type_id.ex
@ -0,0 +1,19 @@
 defmodule Mv.Membership.Setting.Changes.NormalizeDefaultFeeTypeId do
  @moduledoc """
  Ash change that normalizes empty strings to nil for default_membership_fee_type_id.
  HTML forms submit empty select values as empty strings (""), but the database
  expects nil for optional UUID fields. This change converts "" to nil.
  """
  use Ash.Resource.Change
  def change(changeset, _opts, _context) do
    default_fee_type_id = Ash.Changeset.get_attribute(changeset, :default_membership_fee_type_id)
    if default_fee_type_id == "" do
      Ash.Changeset.force_change_attribute(changeset, :default_membership_fee_type_id, nil)
    else
      changeset
    end
  end
 end
--- a/lib/membership_fees/membership_fee_type.ex
+++ b/lib/membership_fees/membership_fee_type.ex
@ -36,7 +36,7 @@ defmodule Mv.MembershipFees.MembershipFeeType do
  end
  actions do
-    defaults [:read, :destroy]
+    defaults [:read]
    create :create do
      primary? true
@ -45,10 +45,108 @@ defmodule Mv.MembershipFees.MembershipFeeType do
    update :update do
      primary? true
      # require_atomic? false because validation queries (member/cycle counts) are not atomic
      # DB constraints serve as the final safeguard if data changes between validation and update
      require_atomic? false
      # Note: interval is NOT in accept list - it's immutable after creation
      # Immutability validation will be added in a future issue
      accept [:name, :amount, :description]
    end
    destroy :destroy do
      primary? true
      # require_atomic? false because validation queries (member/cycle/settings counts) are not atomic
      # DB constraints serve as the final safeguard if data changes between validation and delete
      require_atomic? false
    end
  end
  validations do
    # Prevent interval changes after creation
    validate fn changeset, _context ->
               if Ash.Changeset.changing_attribute?(changeset, :interval) do
                 case changeset.data do
                   # Creating new resource, interval can be set
                   nil ->
                     :ok
                   _existing ->
                     {:error,
                      field: :interval, message: "Interval cannot be changed after creation"}
                 end
               else
                 :ok
               end
             end,
             on: [:update]
    # Prevent deletion if assigned to members
    validate fn changeset, _context ->
               if changeset.action_type == :destroy do
                 require Ash.Query
                 member_count =
                   Mv.Membership.Member
                   |> Ash.Query.filter(membership_fee_type_id == ^changeset.data.id)
                   |> Ash.count!()
                 if member_count > 0 do
                   {:error,
                    message:
                      "Cannot delete membership fee type: #{member_count} member(s) are assigned to it"}
                 else
                   :ok
                 end
               else
                 :ok
               end
             end,
             on: [:destroy]
    # Prevent deletion if cycles exist
    validate fn changeset, _context ->
               if changeset.action_type == :destroy do
                 require Ash.Query
                 cycle_count =
                   Mv.MembershipFees.MembershipFeeCycle
                   |> Ash.Query.filter(membership_fee_type_id == ^changeset.data.id)
                   |> Ash.count!()
                 if cycle_count > 0 do
                   {:error,
                    message:
                      "Cannot delete membership fee type: #{cycle_count} cycle(s) reference it"}
                 else
                   :ok
                 end
               else
                 :ok
               end
             end,
             on: [:destroy]
    # Prevent deletion if used as default in settings
    validate fn changeset, _context ->
               if changeset.action_type == :destroy do
                 require Ash.Query
                 setting_count =
                   Mv.Membership.Setting
                   |> Ash.Query.filter(default_membership_fee_type_id == ^changeset.data.id)
                   |> Ash.count!()
                 if setting_count > 0 do
                   {:error,
                    message: "Cannot delete membership fee type: it's used as default in settings"}
                 else
                   :ok
                 end
               else
                 :ok
               end
             end,
             on: [:destroy]
  end
  attributes do
--- a/lib/mv_web/components/layouts/navbar.ex
+++ b/lib/mv_web/components/layouts/navbar.ex
@ -34,7 +34,9 @@ defmodule MvWeb.Layouts.Navbar do
              <ul class="bg-base-200 rounded-t-none p-2 z-10 w-48">
                <li><.link navigate="/contribution_types">{gettext("Contribution Types")}</.link></li>
                <li>
-                  <.link navigate="/contribution_settings">{gettext("Contribution Settings")}</.link>
+                  <.link navigate="/membership_fee_settings">
                    {gettext("Membership Fee Settings")}
                  </.link>
                </li>
              </ul>
            </details>
--- a/lib/mv_web/live/contribution_period_live/show.ex
+++ b/lib/mv_web/live/contribution_period_live/show.ex
@ -43,7 +43,7 @@ defmodule MvWeb.ContributionPeriodLive.Show do
          · {gettext("Member since")}: <span class="font-mono">{@member.joined_at}</span>
        </:subtitle>
        <:actions>
-          <.link navigate={~p"/contribution_settings"} class="btn btn-ghost btn-sm">
+          <.link navigate={~p"/membership_fee_settings"} class="btn btn-ghost btn-sm">
            <.icon name="hero-arrow-left" class="size-4" />
            {gettext("Back to Settings")}
          </.link>
--- a/lib/mv_web/live/contribution_settings_live.ex
+++ b/lib/mv_web/live/contribution_settings_live.ex
@ -1,277 +0,0 @@
 defmodule MvWeb.ContributionSettingsLive do
  @moduledoc """
  Mock-up LiveView for Contribution Settings (Admin).
  This is a preview-only page that displays the planned UI for managing
  global contribution settings. It shows static mock data and is not functional.
  ## Planned Features (Future Implementation)
  - Set default contribution type for new members
  - Configure whether joining period is included in contributions
  - Explanatory text with examples
  ## Settings
  - `default_contribution_type_id` - UUID of the default contribution type
  - `include_joining_period` - Boolean whether to include joining period
  ## Note
  This page is intentionally non-functional and serves as a UI mockup
  for the upcoming Membership Contributions feature.
  """
  use MvWeb, :live_view
  @impl true
  def mount(_params, _session, socket) do
    {:ok,
     socket
     |> assign(:page_title, gettext("Contribution Settings"))
     |> assign(:contribution_types, mock_contribution_types())
     |> assign(:selected_type_id, "1")
     |> assign(:include_joining_period, true)}
  end
  @impl true
  def render(assigns) do
    ~H"""
    <Layouts.app flash={@flash} current_user={@current_user}>
      <.mockup_warning />
      <.header>
        {gettext("Contribution Settings")}
        <:subtitle>
          {gettext("Configure global settings for membership contributions.")}
        </:subtitle>
      </.header>
      <div class="grid gap-6 lg:grid-cols-2">
        <%!-- Settings Form --%>
        <div class="card bg-base-100 shadow-xl">
          <div class="card-body">
            <h2 class="card-title">
              <.icon name="hero-cog-6-tooth" class="size-5" />
              {gettext("Global Settings")}
            </h2>
            <form class="space-y-6">
              <%!-- Default Contribution Type --%>
              <fieldset class="fieldset">
                <label class="label">
                  <span class="label-text font-semibold">
                    {gettext("Default Contribution Type")}
                  </span>
                </label>
                <select class="select select-bordered w-full" disabled>
                  <option :for={ct <- @contribution_types} selected={ct.id == @selected_type_id}>
                    {ct.name} ({format_currency(ct.amount)}, {format_interval(ct.interval)})
                  </option>
                </select>
                <p class="text-sm text-base-content/60 mt-2">
                  {gettext(
                    "This contribution type is automatically assigned to all new members. Can be changed individually per member."
                  )}
                </p>
              </fieldset>
              <%!-- Include Joining Period --%>
              <fieldset class="fieldset">
                <label class="label cursor-pointer justify-start gap-3">
                  <input
                    type="checkbox"
                    class="checkbox checkbox-primary"
                    checked={@include_joining_period}
                    disabled
                  />
                  <span class="label-text font-semibold">
                    {gettext("Include joining period")}
                  </span>
                </label>
                <div class="ml-9 space-y-2">
                  <p class="text-sm text-base-content/60">
                    {gettext("When active: Members pay from the period of their joining.")}
                  </p>
                  <p class="text-sm text-base-content/60">
                    {gettext("When inactive: Members pay from the next full period after joining.")}
                  </p>
                </div>
              </fieldset>
              <div class="divider"></div>
              <button type="button" class="btn btn-primary w-full" disabled>
                <.icon name="hero-check" class="size-5" />
                {gettext("Save Settings")}
              </button>
            </form>
          </div>
        </div>
        <%!-- Examples Card --%>
        <div class="card bg-base-200">
          <div class="card-body">
            <h2 class="card-title">
              <.icon name="hero-light-bulb" class="size-5" />
              {gettext("Examples")}
            </h2>
            <.example_section
              title={gettext("Yearly Interval - Joining Period Included")}
              joining_date="15.03.2023"
              include_joining={true}
              start_date="01.01.2023"
              periods={["2023", "2024", "2025"]}
              note={gettext("Member pays for the year they joined")}
            />
            <div class="divider"></div>
            <.example_section
              title={gettext("Yearly Interval - Joining Period Excluded")}
              joining_date="15.03.2023"
              include_joining={false}
              start_date="01.01.2024"
              periods={["2024", "2025"]}
              note={gettext("Member pays from the next full year")}
            />
            <div class="divider"></div>
            <.example_section
              title={gettext("Quarterly Interval - Joining Period Excluded")}
              joining_date="15.05.2024"
              include_joining={false}
              start_date="01.07.2024"
              periods={["Q3/2024", "Q4/2024", "Q1/2025"]}
              note={gettext("Member pays from the next full quarter")}
            />
            <div class="divider"></div>
            <.example_section
              title={gettext("Monthly Interval - Joining Period Included")}
              joining_date="15.03.2024"
              include_joining={true}
              start_date="01.03.2024"
              periods={["03/2024", "04/2024", "05/2024", "..."]}
              note={gettext("Member pays from the joining month")}
            />
          </div>
        </div>
      </div>
      <.example_member_card />
    </Layouts.app>
    """
  end
  # Example member card with link to period view
  defp example_member_card(assigns) do
    ~H"""
    <div class="card bg-base-100 shadow-xl mt-6">
      <div class="card-body">
        <h2 class="card-title">
          <.icon name="hero-user" class="size-5" />
          {gettext("Example: Member Contribution View")}
        </h2>
        <p class="text-base-content/70">
          {gettext(
            "See how the contribution periods will be displayed for an individual member. This example shows Maria Weber with multiple contribution periods."
          )}
        </p>
        <div class="card-actions justify-end">
          <.link navigate={~p"/contributions/member/example"} class="btn btn-primary btn-sm">
            <.icon name="hero-eye" class="size-4" />
            {gettext("View Example Member")}
          </.link>
        </div>
      </div>
    </div>
    """
  end
  # Mock-up warning banner component - subtle orange style
  defp mockup_warning(assigns) do
    ~H"""
    <div class="border border-warning text-warning bg-base-100 rounded-lg px-4 py-3 mb-6 flex items-center gap-3">
      <.icon name="hero-exclamation-triangle" class="size-5 shrink-0" />
      <div>
        <span class="font-semibold">{gettext("Preview Mockup")}</span>
        <span class="text-sm text-base-content/70 ml-2">
          – {gettext("This page is not functional and only displays the planned features.")}
        </span>
      </div>
    </div>
    """
  end
  # Example section component
  attr :title, :string, required: true
  attr :joining_date, :string, required: true
  attr :include_joining, :boolean, required: true
  attr :start_date, :string, required: true
  attr :periods, :list, required: true
  attr :note, :string, required: true
  defp example_section(assigns) do
    ~H"""
    <div class="space-y-2">
      <h3 class="font-semibold text-sm">{@title}</h3>
      <div class="bg-base-300 rounded-lg p-3 text-sm space-y-1">
        <p>
          <span class="text-base-content/60">{gettext("Joining date")}:</span>
          <span class="font-mono">{@joining_date}</span>
        </p>
        <p>
          <span class="text-base-content/60">{gettext("Contribution start")}:</span>
          <span class="font-mono font-semibold text-primary">{@start_date}</span>
        </p>
        <p>
          <span class="text-base-content/60">{gettext("Generated periods")}:</span>
          <span class="font-mono">
            {Enum.join(@periods, ", ")}
          </span>
        </p>
      </div>
      <p class="text-xs text-base-content/60 italic">→ {@note}</p>
    </div>
    """
  end
  # Mock data for demonstration
  defp mock_contribution_types do
    [
      %{
        id: "1",
        name: gettext("Regular"),
        amount: Decimal.new("60.00"),
        interval: :yearly
      },
      %{
        id: "2",
        name: gettext("Reduced"),
        amount: Decimal.new("30.00"),
        interval: :yearly
      },
      %{
        id: "3",
        name: gettext("Student"),
        amount: Decimal.new("5.00"),
        interval: :monthly
      },
      %{
        id: "4",
        name: gettext("Family"),
        amount: Decimal.new("25.00"),
        interval: :quarterly
      }
    ]
  end
  defp format_currency(%Decimal{} = amount) do
    "#{Decimal.to_string(amount)} €"
  end
  defp format_interval(:monthly), do: gettext("Monthly")
  defp format_interval(:quarterly), do: gettext("Quarterly")
  defp format_interval(:half_yearly), do: gettext("Half-yearly")
  defp format_interval(:yearly), do: gettext("Yearly")
 end
--- a/lib/mv_web/live/membership_fee_settings_live.ex
+++ b/lib/mv_web/live/membership_fee_settings_live.ex
@ -0,0 +1,261 @@
 defmodule MvWeb.MembershipFeeSettingsLive do
  @moduledoc """
  LiveView for managing membership fee settings (Admin).
  Allows administrators to configure:
  - Default membership fee type for new members
  - Whether to include the joining cycle in membership fee generation
  """
  use MvWeb, :live_view
  alias Mv.Membership
  alias Mv.MembershipFees.MembershipFeeType
  @impl true
  def mount(_params, _session, socket) do
    {:ok, settings} = Membership.get_settings()
    membership_fee_types =
      MembershipFeeType
      |> Ash.Query.sort(name: :asc)
      |> Ash.read!()
    {:ok,
     socket
     |> assign(:page_title, gettext("Membership Fee Settings"))
     |> assign(:settings, settings)
     |> assign(:membership_fee_types, membership_fee_types)
     |> assign_form()}
  end
  @impl true
  def handle_event("validate", %{"settings" => params}, socket) do
    {:noreply, assign(socket, form: AshPhoenix.Form.validate(socket.assigns.form, params))}
  end
  def handle_event("save", %{"settings" => params}, socket) do
    case AshPhoenix.Form.submit(socket.assigns.form, params: params) do
      {:ok, updated_settings} ->
        {:noreply,
         socket
         |> assign(:settings, updated_settings)
         |> put_flash(:info, gettext("Settings saved successfully."))
         |> assign_form()}
      {:error, form} ->
        {:noreply, assign(socket, form: form)}
    end
  end
  @impl true
  def render(assigns) do
    ~H"""
    <Layouts.app flash={@flash} current_user={@current_user}>
      <.header>
        {gettext("Membership Fee Settings")}
        <:subtitle>
          {gettext("Configure global settings for membership fees.")}
        </:subtitle>
      </.header>
      <div class="grid gap-6 lg:grid-cols-2">
        <%!-- Settings Form --%>
        <div class="card bg-base-100 shadow-xl">
          <div class="card-body">
            <h2 class="card-title">
              <.icon name="hero-cog-6-tooth" class="size-5" />
              {gettext("Global Settings")}
            </h2>
            <.form
              for={@form}
              phx-change="validate"
              phx-submit="save"
              class="space-y-6"
            >
              <%!-- Default Membership Fee Type --%>
              <fieldset class="fieldset">
                <label for="default_membership_fee_type_id" class="label">
                  <span class="label-text font-semibold">
                    {gettext("Default Membership Fee Type")}
                  </span>
                </label>
                <select
                  id="default_membership_fee_type_id"
                  name="settings[default_membership_fee_type_id]"
                  class={[
                    "select select-bordered w-full",
                    if(@form.errors[:default_membership_fee_type_id], do: "select-error", else: "")
                  ]}
                  phx-debounce="blur"
                  aria-label={gettext("Default Membership Fee Type")}
                >
                  <option value="">{gettext("None (no default)")}</option>
                  <option
                    :for={fee_type <- @membership_fee_types}
                    value={fee_type.id}
                    selected={fee_type.id == @form[:default_membership_fee_type_id].value}
                  >
                    {fee_type.name} ({format_currency(fee_type.amount)}, {format_interval(
                      fee_type.interval
                    )})
                  </option>
                </select>
                <%= for {msg, _opts} <- @form.errors[:default_membership_fee_type_id] || [] do %>
                  <p class="text-error text-sm mt-1">{msg}</p>
                <% end %>
                <p class="text-sm text-base-content/60 mt-2">
                  {gettext(
                    "This membership fee type is automatically assigned to all new members. Can be changed individually per member."
                  )}
                </p>
              </fieldset>
              <%!-- Include Joining Cycle --%>
              <fieldset class="fieldset">
                <label class="label cursor-pointer justify-start gap-3">
                  <input
                    type="checkbox"
                    name="settings[include_joining_cycle]"
                    class="checkbox checkbox-primary"
                    checked={@form[:include_joining_cycle].value}
                    phx-debounce="blur"
                  />
                  <span class="label-text font-semibold">
                    {gettext("Include joining cycle")}
                  </span>
                </label>
                <%= for {msg, _opts} <- @form.errors[:include_joining_cycle] || [] do %>
                  <p class="text-error text-sm ml-9 mt-1">{msg}</p>
                <% end %>
                <div class="ml-9 space-y-2">
                  <p class="text-sm text-base-content/60">
                    {gettext("When active: Members pay from the cycle of their joining.")}
                  </p>
                  <p class="text-sm text-base-content/60">
                    {gettext("When inactive: Members pay from the next full cycle after joining.")}
                  </p>
                </div>
              </fieldset>
              <div class="divider"></div>
              <button type="submit" class="btn btn-primary w-full">
                <.icon name="hero-check" class="size-5" />
                {gettext("Save Settings")}
              </button>
            </.form>
          </div>
        </div>
        <%!-- Examples Card --%>
        <div class="card bg-base-200">
          <div class="card-body">
            <h2 class="card-title">
              <.icon name="hero-light-bulb" class="size-5" />
              {gettext("Examples")}
            </h2>
            <.example_section
              title={gettext("Yearly Interval - Joining Cycle Included")}
              joining_date="15.03.2023"
              include_joining={true}
              start_date="01.01.2023"
              periods={["2023", "2024", "2025"]}
              note={gettext("Member pays for the year they joined")}
            />
            <div class="divider"></div>
            <.example_section
              title={gettext("Yearly Interval - Joining Cycle Excluded")}
              joining_date="15.03.2023"
              include_joining={false}
              start_date="01.01.2024"
              periods={["2024", "2025"]}
              note={gettext("Member pays from the next full year")}
            />
            <div class="divider"></div>
            <.example_section
              title={gettext("Quarterly Interval - Joining Cycle Excluded")}
              joining_date="15.05.2024"
              include_joining={false}
              start_date="01.07.2024"
              periods={["Q3/2024", "Q4/2024", "Q1/2025"]}
              note={gettext("Member pays from the next full quarter")}
            />
            <div class="divider"></div>
            <.example_section
              title={gettext("Monthly Interval - Joining Cycle Included")}
              joining_date="15.03.2024"
              include_joining={true}
              start_date="01.03.2024"
              periods={["03/2024", "04/2024", "05/2024", "..."]}
              note={gettext("Member pays from the joining month")}
            />
          </div>
        </div>
      </div>
    </Layouts.app>
    """
  end
  # Example section component
  attr :title, :string, required: true
  attr :joining_date, :string, required: true
  attr :include_joining, :boolean, required: true
  attr :start_date, :string, required: true
  attr :periods, :list, required: true
  attr :note, :string, required: true
  defp example_section(assigns) do
    ~H"""
    <div class="space-y-2">
      <h3 class="font-semibold text-sm">{@title}</h3>
      <div class="bg-base-300 rounded-lg p-3 text-sm space-y-1">
        <p>
          <span class="text-base-content/80">{gettext("Joining date")}:</span>
          <span class="font-mono">{@joining_date}</span>
        </p>
        <p>
          <span class="text-base-content/80">{gettext("Membership fee start")}:</span>
          <span class="font-mono font-semibold text-base-content">{@start_date}</span>
        </p>
        <p>
          <span class="text-base-content/80">{gettext("Generated cycles")}:</span>
          <span class="font-mono">
            {Enum.join(@periods, ", ")}
          </span>
        </p>
      </div>
      <p class="text-xs text-base-content/80 italic">→ {@note}</p>
    </div>
    """
  end
  defp format_currency(%Decimal{} = amount) do
    "#{Decimal.to_string(amount)} €"
  end
  defp format_interval(:monthly), do: gettext("Monthly")
  defp format_interval(:quarterly), do: gettext("Quarterly")
  defp format_interval(:half_yearly), do: gettext("Half-yearly")
  defp format_interval(:yearly), do: gettext("Yearly")
  defp assign_form(%{assigns: %{settings: settings}} = socket) do
    form =
      AshPhoenix.Form.for_update(
        settings,
        :update_membership_fee_settings,
        api: Membership,
        as: "settings",
        forms: [auto?: true]
      )
    assign(socket, form: to_form(form))
  end
 end
--- a/lib/mv_web/router.ex
+++ b/lib/mv_web/router.ex
@ -69,9 +69,11 @@ defmodule MvWeb.Router do
      live "/settings", GlobalSettingsLive
      # Membership Fee Settings
      live "/membership_fee_settings", MembershipFeeSettingsLive
      # Contribution Management (Mock-ups)
      live "/contribution_types", ContributionTypeLive.Index, :index
      live "/contribution_settings", ContributionSettingsLive
      live "/contributions/member/:id", ContributionPeriodLive.Show, :show
      post "/set_locale", LocaleController, :set_locale
--- a/priv/gettext/de/LC_MESSAGES/default.po
+++ b/priv/gettext/de/LC_MESSAGES/default.po
@ -672,8 +672,8 @@ msgstr "Vereinsdaten"
 msgid "Manage global settings for the association."
 msgstr "Passe übergreifende Einstellungen für den Verein an."
 #: lib/mv_web/live/contribution_settings_live.ex
 #: lib/mv_web/live/global_settings_live.ex
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Save Settings"
 msgstr "Einstellungen speichern"
@ -930,17 +930,6 @@ msgstr "Löschen nicht möglich – es sind Mitglieder zugewiesen"
 msgid "Change Contribution Type"
 msgstr "Beitragsart ändern"
 #: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Configure global settings for membership contributions."
 msgstr "Globale Einstellungen für Mitgliedsbeiträge konfigurieren."
 #: lib/mv_web/components/layouts/navbar.ex
 #: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Contribution Settings"
 msgstr "Beitragseinstellungen"
 #: lib/mv_web/live/contribution_period_live/show.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Contribution Start"
@ -952,11 +941,6 @@ msgstr "Beitragsbeginn"
 msgid "Contribution Types"
 msgstr "Beitragsarten"
 #: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Contribution start"
 msgstr "Beitragsbeginn"
 #: lib/mv_web/live/contribution_period_live/show.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Contribution type"
@ -982,27 +966,16 @@ msgstr "Beiträge für %{name}"
 msgid "Current"
 msgstr "Aktuell"
 #: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Default Contribution Type"
 msgstr "Standard-Beitragsart"
 #: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Deletion"
 msgstr "Löschen"
-#: lib/mv_web/live/contribution_settings_live.ex
+#: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Example: Member Contribution View"
 msgstr "Beispiel: Ansicht Mitgliedsbeiträge"
 #: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Examples"
 msgstr "Beispiele"
 #: lib/mv_web/live/contribution_settings_live.ex
 #: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Family"
@ -1013,19 +986,14 @@ msgstr "Familie"
 msgid "Fixed after creation. Members can only switch between types with the same interval."
 msgstr "Festgelegt nach der Erstellung. Mitglieder können nur zwischen Beitragsarten mit gleichem Intervall wechseln."
-#: lib/mv_web/live/contribution_settings_live.ex
+#: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Generated periods"
 msgstr "Generierte Zyklen"
 #: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Global Settings"
 msgstr "Vereinsdaten"
 #: lib/mv_web/live/contribution_period_live/show.ex
 #: lib/mv_web/live/contribution_settings_live.ex
 #: lib/mv_web/live/contribution_type_live/index.ex
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Half-yearly"
 msgstr "Halbjährlich"
@ -1041,18 +1009,13 @@ msgstr "Halbjährlicher Beitrag für Fördermitglieder"
 msgid "Honorary"
 msgstr "Ehrenamtlich"
 #: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Include joining period"
 msgstr "Beitrittsdatum einbeziehen"
 #: lib/mv_web/live/contribution_period_live/show.ex
 #: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Interval"
 msgstr "Zyklus"
-#: lib/mv_web/live/contribution_settings_live.ex
+#: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Joining date"
 msgstr "Beitrittsdatum"
@ -1087,22 +1050,22 @@ msgstr "Als unbezahlt markieren"
 msgid "Member Contributions"
 msgstr "Mitgliedsbeiträge"
-#: lib/mv_web/live/contribution_settings_live.ex
+#: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Member pays for the year they joined"
 msgstr "Mitglied zahlt für das Beitrittsjahr"
-#: lib/mv_web/live/contribution_settings_live.ex
+#: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Member pays from the joining month"
 msgstr "Mitglied zahlt ab Beitrittsmonat"
-#: lib/mv_web/live/contribution_settings_live.ex
+#: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Member pays from the next full quarter"
 msgstr "Mitglied zahlt ab dem nächsten vollständigen Quartal"
-#: lib/mv_web/live/contribution_settings_live.ex
+#: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Member pays from the next full year"
 msgstr "Mitglied zahlt ab dem nächsten vollständigen Jahr"
@ -1118,17 +1081,12 @@ msgid "Members can only switch between contribution types with the same payment
 msgstr "Mitglieder können nur zwischen Beitragsarten mit demselben Zahlungszyklus wechseln (z. B. jährlich zu jährlich). Dadurch werden komplexe Überlappungen vermieden."
 #: lib/mv_web/live/contribution_period_live/show.ex
 #: lib/mv_web/live/contribution_settings_live.ex
 #: lib/mv_web/live/contribution_type_live/index.ex
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Monthly"
 msgstr "Monatlich"
 #: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Monthly Interval - Joining Period Included"
 msgstr "Monatliches Intervall – Beitrittszeitraum einbezogen"
 #: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Monthly fee for students and trainees"
@ -1165,31 +1123,24 @@ msgid "Paid via bank transfer"
 msgstr "Bezahlt durch Überweisung"
 #: lib/mv_web/live/contribution_period_live/show.ex
 #: lib/mv_web/live/contribution_settings_live.ex
 #: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Preview Mockup"
 msgstr "Vorschau"
 #: lib/mv_web/live/contribution_period_live/show.ex
 #: lib/mv_web/live/contribution_settings_live.ex
 #: lib/mv_web/live/contribution_type_live/index.ex
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Quarterly"
 msgstr "Vierteljährlich"
 #: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Quarterly Interval - Joining Period Excluded"
 msgstr "Vierteljährliches Intervall – Beitrittszeitraum nicht einbezogen"
 #: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Quarterly fee for family memberships"
 msgstr "Vierteljährlicher Beitrag für Familienmitgliedschaften"
 #: lib/mv_web/live/contribution_period_live/show.ex
 #: lib/mv_web/live/contribution_settings_live.ex
 #: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Reduced"
@ -1201,7 +1152,6 @@ msgid "Reduced fee for unemployed, pensioners, or low income"
 msgstr "Ermäßigter Beitrag für Arbeitslose, Rentner*innen oder Geringverdienende"
 #: lib/mv_web/live/contribution_period_live/show.ex
 #: lib/mv_web/live/contribution_settings_live.ex
 #: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Regular"
@ -1212,11 +1162,6 @@ msgstr "Regulär"
 msgid "Reopen"
 msgstr "Wieder öffnen"
 #: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "See how the contribution periods will be displayed for an individual member. This example shows Maria Weber with multiple contribution periods."
 msgstr "Beispielhafte Anzeige der Beitragsperioden für ein einzelnes Mitglied. In diesem Beispiel wird Maria Weber mit mehreren Zyklen angezeigt."
 #: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Standard membership fee for regular members"
@ -1227,7 +1172,6 @@ msgstr "Regulärer Mitgliedsbeitrag für Vollmitglieder"
 msgid "Status"
 msgstr "Status"
 #: lib/mv_web/live/contribution_settings_live.ex
 #: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Student"
@ -1248,13 +1192,7 @@ msgstr "Pausieren"
 msgid "Suspended"
 msgstr "Pausiert"
 #: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "This contribution type is automatically assigned to all new members. Can be changed individually per member."
 msgstr "Dieser Beitragstyp wird automatisch neuen Mitgliedern zugewiesen. Kann individuell angepasst werden."
 #: lib/mv_web/live/contribution_period_live/show.ex
 #: lib/mv_web/live/contribution_settings_live.ex
 #: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "This page is not functional and only displays the planned features."
@ -1275,43 +1213,18 @@ msgstr "Gesamtbeiträge"
 msgid "Unpaid"
 msgstr "Unbezahlt"
 #: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "View Example Member"
 msgstr "Beispielmitglied anzeigen"
 #: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "When active: Members pay from the period of their joining."
 msgstr "Wenn aktiviert: Mitglieder zahlen ab dem Zeitraum ihres Beitritts."
 #: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "When inactive: Members pay from the next full period after joining."
 msgstr "Wenn deaktiviert: Mitglieder zahlen ab dem nächsten vollen Beitragszyklus nach dem Beitritt."
 #: lib/mv_web/live/contribution_period_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Why are not all contribution types shown?"
 msgstr "Warum werden nicht alle Beitragsarten angezeigt?"
 #: lib/mv_web/live/contribution_period_live/show.ex
 #: lib/mv_web/live/contribution_settings_live.ex
 #: lib/mv_web/live/contribution_type_live/index.ex
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Yearly"
 msgstr "jährlich"
 #: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Yearly Interval - Joining Period Excluded"
 msgstr "Jährliches Intervall – Beitrittszeitraum nicht einbezogen"
 #: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Yearly Interval - Joining Period Included"
 msgstr "Jährliches Intervall – Beitrittszeitraum einbezogen"
 #: lib/mv_web/live/components/field_visibility_dropdown_component.ex
 #, elixir-autogen, elixir-format
 msgid "Columns"
@ -1433,16 +1346,102 @@ msgstr "Benutzerdefiniertes Feld speichern"
 msgid "Save Custom Field Value"
 msgstr "Benutzerdefinierten Feldwert speichern"
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Configure global settings for membership fees."
 msgstr "Globale Einstellungen für Mitgliedsbeiträge konfigurieren."
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Default Membership Fee Type"
 msgstr "Standard-Mitgliedsbeitragsart"
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Generated cycles"
 msgstr "Generierte Zyklen"
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Include joining cycle"
 msgstr "Beitrittsdatum einbeziehen"
 #: lib/mv_web/components/layouts/navbar.ex
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Membership Fee Settings"
 msgstr "Mitgliedsbeitragseinstellungen"
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Membership fee start"
 msgstr "Beitragsbeginn"
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Monthly Interval - Joining Cycle Included"
 msgstr "Monatliches Intervall – Beitrittszeitraum einbezogen"
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "None (no default)"
 msgstr "Keine (kein Standard)"
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Quarterly Interval - Joining Cycle Excluded"
 msgstr "Vierteljährliches Intervall – Beitrittszeitraum nicht einbezogen"
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Settings saved successfully."
 msgstr "Einstellungen erfolgreich gespeichert"
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "This membership fee type is automatically assigned to all new members. Can be changed individually per member."
 msgstr "Diese Mitgliedsbeitragsart wird automatisch allen neuen Mitgliedern zugewiesen. Kann individuell pro Mitglied geändert werden."
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "When active: Members pay from the cycle of their joining."
 msgstr "Wenn aktiviert: Mitglieder zahlen ab dem Zeitraum ihres Beitritts."
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "When inactive: Members pay from the next full cycle after joining."
 msgstr "Wenn deaktiviert: Mitglieder zahlen ab dem nächsten vollen Beitragszyklus nach dem Beitritt."
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Yearly Interval - Joining Cycle Excluded"
 msgstr "Jährliches Intervall – Beitrittszeitraum nicht einbezogen"
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Yearly Interval - Joining Cycle Included"
 msgstr "Jährliches Intervall – Beitrittszeitraum einbezogen"
 #~ #: lib/mv_web/live/custom_field_live/show.ex
 #~ #, elixir-autogen, elixir-format
 #~ msgid "Auto-generated identifier (immutable)"
 #~ msgstr "Automatisch generierter Bezeichner (unveränderlich)"
-#~ #: lib/mv_web/live/member_live/form.ex
+#~ #: lib/mv_web/live/contribution_settings_live.ex
 #~ #: lib/mv_web/live/member_live/show.ex
 #~ #, elixir-autogen, elixir-format
-#~ msgid "Birth Date"
+#~ msgid "Configure global settings for membership contributions."
-#~ msgstr "Geburtsdatum"
+#~ msgstr "Globale Einstellungen für Mitgliedsbeiträge konfigurieren."
 #~ #: lib/mv_web/components/layouts/navbar.ex
 #~ #: lib/mv_web/live/contribution_settings_live.ex
 #~ #, elixir-autogen, elixir-format, fuzzy
 #~ msgid "Contribution Settings"
 #~ msgstr "Beitragseinstellungen"
 #~ #: lib/mv_web/live/contribution_settings_live.ex
 #~ #, elixir-autogen, elixir-format, fuzzy
 #~ msgid "Contribution start"
 #~ msgstr "Beitragsbeginn"
 #~ #: lib/mv_web/live/member_live/index.html.heex
 #~ #, elixir-autogen, elixir-format
@ -1455,27 +1454,41 @@ msgstr "Benutzerdefinierten Feldwert speichern"
 #~ msgid "Custom Field Values"
 #~ msgstr "Benutzerdefinierte Feldwerte"
-#~ #: lib/mv_web/live/member_live/form.ex
+#~ #: lib/mv_web/live/contribution_settings_live.ex
 #~ #, elixir-autogen, elixir-format
-#~ msgid "Fields marked with an asterisk (*) cannot be empty."
+#~ msgid "Default Contribution Type"
-#~ msgstr "Felder, die mit einem Sternchen (*) markiert sind, dürfen nicht leer bleiben."
+#~ msgstr "Standard-Beitragsart"
-#~ #: lib/mv_web/live/custom_field_live/form.ex
+#~ #: lib/mv_web/live/contribution_settings_live.ex
 #~ #: lib/mv_web/live/user_live/show.ex
 #~ #, elixir-autogen, elixir-format
-#~ msgid "ID"
+#~ msgid "Example: Member Contribution View"
-#~ msgstr "ID"
+#~ msgstr "Beispiel: Ansicht Mitgliedsbeiträge"
-#~ #: lib/mv_web/live/member_live/show.ex
+#~ #: lib/mv_web/live/membership_fee_settings_live.ex
 #~ #, elixir-autogen, elixir-format
-#~ msgid "Id"
+#~ msgid "Failed to save settings. Please check the errors below."
-#~ msgstr "ID"
+#~ msgstr "Einstellungen konnten nicht gespeichert werden. Bitte prüfen Sie die Fehler unten."
 #~ #: lib/mv_web/live/contribution_settings_live.ex
 #~ #, elixir-autogen, elixir-format
 #~ msgid "Generated periods"
 #~ msgstr "Generierte Zyklen"
 #~ #: lib/mv_web/live/custom_field_live/form_component.ex
 #~ #, elixir-autogen, elixir-format
 #~ msgid "Immutable"
 #~ msgstr "Unveränderlich"
 #~ #: lib/mv_web/live/contribution_settings_live.ex
 #~ #, elixir-autogen, elixir-format
 #~ msgid "Include joining period"
 #~ msgstr "Beitrittsdatum einbeziehen"
 #~ #: lib/mv_web/live/contribution_settings_live.ex
 #~ #, elixir-autogen, elixir-format
 #~ msgid "Monthly Interval - Joining Period Included"
 #~ msgstr "Monatliches Intervall – Beitrittszeitraum einbezogen"
 #~ #: lib/mv_web/live/custom_field_live/index_component.ex
 #~ #, elixir-autogen, elixir-format, fuzzy
 #~ msgid "New Custom field"
@ -1487,23 +1500,42 @@ msgstr "Benutzerdefinierten Feldwert speichern"
 #~ msgid "Not set"
 #~ msgstr "Nicht gesetzt"
-#~ #: lib/mv_web/live/user_live/index.html.heex
+#~ #: lib/mv_web/live/contribution_settings_live.ex
 #~ #: lib/mv_web/live/user_live/show.ex
 #~ #, elixir-autogen, elixir-format
-#~ msgid "OIDC ID"
+#~ msgid "Quarterly Interval - Joining Period Excluded"
-#~ msgstr "OIDC ID"
+#~ msgstr "Vierteljährliches Intervall – Beitrittszeitraum nicht einbezogen"
-#~ #: lib/mv_web/live/custom_field_live/index_component.ex
+#~ #: lib/mv_web/live/contribution_settings_live.ex
 #~ #, elixir-autogen, elixir-format, fuzzy
 #~ msgid "Show in Overview"
 #~ msgstr "In der Mitglieder-Übersicht anzeigen"
 #~ #: lib/mv_web/live/member_live/show.ex
 #~ #, elixir-autogen, elixir-format
-#~ msgid "This is a member record from your database."
+#~ msgid "See how the contribution periods will be displayed for an individual member. This example shows Maria Weber with multiple contribution periods."
-#~ msgstr "Dies ist ein Mitglied aus deiner Datenbank."
+#~ msgstr "Beispielhafte Anzeige der Beitragsperioden für ein einzelnes Mitglied. In diesem Beispiel wird Maria Weber mit mehreren Zyklen angezeigt."
-#~ #: lib/mv_web/live/custom_field_live/form.ex
+#~ #: lib/mv_web/live/contribution_settings_live.ex
 #~ #, elixir-autogen, elixir-format
-#~ msgid "Use this form to manage custom_field records in your database."
+#~ msgid "This contribution type is automatically assigned to all new members. Can be changed individually per member."
-#~ msgstr "Verwende dieses Formular, um Benutzerdefinierte Felder in deiner Datenbank zu verwalten."
+#~ msgstr "Dieser Beitragstyp wird automatisch neuen Mitgliedern zugewiesen. Kann individuell angepasst werden."
 #~ #: lib/mv_web/live/contribution_settings_live.ex
 #~ #, elixir-autogen, elixir-format
 #~ msgid "View Example Member"
 #~ msgstr "Beispielmitglied anzeigen"
 #~ #: lib/mv_web/live/contribution_settings_live.ex
 #~ #, elixir-autogen, elixir-format
 #~ msgid "When active: Members pay from the period of their joining."
 #~ msgstr "Wenn aktiviert: Mitglieder zahlen ab dem Zeitraum ihres Beitritts."
 #~ #: lib/mv_web/live/contribution_settings_live.ex
 #~ #, elixir-autogen, elixir-format
 #~ msgid "When inactive: Members pay from the next full period after joining."
 #~ msgstr "Wenn deaktiviert: Mitglieder zahlen ab dem nächsten vollen Beitragszyklus nach dem Beitritt."
 #~ #: lib/mv_web/live/contribution_settings_live.ex
 #~ #, elixir-autogen, elixir-format
 #~ msgid "Yearly Interval - Joining Period Excluded"
 #~ msgstr "Jährliches Intervall – Beitrittszeitraum nicht einbezogen"
 #~ #: lib/mv_web/live/contribution_settings_live.ex
 #~ #, elixir-autogen, elixir-format
 #~ msgid "Yearly Interval - Joining Period Included"
 #~ msgstr "Jährliches Intervall – Beitrittszeitraum einbezogen"
--- a/priv/gettext/default.pot
+++ b/priv/gettext/default.pot
@ -673,8 +673,8 @@ msgstr ""
 msgid "Manage global settings for the association."
 msgstr ""
 #: lib/mv_web/live/contribution_settings_live.ex
 #: lib/mv_web/live/global_settings_live.ex
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Save Settings"
 msgstr ""
@ -931,17 +931,6 @@ msgstr ""
 msgid "Change Contribution Type"
 msgstr ""
 #: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Configure global settings for membership contributions."
 msgstr ""
 #: lib/mv_web/components/layouts/navbar.ex
 #: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Contribution Settings"
 msgstr ""
 #: lib/mv_web/live/contribution_period_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Contribution Start"
@ -953,11 +942,6 @@ msgstr ""
 msgid "Contribution Types"
 msgstr ""
 #: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Contribution start"
 msgstr ""
 #: lib/mv_web/live/contribution_period_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Contribution type"
@ -983,27 +967,16 @@ msgstr ""
 msgid "Current"
 msgstr ""
 #: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Default Contribution Type"
 msgstr ""
 #: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Deletion"
 msgstr ""
-#: lib/mv_web/live/contribution_settings_live.ex
+#: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Example: Member Contribution View"
 msgstr ""
 #: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Examples"
 msgstr ""
 #: lib/mv_web/live/contribution_settings_live.ex
 #: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Family"
@ -1014,19 +987,14 @@ msgstr ""
 msgid "Fixed after creation. Members can only switch between types with the same interval."
 msgstr ""
-#: lib/mv_web/live/contribution_settings_live.ex
+#: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Generated periods"
 msgstr ""
 #: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Global Settings"
 msgstr ""
 #: lib/mv_web/live/contribution_period_live/show.ex
 #: lib/mv_web/live/contribution_settings_live.ex
 #: lib/mv_web/live/contribution_type_live/index.ex
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Half-yearly"
 msgstr ""
@ -1042,18 +1010,13 @@ msgstr ""
 msgid "Honorary"
 msgstr ""
 #: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Include joining period"
 msgstr ""
 #: lib/mv_web/live/contribution_period_live/show.ex
 #: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Interval"
 msgstr ""
-#: lib/mv_web/live/contribution_settings_live.ex
+#: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Joining date"
 msgstr ""
@ -1088,22 +1051,22 @@ msgstr ""
 msgid "Member Contributions"
 msgstr ""
-#: lib/mv_web/live/contribution_settings_live.ex
+#: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Member pays for the year they joined"
 msgstr ""
-#: lib/mv_web/live/contribution_settings_live.ex
+#: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Member pays from the joining month"
 msgstr ""
-#: lib/mv_web/live/contribution_settings_live.ex
+#: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Member pays from the next full quarter"
 msgstr ""
-#: lib/mv_web/live/contribution_settings_live.ex
+#: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Member pays from the next full year"
 msgstr ""
@ -1119,17 +1082,12 @@ msgid "Members can only switch between contribution types with the same payment
 msgstr ""
 #: lib/mv_web/live/contribution_period_live/show.ex
 #: lib/mv_web/live/contribution_settings_live.ex
 #: lib/mv_web/live/contribution_type_live/index.ex
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Monthly"
 msgstr ""
 #: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Monthly Interval - Joining Period Included"
 msgstr ""
 #: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Monthly fee for students and trainees"
@ -1166,31 +1124,24 @@ msgid "Paid via bank transfer"
 msgstr ""
 #: lib/mv_web/live/contribution_period_live/show.ex
 #: lib/mv_web/live/contribution_settings_live.ex
 #: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Preview Mockup"
 msgstr ""
 #: lib/mv_web/live/contribution_period_live/show.ex
 #: lib/mv_web/live/contribution_settings_live.ex
 #: lib/mv_web/live/contribution_type_live/index.ex
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Quarterly"
 msgstr ""
 #: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Quarterly Interval - Joining Period Excluded"
 msgstr ""
 #: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Quarterly fee for family memberships"
 msgstr ""
 #: lib/mv_web/live/contribution_period_live/show.ex
 #: lib/mv_web/live/contribution_settings_live.ex
 #: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Reduced"
@ -1202,7 +1153,6 @@ msgid "Reduced fee for unemployed, pensioners, or low income"
 msgstr ""
 #: lib/mv_web/live/contribution_period_live/show.ex
 #: lib/mv_web/live/contribution_settings_live.ex
 #: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Regular"
@ -1213,11 +1163,6 @@ msgstr ""
 msgid "Reopen"
 msgstr ""
 #: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "See how the contribution periods will be displayed for an individual member. This example shows Maria Weber with multiple contribution periods."
 msgstr ""
 #: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Standard membership fee for regular members"
@ -1228,7 +1173,6 @@ msgstr ""
 msgid "Status"
 msgstr ""
 #: lib/mv_web/live/contribution_settings_live.ex
 #: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Student"
@ -1249,13 +1193,7 @@ msgstr ""
 msgid "Suspended"
 msgstr ""
 #: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "This contribution type is automatically assigned to all new members. Can be changed individually per member."
 msgstr ""
 #: lib/mv_web/live/contribution_period_live/show.ex
 #: lib/mv_web/live/contribution_settings_live.ex
 #: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "This page is not functional and only displays the planned features."
@ -1276,43 +1214,18 @@ msgstr ""
 msgid "Unpaid"
 msgstr ""
 #: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "View Example Member"
 msgstr ""
 #: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "When active: Members pay from the period of their joining."
 msgstr ""
 #: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "When inactive: Members pay from the next full period after joining."
 msgstr ""
 #: lib/mv_web/live/contribution_period_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Why are not all contribution types shown?"
 msgstr ""
 #: lib/mv_web/live/contribution_period_live/show.ex
 #: lib/mv_web/live/contribution_settings_live.ex
 #: lib/mv_web/live/contribution_type_live/index.ex
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Yearly"
 msgstr ""
 #: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Yearly Interval - Joining Period Excluded"
 msgstr ""
 #: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Yearly Interval - Joining Period Included"
 msgstr ""
 #: lib/mv_web/live/components/field_visibility_dropdown_component.ex
 #, elixir-autogen, elixir-format
 msgid "Columns"
@ -1433,3 +1346,79 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "Save Custom Field Value"
 msgstr ""
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Configure global settings for membership fees."
 msgstr ""
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Default Membership Fee Type"
 msgstr ""
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Generated cycles"
 msgstr ""
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Include joining cycle"
 msgstr ""
 #: lib/mv_web/components/layouts/navbar.ex
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Membership Fee Settings"
 msgstr ""
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Membership fee start"
 msgstr ""
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Monthly Interval - Joining Cycle Included"
 msgstr ""
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "None (no default)"
 msgstr ""
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Quarterly Interval - Joining Cycle Excluded"
 msgstr ""
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Settings saved successfully."
 msgstr ""
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "This membership fee type is automatically assigned to all new members. Can be changed individually per member."
 msgstr ""
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "When active: Members pay from the cycle of their joining."
 msgstr ""
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "When inactive: Members pay from the next full cycle after joining."
 msgstr ""
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Yearly Interval - Joining Cycle Excluded"
 msgstr ""
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Yearly Interval - Joining Cycle Included"
 msgstr ""
--- a/priv/gettext/en/LC_MESSAGES/default.po
+++ b/priv/gettext/en/LC_MESSAGES/default.po
@ -673,8 +673,8 @@ msgstr ""
 msgid "Manage global settings for the association."
 msgstr ""
 #: lib/mv_web/live/contribution_settings_live.ex
 #: lib/mv_web/live/global_settings_live.ex
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Save Settings"
 msgstr ""
@ -931,17 +931,6 @@ msgstr ""
 msgid "Change Contribution Type"
 msgstr ""
 #: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Configure global settings for membership contributions."
 msgstr ""
 #: lib/mv_web/components/layouts/navbar.ex
 #: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Contribution Settings"
 msgstr ""
 #: lib/mv_web/live/contribution_period_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Contribution Start"
@ -953,11 +942,6 @@ msgstr ""
 msgid "Contribution Types"
 msgstr ""
 #: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Contribution start"
 msgstr ""
 #: lib/mv_web/live/contribution_period_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Contribution type"
@ -983,27 +967,16 @@ msgstr ""
 msgid "Current"
 msgstr ""
 #: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Default Contribution Type"
 msgstr ""
 #: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Deletion"
 msgstr ""
-#: lib/mv_web/live/contribution_settings_live.ex
+#: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Example: Member Contribution View"
 msgstr ""
 #: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Examples"
 msgstr ""
 #: lib/mv_web/live/contribution_settings_live.ex
 #: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Family"
@ -1014,19 +987,14 @@ msgstr ""
 msgid "Fixed after creation. Members can only switch between types with the same interval."
 msgstr ""
-#: lib/mv_web/live/contribution_settings_live.ex
+#: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Generated periods"
 msgstr ""
 #: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Global Settings"
 msgstr ""
 #: lib/mv_web/live/contribution_period_live/show.ex
 #: lib/mv_web/live/contribution_settings_live.ex
 #: lib/mv_web/live/contribution_type_live/index.ex
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Half-yearly"
 msgstr ""
@ -1042,18 +1010,13 @@ msgstr ""
 msgid "Honorary"
 msgstr ""
 #: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Include joining period"
 msgstr ""
 #: lib/mv_web/live/contribution_period_live/show.ex
 #: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Interval"
 msgstr ""
-#: lib/mv_web/live/contribution_settings_live.ex
+#: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Joining date"
 msgstr ""
@ -1088,22 +1051,22 @@ msgstr ""
 msgid "Member Contributions"
 msgstr ""
-#: lib/mv_web/live/contribution_settings_live.ex
+#: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Member pays for the year they joined"
 msgstr ""
-#: lib/mv_web/live/contribution_settings_live.ex
+#: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Member pays from the joining month"
 msgstr ""
-#: lib/mv_web/live/contribution_settings_live.ex
+#: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Member pays from the next full quarter"
 msgstr ""
-#: lib/mv_web/live/contribution_settings_live.ex
+#: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Member pays from the next full year"
 msgstr ""
@ -1119,17 +1082,12 @@ msgid "Members can only switch between contribution types with the same payment
 msgstr ""
 #: lib/mv_web/live/contribution_period_live/show.ex
 #: lib/mv_web/live/contribution_settings_live.ex
 #: lib/mv_web/live/contribution_type_live/index.ex
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Monthly"
 msgstr ""
 #: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Monthly Interval - Joining Period Included"
 msgstr ""
 #: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Monthly fee for students and trainees"
@ -1166,31 +1124,24 @@ msgid "Paid via bank transfer"
 msgstr ""
 #: lib/mv_web/live/contribution_period_live/show.ex
 #: lib/mv_web/live/contribution_settings_live.ex
 #: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Preview Mockup"
 msgstr ""
 #: lib/mv_web/live/contribution_period_live/show.ex
 #: lib/mv_web/live/contribution_settings_live.ex
 #: lib/mv_web/live/contribution_type_live/index.ex
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Quarterly"
 msgstr ""
 #: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Quarterly Interval - Joining Period Excluded"
 msgstr ""
 #: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Quarterly fee for family memberships"
 msgstr ""
 #: lib/mv_web/live/contribution_period_live/show.ex
 #: lib/mv_web/live/contribution_settings_live.ex
 #: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Reduced"
@ -1202,7 +1153,6 @@ msgid "Reduced fee for unemployed, pensioners, or low income"
 msgstr ""
 #: lib/mv_web/live/contribution_period_live/show.ex
 #: lib/mv_web/live/contribution_settings_live.ex
 #: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Regular"
@ -1213,11 +1163,6 @@ msgstr ""
 msgid "Reopen"
 msgstr ""
 #: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "See how the contribution periods will be displayed for an individual member. This example shows Maria Weber with multiple contribution periods."
 msgstr ""
 #: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Standard membership fee for regular members"
@ -1228,7 +1173,6 @@ msgstr ""
 msgid "Status"
 msgstr ""
 #: lib/mv_web/live/contribution_settings_live.ex
 #: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "Student"
@ -1249,13 +1193,7 @@ msgstr ""
 msgid "Suspended"
 msgstr ""
 #: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "This contribution type is automatically assigned to all new members. Can be changed individually per member."
 msgstr ""
 #: lib/mv_web/live/contribution_period_live/show.ex
 #: lib/mv_web/live/contribution_settings_live.ex
 #: lib/mv_web/live/contribution_type_live/index.ex
 #, elixir-autogen, elixir-format
 msgid "This page is not functional and only displays the planned features."
@ -1276,43 +1214,18 @@ msgstr ""
 msgid "Unpaid"
 msgstr ""
 #: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "View Example Member"
 msgstr ""
 #: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "When active: Members pay from the period of their joining."
 msgstr ""
 #: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "When inactive: Members pay from the next full period after joining."
 msgstr ""
 #: lib/mv_web/live/contribution_period_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Why are not all contribution types shown?"
 msgstr ""
 #: lib/mv_web/live/contribution_period_live/show.ex
 #: lib/mv_web/live/contribution_settings_live.ex
 #: lib/mv_web/live/contribution_type_live/index.ex
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Yearly"
 msgstr ""
 #: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Yearly Interval - Joining Period Excluded"
 msgstr ""
 #: lib/mv_web/live/contribution_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Yearly Interval - Joining Period Included"
 msgstr ""
 #: lib/mv_web/live/components/field_visibility_dropdown_component.ex
 #, elixir-autogen, elixir-format
 msgid "Columns"
@ -1434,15 +1347,101 @@ msgstr ""
 msgid "Save Custom Field Value"
 msgstr ""
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Configure global settings for membership fees."
 msgstr ""
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Default Membership Fee Type"
 msgstr ""
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Generated cycles"
 msgstr ""
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Include joining cycle"
 msgstr ""
 #: lib/mv_web/components/layouts/navbar.ex
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Membership Fee Settings"
 msgstr ""
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "Membership fee start"
 msgstr ""
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Monthly Interval - Joining Cycle Included"
 msgstr ""
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "None (no default)"
 msgstr ""
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Quarterly Interval - Joining Cycle Excluded"
 msgstr ""
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Settings saved successfully."
 msgstr ""
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format
 msgid "This membership fee type is automatically assigned to all new members. Can be changed individually per member."
 msgstr ""
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "When active: Members pay from the cycle of their joining."
 msgstr ""
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "When inactive: Members pay from the next full cycle after joining."
 msgstr ""
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Yearly Interval - Joining Cycle Excluded"
 msgstr ""
 #: lib/mv_web/live/membership_fee_settings_live.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Yearly Interval - Joining Cycle Included"
 msgstr ""
 #~ #: lib/mv_web/live/custom_field_live/show.ex
 #~ #, elixir-autogen, elixir-format
 #~ msgid "Auto-generated identifier (immutable)"
 #~ msgstr ""
-#~ #: lib/mv_web/live/member_live/form.ex
+#~ #: lib/mv_web/live/contribution_settings_live.ex
 #~ #: lib/mv_web/live/member_live/show.ex
 #~ #, elixir-autogen, elixir-format
-#~ msgid "Birth Date"
+#~ msgid "Configure global settings for membership contributions."
 #~ msgstr ""
 #~ #: lib/mv_web/components/layouts/navbar.ex
 #~ #: lib/mv_web/live/contribution_settings_live.ex
 #~ #, elixir-autogen, elixir-format
 #~ msgid "Contribution Settings"
 #~ msgstr ""
 #~ #: lib/mv_web/live/contribution_settings_live.ex
 #~ #, elixir-autogen, elixir-format
 #~ msgid "Contribution start"
 #~ msgstr ""
 #~ #: lib/mv_web/live/member_live/index.html.heex
@ -1456,19 +1455,24 @@ msgstr ""
 #~ msgid "Custom Field Values"
 #~ msgstr ""
-#~ #: lib/mv_web/live/member_live/form.ex
+#~ #: lib/mv_web/live/contribution_settings_live.ex
 #~ #, elixir-autogen, elixir-format
-#~ msgid "Fields marked with an asterisk (*) cannot be empty."
+#~ msgid "Default Contribution Type"
 #~ msgstr ""
-#~ #: lib/mv_web/live/user_live/show.ex
+#~ #: lib/mv_web/live/contribution_settings_live.ex
 #~ #, elixir-autogen, elixir-format
-#~ msgid "ID"
+#~ msgid "Example: Member Contribution View"
 #~ msgstr ""
-#~ #: lib/mv_web/live/member_live/show.ex
+#~ #: lib/mv_web/live/membership_fee_settings_live.ex
 #~ #, elixir-autogen, elixir-format
-#~ msgid "Id"
+#~ msgid "Failed to save settings. Please check the errors below."
 #~ msgstr ""
 #~ #: lib/mv_web/live/contribution_settings_live.ex
 #~ #, elixir-autogen, elixir-format
 #~ msgid "Generated periods"
 #~ msgstr ""
 #~ #: lib/mv_web/live/custom_field_live/form_component.ex
@ -1476,6 +1480,16 @@ msgstr ""
 #~ msgid "Immutable"
 #~ msgstr ""
 #~ #: lib/mv_web/live/contribution_settings_live.ex
 #~ #, elixir-autogen, elixir-format
 #~ msgid "Include joining period"
 #~ msgstr ""
 #~ #: lib/mv_web/live/contribution_settings_live.ex
 #~ #, elixir-autogen, elixir-format
 #~ msgid "Monthly Interval - Joining Period Included"
 #~ msgstr ""
 #~ #: lib/mv_web/live/custom_field_live/index_component.ex
 #~ #, elixir-autogen, elixir-format, fuzzy
 #~ msgid "New Custom field"
@ -1486,23 +1500,42 @@ msgstr ""
 #~ msgid "Not set"
 #~ msgstr ""
-#~ #: lib/mv_web/live/user_live/index.html.heex
+#~ #: lib/mv_web/live/contribution_settings_live.ex
 #~ #: lib/mv_web/live/user_live/show.ex
 #~ #, elixir-autogen, elixir-format
-#~ msgid "OIDC ID"
+#~ msgid "Quarterly Interval - Joining Period Excluded"
 #~ msgstr ""
-#~ #: lib/mv_web/live/custom_field_live/index_component.ex
+#~ #: lib/mv_web/live/contribution_settings_live.ex
 #~ #, elixir-autogen, elixir-format, fuzzy
 #~ msgid "Show in Overview"
 #~ msgstr ""
 #~ #: lib/mv_web/live/member_live/show.ex
 #~ #, elixir-autogen, elixir-format
-#~ msgid "This is a member record from your database."
+#~ msgid "See how the contribution periods will be displayed for an individual member. This example shows Maria Weber with multiple contribution periods."
 #~ msgstr ""
-#~ #: lib/mv_web/live/custom_field_live/form.ex
+#~ #: lib/mv_web/live/contribution_settings_live.ex
-#~ #, elixir-autogen, elixir-format, fuzzy
+#~ #, elixir-autogen, elixir-format
-#~ msgid "Use this form to manage custom_field records in your database."
+#~ msgid "This contribution type is automatically assigned to all new members. Can be changed individually per member."
 #~ msgstr ""
 #~ #: lib/mv_web/live/contribution_settings_live.ex
 #~ #, elixir-autogen, elixir-format
 #~ msgid "View Example Member"
 #~ msgstr ""
 #~ #: lib/mv_web/live/contribution_settings_live.ex
 #~ #, elixir-autogen, elixir-format
 #~ msgid "When active: Members pay from the period of their joining."
 #~ msgstr ""
 #~ #: lib/mv_web/live/contribution_settings_live.ex
 #~ #, elixir-autogen, elixir-format
 #~ msgid "When inactive: Members pay from the next full period after joining."
 #~ msgstr ""
 #~ #: lib/mv_web/live/contribution_settings_live.ex
 #~ #, elixir-autogen, elixir-format
 #~ msgid "Yearly Interval - Joining Period Excluded"
 #~ msgstr ""
 #~ #: lib/mv_web/live/contribution_settings_live.ex
 #~ #, elixir-autogen, elixir-format
 #~ msgid "Yearly Interval - Joining Period Included"
 #~ msgstr ""
--- a/priv/repo/seeds.exs
+++ b/priv/repo/seeds.exs
@ -5,6 +5,39 @@
 alias Mv.Membership
 alias Mv.Accounts
 alias Mv.MembershipFees.MembershipFeeType
 # Create example membership fee types
 for fee_type_attrs <- [
      %{
        name: "Standard (Jährlich)",
        amount: Decimal.new("120.00"),
        interval: :yearly,
        description: "Standard jährlicher Mitgliedsbeitrag"
      },
      %{
        name: "Standard (Halbjährlich)",
        amount: Decimal.new("65.00"),
        interval: :half_yearly,
        description: "Standard halbjährlicher Mitgliedsbeitrag"
      },
      %{
        name: "Standard (Vierteljährlich)",
        amount: Decimal.new("35.00"),
        interval: :quarterly,
        description: "Standard vierteljährlicher Mitgliedsbeitrag"
      },
      %{
        name: "Standard (Monatlich)",
        amount: Decimal.new("12.00"),
        interval: :monthly,
        description: "Standard monatlicher Mitgliedsbeitrag"
      }
    ] do
  MembershipFeeType
  |> Ash.Changeset.for_create(:create, fee_type_attrs)
  |> Ash.create!(upsert?: true, upsert_identity: :unique_name)
 end
 for attrs <- [
      # Basic example fields (for testing)
@ -320,6 +353,7 @@ end
 IO.puts("✅ Seeds completed successfully!")
 IO.puts("📝 Created sample data:")
 IO.puts("   - Global settings: club_name = #{default_club_name}")
 IO.puts("   - Membership fee types: 4 types (Yearly, Half-yearly, Quarterly, Monthly)")
 IO.puts("   - Custom fields: 12 fields (String, Date, Boolean, Email, + 8 realistic fields)")
 IO.puts("   - Admin user: admin@mv.local (password: testpassword)")
 IO.puts("   - Sample members: Hans, Greta, Friedrich")
--- a/test/membership/membership_fee_settings_test.exs
+++ b/test/membership/membership_fee_settings_test.exs
@ -0,0 +1,98 @@
 defmodule Mv.Membership.MembershipFeeSettingsTest do
  @moduledoc """
  Tests for membership fee settings in the Settings resource.
  """
  use Mv.DataCase, async: true
  alias Mv.Membership.Setting
  alias Mv.MembershipFees.MembershipFeeType
  describe "membership fee settings" do
    test "default values are correct" do
      {:ok, settings} = Mv.Membership.get_settings()
      assert settings.include_joining_cycle == true
    end
    test "settings can be read" do
      {:ok, settings} = Mv.Membership.get_settings()
      assert %Setting{} = settings
    end
    test "settings can be written via update_membership_fee_settings" do
      {:ok, settings} = Mv.Membership.get_settings()
      {:ok, updated} =
        settings
        |> Ash.Changeset.for_update(:update_membership_fee_settings, %{
          include_joining_cycle: false
        })
        |> Ash.update()
      assert updated.include_joining_cycle == false
    end
    test "default_membership_fee_type_id can be nil (optional)" do
      {:ok, settings} = Mv.Membership.get_settings()
      {:ok, updated} =
        settings
        |> Ash.Changeset.for_update(:update_membership_fee_settings, %{
          default_membership_fee_type_id: nil
        })
        |> Ash.update()
      assert updated.default_membership_fee_type_id == nil
    end
    test "default_membership_fee_type_id validation: must exist if set" do
      {:ok, settings} = Mv.Membership.get_settings()
      # Create a valid fee type
      {:ok, fee_type} =
        Ash.create(MembershipFeeType, %{
          name: "Test Fee Type #{System.unique_integer([:positive])}",
          amount: Decimal.new("100.00"),
          interval: :yearly
        })
      # Setting a valid fee type should work
      {:ok, updated} =
        settings
        |> Ash.Changeset.for_update(:update_membership_fee_settings, %{
          default_membership_fee_type_id: fee_type.id
        })
        |> Ash.update()
      assert updated.default_membership_fee_type_id == fee_type.id
    end
    test "default_membership_fee_type_id validation: fails if not found" do
      {:ok, settings} = Mv.Membership.get_settings()
      # Use a non-existent UUID
      fake_uuid = Ecto.UUID.generate()
      assert {:error, error} =
               settings
               |> Ash.Changeset.for_update(:update_membership_fee_settings, %{
                 default_membership_fee_type_id: fake_uuid
               })
               |> Ash.update()
      assert error_on_field?(error, :default_membership_fee_type_id)
    end
  end
  # Helper to check if an error occurred on a specific field
  defp error_on_field?(%Ash.Error.Invalid{} = error, field) do
    Enum.any?(error.errors, fn e ->
      case e do
        %{field: ^field} -> true
        %{fields: fields} when is_list(fields) -> field in fields
        _ -> false
      end
    end)
  end
  defp error_on_field?(_, _), do: false
 end
--- a/test/membership_fees/membership_fee_type_integration_test.exs
+++ b/test/membership_fees/membership_fee_type_integration_test.exs
@ -0,0 +1,221 @@
 defmodule Mv.MembershipFees.MembershipFeeTypeIntegrationTest do
  @moduledoc """
  Integration tests for MembershipFeeType CRUD operations.
  """
  use Mv.DataCase, async: false
  alias Mv.MembershipFees.MembershipFeeType
  alias Mv.MembershipFees.MembershipFeeCycle
  alias Mv.Membership.Member
  require Ash.Query
  # Helper to create a membership fee type
  defp create_fee_type(attrs) do
    default_attrs = %{
      name: "Test Fee Type #{System.unique_integer([:positive])}",
      amount: Decimal.new("50.00"),
      interval: :yearly
    }
    attrs = Map.merge(default_attrs, attrs)
    MembershipFeeType
    |> Ash.Changeset.for_create(:create, attrs)
    |> Ash.create!()
  end
  describe "admin can create membership fee type" do
    test "creates type with all fields" do
      attrs = %{
        name: "Standard Membership",
        amount: Decimal.new("120.00"),
        interval: :yearly,
        description: "Standard yearly membership fee"
      }
      assert {:ok, %MembershipFeeType{} = fee_type} = Ash.create(MembershipFeeType, attrs)
      assert fee_type.name == "Standard Membership"
      assert Decimal.equal?(fee_type.amount, Decimal.new("120.00"))
      assert fee_type.interval == :yearly
      assert fee_type.description == "Standard yearly membership fee"
    end
  end
  describe "admin can update membership fee type" do
    setup do
      {:ok, fee_type} =
        Ash.create(MembershipFeeType, %{
          name: "Original Name",
          amount: Decimal.new("100.00"),
          interval: :yearly,
          description: "Original description"
        })
      %{fee_type: fee_type}
    end
    test "can update name", %{fee_type: fee_type} do
      assert {:ok, updated} = Ash.update(fee_type, %{name: "Updated Name"})
      assert updated.name == "Updated Name"
    end
    test "can update amount", %{fee_type: fee_type} do
      assert {:ok, updated} = Ash.update(fee_type, %{amount: Decimal.new("150.00")})
      assert Decimal.equal?(updated.amount, Decimal.new("150.00"))
    end
    test "can update description", %{fee_type: fee_type} do
      assert {:ok, updated} = Ash.update(fee_type, %{description: "Updated description"})
      assert updated.description == "Updated description"
    end
    test "cannot update interval", %{fee_type: fee_type} do
      # Currently, interval is not in the accept list, so it's rejected as "NoSuchInput"
      # After implementing validation, it should return a validation error
      assert {:error, error} = Ash.update(fee_type, %{interval: :monthly})
      # For now, check that it's an error (either NoSuchInput or validation error)
      assert %Ash.Error.Invalid{} = error
    end
  end
  describe "admin cannot delete membership fee type when in use" do
    test "cannot delete when members are assigned" do
      fee_type = create_fee_type(%{interval: :yearly})
      # Create a member with this fee type
      {:ok, _member} =
        Ash.create(Member, %{
          first_name: "Test",
          last_name: "Member",
          email: "test.member.#{System.unique_integer([:positive])}@example.com",
          membership_fee_type_id: fee_type.id
        })
      assert {:error, error} = Ash.destroy(fee_type)
      error_message = extract_error_message(error)
      assert error_message =~ "member(s) are assigned"
    end
    test "cannot delete when cycles exist" do
      fee_type = create_fee_type(%{interval: :yearly})
      # Create a member with this fee type
      {:ok, member} =
        Ash.create(Member, %{
          first_name: "Test",
          last_name: "Member",
          email: "test.member.#{System.unique_integer([:positive])}@example.com",
          membership_fee_type_id: fee_type.id
        })
      # Create a cycle for this fee type
      {:ok, _cycle} =
        Ash.create(MembershipFeeCycle, %{
          cycle_start: ~D[2025-01-01],
          amount: Decimal.new("100.00"),
          member_id: member.id,
          membership_fee_type_id: fee_type.id
        })
      assert {:error, error} = Ash.destroy(fee_type)
      error_message = extract_error_message(error)
      assert error_message =~ "cycle(s) reference"
    end
    test "cannot delete when used as default in settings" do
      fee_type = create_fee_type(%{interval: :yearly})
      # Set as default in settings
      {:ok, settings} = Mv.Membership.get_settings()
      settings
      |> Ash.Changeset.for_update(:update_membership_fee_settings, %{
        default_membership_fee_type_id: fee_type.id
      })
      |> Ash.update!()
      # Try to delete
      assert {:error, error} = Ash.destroy(fee_type)
      error_message = extract_error_message(error)
      assert error_message =~ "used as default in settings"
    end
  end
  describe "settings integration" do
    test "default_membership_fee_type_id is used during member creation" do
      # Create a fee type
      fee_type = create_fee_type(%{interval: :yearly})
      # Set it as default in settings
      {:ok, settings} = Mv.Membership.get_settings()
      settings
      |> Ash.Changeset.for_update(:update_membership_fee_settings, %{
        default_membership_fee_type_id: fee_type.id
      })
      |> Ash.update!()
      # Create a member without explicitly setting membership_fee_type_id
      # Note: This test assumes that the Member resource automatically assigns
      # the default_membership_fee_type_id during creation. If this is not yet
      # implemented, this test will fail initially (which is expected in TDD).
      # For now, we skip this test as the auto-assignment feature is not yet implemented.
      {:ok, member} =
        Ash.create(Member, %{
          first_name: "Test",
          last_name: "Member",
          email: "test.member.#{System.unique_integer([:positive])}@example.com"
        })
      # TODO: When auto-assignment is implemented, uncomment this assertion
      # assert member.membership_fee_type_id == fee_type.id
      # For now, we just verify the member was created successfully
      assert %Member{} = member
    end
    test "include_joining_cycle is used during cycle generation" do
      # This test verifies that the include_joining_cycle setting affects
      # cycle generation. The actual cycle generation logic is tested in
      # CycleGeneratorTest, but this integration test ensures the setting
      # is properly used.
      fee_type = create_fee_type(%{interval: :yearly})
      # Set include_joining_cycle to false
      {:ok, settings} = Mv.Membership.get_settings()
      settings
      |> Ash.Changeset.for_update(:update_membership_fee_settings, %{
        include_joining_cycle: false
      })
      |> Ash.update!()
      # Create a member with join_date in the middle of a year
      {:ok, member} =
        Ash.create(Member, %{
          first_name: "Test",
          last_name: "Member",
          email: "test.member.#{System.unique_integer([:positive])}@example.com",
          join_date: ~D[2023-03-15],
          membership_fee_type_id: fee_type.id
        })
      # Verify that membership_fee_start_date was calculated correctly
      # (should be 2024-01-01, not 2023-01-01, because include_joining_cycle = false)
      assert member.membership_fee_start_date == ~D[2024-01-01]
    end
  end
  # Helper to extract error message from various error types
  defp extract_error_message(%Ash.Error.Invalid{} = error) do
    Enum.map_join(error.errors, " ", fn
      %{message: message} -> message
      %{detail: detail} -> detail
      _ -> ""
    end)
  end
  defp extract_error_message(_), do: ""
 end
--- a/test/membership_fees/membership_fee_type_test.exs
+++ b/test/membership_fees/membership_fee_type_test.exs
@ -155,6 +155,95 @@ defmodule Mv.MembershipFees.MembershipFeeTypeTest do
      assert {:ok, updated} = Ash.update(fee_type, %{description: nil})
      assert updated.description == nil
    end
    test "interval immutability: update fails when interval is changed", %{fee_type: fee_type} do
      # Currently, interval is not in the accept list, so it's rejected as "NoSuchInput"
      # After implementing validation, it should return a validation error
      assert {:error, error} = Ash.update(fee_type, %{interval: :monthly})
      # For now, check that it's an error (either NoSuchInput or validation error)
      assert %Ash.Error.Invalid{} = error
    end
  end
  describe "delete MembershipFeeType" do
    setup do
      {:ok, fee_type} =
        Ash.create(MembershipFeeType, %{
          name: "Test Fee Type #{System.unique_integer([:positive])}",
          amount: Decimal.new("100.00"),
          interval: :yearly
        })
      %{fee_type: fee_type}
    end
    test "can delete when not in use", %{fee_type: fee_type} do
      result = Ash.destroy(fee_type)
      # Ash.destroy returns :ok or {:ok, _} depending on version
      assert result == :ok or match?({:ok, _}, result)
    end
    test "cannot delete when members are assigned", %{fee_type: fee_type} do
      alias Mv.Membership.Member
      # Create a member with this fee type
      {:ok, _member} =
        Ash.create(Member, %{
          first_name: "Test",
          last_name: "Member",
          email: "test.member.#{System.unique_integer([:positive])}@example.com",
          membership_fee_type_id: fee_type.id
        })
      assert {:error, error} = Ash.destroy(fee_type)
      # Check for either validation error message or DB constraint error
      error_message = extract_error_message(error)
      assert error_message =~ "member" or error_message =~ "referenced"
    end
    test "cannot delete when cycles exist", %{fee_type: fee_type} do
      alias Mv.MembershipFees.MembershipFeeCycle
      alias Mv.Membership.Member
      # Create a member with this fee type
      {:ok, member} =
        Ash.create(Member, %{
          first_name: "Test",
          last_name: "Member",
          email: "test.member.#{System.unique_integer([:positive])}@example.com",
          membership_fee_type_id: fee_type.id
        })
      # Create a cycle for this fee type
      {:ok, _cycle} =
        Ash.create(MembershipFeeCycle, %{
          cycle_start: ~D[2025-01-01],
          amount: Decimal.new("100.00"),
          member_id: member.id,
          membership_fee_type_id: fee_type.id
        })
      assert {:error, error} = Ash.destroy(fee_type)
      # Check for either validation error message or DB constraint error
      error_message = extract_error_message(error)
      assert error_message =~ "cycle" or error_message =~ "referenced"
    end
    test "cannot delete when used as default in settings", %{fee_type: fee_type} do
      # Set as default in settings
      {:ok, settings} = Mv.Membership.get_settings()
      settings
      |> Ash.Changeset.for_update(:update_membership_fee_settings, %{
        default_membership_fee_type_id: fee_type.id
      })
      |> Ash.update!()
      # Try to delete
      assert {:error, error} = Ash.destroy(fee_type)
      error_message = extract_error_message(error)
      assert error_message =~ "used as default in settings"
    end
  end
  # Helper to check if an error occurred on a specific field
@ -169,4 +258,15 @@ defmodule Mv.MembershipFees.MembershipFeeTypeTest do
  end
  defp error_on_field?(_, _), do: false
  # Helper to extract error message from various error types
  defp extract_error_message(%Ash.Error.Invalid{} = error) do
    Enum.map_join(error.errors, " ", fn
      %{message: message} -> message
      %{detail: detail} -> detail
      _ -> ""
    end)
  end
  defp extract_error_message(_), do: ""
 end
Author	SHA1	Message	Date
Moritz	1b4154ee64	feat: add 4 example membership fee types to seed script All checks were successful continuous-integration/drone/push Build is passing Details	2025-12-16 17:26:41 +01:00
Moritz	ada43728d6	chore: update gettext	2025-12-16 17:26:41 +01:00
Moritz	53d7a91653	docs: document require_atomic? false in MembershipFeeType actions	2025-12-16 17:26:41 +01:00
Moritz	725bfec2ba	refactor: migrate MembershipFeeSettingsLive to AshPhoenix.Form	2025-12-16 17:26:40 +01:00
Moritz	6261d3b286	feat: improve error handling in settings validation for default_membership_fee_type_id	2025-12-16 17:26:40 +01:00
Moritz	d5e78774c5	feat: prevent deletion of membership fee type when used as default in settings	2025-12-16 17:26:40 +01:00
Moritz	c12e7fc3df	refactor: use Enum.map_join instead of Enum.map \|> Enum.join	2025-12-16 17:26:38 +01:00
Moritz	68261fa72a	fix: improve accessibility - WCAG 2 AA contrast and select label	2025-12-16 17:25:42 +01:00
Moritz	c698fc5d04	refactor: replace ContributionSettingsLive mockup with MembershipFeeSettingsLive in navigation	2025-12-16 17:25:41 +01:00
Moritz	4059395534	i18n: add German translations for membership fee settings	2025-12-16 17:25:37 +01:00
Moritz	cadb18c050	feat: implement full CRUD for membership fee types with settings UI - Add interval immutability and deletion prevention validations - Add settings validation for default_membership_fee_type_id - Create MembershipFeeSettingsLive for admin UI with form handling - Add comprehensive test coverage (unit, integration, settings)	2025-12-16 17:16:41 +01:00