Merge branch 'main' into issue/mitgliederverwaltung-420

Integrate current main (CSV import, GDPR join-form description, dependency and
tooling bumps) into the bulk-actions-dropdown feature. Gettext catalogs were
reconciled with mix gettext.extract --merge; the CHANGELOG Unreleased entries
of both sides were combined.

.tool-versions

@@ -1,3 +1,3 @@
 elixir 1.18.3-otp-27
 erlang 27.3.4
-just 1.50.0
+just 1.51.0

CHANGELOG.md

@@ -7,9 +7,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+- **GDPR/DSGVO join-form description** – Custom fields can carry a "join form description" that is shown as the field's label on the public join form, with clickable external links (whole URLs and Markdown `[text](url)`). Useful for presenting a GDPR confirmation with a link to an externally hosted privacy declaration before sign-up.
+- **Join-form description tooltip in member details** – Custom fields that have a join-form description show an info tooltip (prefixed "Beitrittsformular:") on their label in the member detail view.
+- **Editable join-form description** – Admins can set a field's join-form description in the custom-field settings, with an inline hint about the supported link syntax.
+- **CSV import – groups column** – Members can be assigned to groups during CSV import via a `Groups`/`Gruppen` column; group names that do not exist yet are created automatically, and re-importing the same file does not create duplicate groups.
+- **CSV import – membership fee type column** – A `Fee Type`/`Beitragsart` column assigns each member's membership fee type; an unknown name falls back to the default fee type and is flagged in the preview with a link to create it.
+- **CSV import – mapping preview** – After uploading a file, a preview shows how every column maps (with sample rows and warnings for ignored or unknown columns) and the import only starts once you confirm.
+- **Dynamic CSV import templates** – The EN and DE import-template downloads now include the association's current custom fields instead of a fixed column set.
+
 ### Changed
 - **Member bulk actions in one menu** – The actions above the member overview (open in email program, copy email addresses, export to CSV, export to PDF) are now collected in a single "Aktionen" dropdown instead of separate buttons. Without a selection they apply to all members, or to the currently filtered members; the trigger shows the active scope. Opening the email program is disabled when too many recipients are selected, with a hint to copy the addresses or use the export instead.
 - **Dropdown buttons** – Dropdown buttons (actions, filter, column visibility) now show a chevron so they are recognizable as menus.
+- **Default GDPR custom field** – The seeded GDPR field was shortened from "Datenschutzerklärung akzeptiert" to "DSGVO" and now ships with a default join-form description (with a placeholder link to replace).
+
+### Fixed
+- **CSV date round-trip** – Date custom-field values are now exported as ISO-8601 (`YYYY-MM-DD`), so an exported CSV can be re-imported without date-parsing errors.
+- **CSV import – fee-status columns ignored** – Columns such as `Bezahlstatus` / `Membership Fee Status` are always ignored on import and never stored as a custom-field value, even when a custom field of the same name exists.
 
 ## [1.2.0] - 2026-05-08
 

CODE_GUIDELINES.md

@@ -1363,6 +1363,8 @@ mix gettext.merge priv/gettext --on-obsolete=mark_as_obsolete
 
 ### 3.13 Task Runner: Just
 
+The `Justfile` prepends `~/.asdf/shims`, `~/.asdf/bin`, and `~/.asdf` to `PATH` for all recipes (`set export := true`), so `mix` / `elixir` resolve from `.tool-versions` without shell init. The caller's `PATH` is kept (e.g. Homebrew `asdf`, Docker). Run `asdf install` once per machine; no extra `source` is required for `just run`.
+
 **Common Commands:**
 
 ```bash

Justfile

@@ -1,11 +1,11 @@
 set dotenv-load := true
 set export := true
 
-# Non-interactive shells do not source .bashrc,
+# Prepend asdf paths so recipes work without sourcing ~/.asdf/asdf.sh in the shell.
-# PATH includes asdf shims so that mix / elixir / iex resolve without per-shell
+# Caller PATH is preserved (Homebrew asdf, docker CLI, etc.). See CODE_GUIDELINES §3.13.
-# `source ~/.asdf/asdf.sh`. Recipes inherit this via `set export := true`.
+home := env_var("HOME")
-home := env_var('HOME')
+asdf_paths := home + "/.asdf/shims:" + home + "/.asdf/bin:" + home + "/.asdf:"
-PATH := home + "/.asdf/shims:" + home + "/.asdf:" + home + "/.local/bin:/usr/local/bin:/usr/bin:/bin"
+PATH := asdf_paths + env_var("PATH")
 
 MIX_QUIET := "1"
 

docker-compose.prod.yml

@@ -33,7 +33,7 @@ services:
     restart: unless-stopped
 
   db-prod:
-    image: postgres:18.3-alpine
+    image: postgres:18.4-alpine
     container_name: mv-prod-db
     environment:
       POSTGRES_USER: postgres

docker-compose.yml

@@ -4,7 +4,7 @@ networks:
 
 services:
   db:
-    image: postgres:18.3-alpine
+    image: postgres:18.4-alpine
     environment:
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: postgres
@@ -25,7 +25,7 @@ services:
 
   rauthy:
     container_name: rauthy-dev
-    image: ghcr.io/sebadob/rauthy:0.35.1
+    image: ghcr.io/sebadob/rauthy:0.35.2
     environment:
       - LOCAL_TEST=true
       - SMTP_URL=mailcrab

lib/membership/custom_field.ex

@@ -12,6 +12,8 @@ defmodule Mv.Membership.CustomField do
   - `slug` - URL-friendly, immutable identifier automatically generated from name (e.g., "phone-mobile")
   - `value_type` - Data type constraint (`:string`, `:integer`, `:boolean`, `:date`, `:email`). Immutable after creation.
   - `description` - Optional human-readable description
+  - `join_description` - Optional label shown for this field on the public join form
+    (e.g., a GDPR confirmation text); supports inline external links. Falls back to `name` when nil.
   - `required` - If true, all members must have this custom field (future feature)
   - `show_in_overview` - If true, this custom field will be displayed in the member overview table and can be sorted
 
@@ -61,7 +63,14 @@ defmodule Mv.Membership.CustomField do
   end
 
   actions do
-    default_accept [:name, :value_type, :description, :required, :show_in_overview]
+    default_accept [
+      :name,
+      :value_type,
+      :description,
+      :join_description,
+      :required,
+      :show_in_overview
+    ]
 
     read :read do
       primary? true
@@ -69,13 +78,13 @@ defmodule Mv.Membership.CustomField do
     end
 
     create :create do
-      accept [:name, :value_type, :description, :required, :show_in_overview]
+      accept [:name, :value_type, :description, :join_description, :required, :show_in_overview]
       change Mv.Membership.Changes.GenerateSlug
       validate string_length(:slug, min: 1)
     end
 
     update :update do
-      accept [:name, :description, :required, :show_in_overview]
+      accept [:name, :description, :join_description, :required, :show_in_overview]
       require_atomic? false
 
       validate fn changeset, _context ->
@@ -139,6 +148,15 @@ defmodule Mv.Membership.CustomField do
         trim?: true
       ]
 
+    attribute :join_description, :string,
+      allow_nil?: true,
+      public?: true,
+      description: "Label shown for this field on the public join form; supports external links",
+      constraints: [
+        max_length: 1000,
+        trim?: true
+      ]
+
     attribute :required, :boolean,
       default: false,
       allow_nil?: false

lib/mv/membership/custom_field_value_formatter.ex

@@ -4,13 +4,13 @@ defmodule Mv.Membership.CustomFieldValueFormatter do
 
   Same logic as the member overview Formatter but without Gettext or web helpers,
   so it can be used from the Membership context. For boolean: "Yes"/"No";
-  for date: European format (dd.mm.yyyy).
+  for date: ISO-8601 (YYYY-MM-DD) so exported values can be re-imported.
   """
   @doc """
   Formats a custom field value for plain text (e.g. CSV).
 
   Handles nil, Ash.Union, JSONB map, and direct values. Uses custom_field.value_type
-  for typing. Boolean -> "Yes"/"No", Date -> dd.mm.yyyy.
+  for typing. Boolean -> "Yes"/"No", Date -> ISO-8601 (YYYY-MM-DD).
   """
   def format_custom_field_value(nil, _custom_field), do: ""
 
@@ -18,6 +18,10 @@ defmodule Mv.Membership.CustomFieldValueFormatter do
     format_value_by_type(value, type, custom_field)
   end
 
+  def format_custom_field_value(%Date{} = value, custom_field) do
+    format_value_by_type(value, :date, custom_field)
+  end
+
   def format_custom_field_value(value, custom_field) when is_map(value) do
     type = Map.get(value, "type") || Map.get(value, "_union_type")
     val = Map.get(value, "value") || Map.get(value, "_union_value")
@@ -41,12 +45,12 @@ defmodule Mv.Membership.CustomFieldValueFormatter do
   defp format_value_by_type(value, :boolean, _), do: to_string(value)
 
   defp format_value_by_type(%Date{} = date, :date, _) do
-    Calendar.strftime(date, "%d.%m.%Y")
+    Date.to_iso8601(date)
   end
 
   defp format_value_by_type(value, :date, _) when is_binary(value) do
     case Date.from_iso8601(value) do
-      {:ok, date} -> Calendar.strftime(date, "%d.%m.%Y")
+      {:ok, date} -> Date.to_iso8601(date)
       _ -> value
     end
   end

lib/mv/membership/import/column_resolver.ex

@@ -0,0 +1,258 @@
+defmodule Mv.Membership.Import.ColumnResolver do
+  @moduledoc """
+  Read-only resolution of CSV import columns against the database.
+
+  Given the `HeaderMapper.build_maps/2` result, the raw numbered rows, and an
+  actor, `resolve/3` determines:
+
+  - which group names in the groups column already exist (`groups_found`) and
+    which would have to be created (`groups_to_create`);
+  - a small set of preview rows for the mapping preview UI.
+
+  No database writes happen here; the resolver only reads. Group creation and
+  member-group assignment happen during processing via `create_or_find_group/3`.
+
+  This module has no Phoenix or web dependencies.
+  """
+
+  require Logger
+
+  alias Mv.Membership.Import.HeaderMapper
+
+  @preview_row_limit 3
+
+  @type numbered_row :: {pos_integer(), [String.t()]}
+
+  @type resolution :: %{
+          groups_found: [%{id: String.t(), name: String.t()}],
+          groups_to_create: [String.t()],
+          fee_type_map: %{String.t() => String.t()},
+          fee_type_warnings: [String.t()],
+          has_empty_fee_type_cells?: boolean(),
+          preview_rows: [[String.t()]]
+        }
+
+  @doc """
+  Resolves the group and fee-type columns of an import against the database and
+  extracts preview rows.
+
+  Returns a map with `:groups_found`, `:groups_to_create`, `:fee_type_map`,
+  `:fee_type_warnings`, `:has_empty_fee_type_cells?`, and `:preview_rows`.
+  """
+  @spec resolve(map(), [numbered_row()], term()) :: resolution()
+  def resolve(header_maps, rows, actor) do
+    %{
+      groups_found: groups_found,
+      groups_to_create: groups_to_create
+    } = resolve_groups(header_maps, rows, actor)
+
+    %{
+      fee_type_map: fee_type_map,
+      fee_type_warnings: fee_type_warnings,
+      has_empty_fee_type_cells?: has_empty_fee_type_cells?
+    } = resolve_fee_types(header_maps, rows, actor)
+
+    %{
+      groups_found: groups_found,
+      groups_to_create: groups_to_create,
+      fee_type_map: fee_type_map,
+      fee_type_warnings: fee_type_warnings,
+      has_empty_fee_type_cells?: has_empty_fee_type_cells?,
+      preview_rows: preview_rows(rows)
+    }
+  end
+
+  defp resolve_groups(%{groups_column_index: nil}, _rows, _actor) do
+    %{groups_found: [], groups_to_create: []}
+  end
+
+  defp resolve_groups(%{groups_column_index: index}, rows, actor) do
+    existing_groups = list_groups(actor)
+    lookup = build_group_lookup(existing_groups)
+
+    names = unique_group_names(rows, index)
+
+    {found, to_create} =
+      Enum.reduce(names, {[], []}, fn name, {found, to_create} ->
+        case Map.get(lookup, normalize_name(name)) do
+          nil -> {found, [name | to_create]}
+          group -> {[%{id: group.id, name: group.name} | found], to_create}
+        end
+      end)
+
+    %{groups_found: Enum.reverse(found), groups_to_create: Enum.reverse(to_create)}
+  end
+
+  defp resolve_fee_types(%{fee_type_column_index: nil}, _rows, _actor) do
+    %{fee_type_map: %{}, fee_type_warnings: [], has_empty_fee_type_cells?: false}
+  end
+
+  defp resolve_fee_types(%{fee_type_column_index: index}, rows, actor) do
+    lookup = build_fee_type_lookup(actor)
+
+    cells = Enum.map(rows, fn {_line, values} -> Enum.at(values, index) end)
+
+    has_empty? = Enum.any?(cells, &blank?/1)
+
+    {fee_type_map, warnings} =
+      cells
+      |> Enum.reject(&blank?/1)
+      |> Enum.uniq_by(&normalize_fee_type_name/1)
+      |> Enum.reduce({%{}, []}, fn name, {map, warnings} ->
+        case Map.get(lookup, normalize_fee_type_name(name)) do
+          nil -> {map, [String.trim(name) | warnings]}
+          id -> {Map.put(map, normalize_fee_type_name(name), id), warnings}
+        end
+      end)
+
+    %{
+      fee_type_map: fee_type_map,
+      fee_type_warnings: Enum.reverse(warnings),
+      has_empty_fee_type_cells?: has_empty?
+    }
+  end
+
+  @doc """
+  Normalizes a fee-type name using the same rules as CSV header normalization
+  (trim, lowercase, transliterate, drop hyphens and whitespace).
+  """
+  @spec normalize_fee_type_name(String.t() | nil) :: String.t()
+  def normalize_fee_type_name(name) when is_binary(name), do: HeaderMapper.normalize_header(name)
+  def normalize_fee_type_name(_), do: ""
+
+  defp build_fee_type_lookup(actor) do
+    actor
+    |> list_fee_types()
+    |> Enum.reduce(%{}, fn fee_type, acc ->
+      normalized = normalize_fee_type_name(fee_type.name)
+
+      if Map.has_key?(acc, normalized) do
+        Logger.warning(
+          "Multiple membership fee types normalize to #{inspect(normalized)}; using the first match for CSV import."
+        )
+
+        acc
+      else
+        Map.put(acc, normalized, fee_type.id)
+      end
+    end)
+  end
+
+  defp list_fee_types(actor) do
+    Mv.MembershipFees.list_membership_fee_types!(actor: actor)
+  end
+
+  defp blank?(nil), do: true
+  defp blank?(value) when is_binary(value), do: String.trim(value) == ""
+  defp blank?(_), do: false
+
+  @doc """
+  Finds an existing group by name (case-insensitive) or creates it.
+
+  Looks first in the pre-fetched `groups` list, then in the database (to catch
+  groups created earlier in the same import), and only creates a new group when
+  none is found. This keeps group resolution idempotent across re-imports.
+  """
+  @spec create_or_find_group(String.t(), [Mv.Membership.Group.t()], term()) ::
+          {:ok, Mv.Membership.Group.t()} | {:error, term()}
+  def create_or_find_group(name, groups, actor) when is_binary(name) do
+    trimmed = String.trim(name)
+    normalized = normalize_name(trimmed)
+
+    case find_group_in_list(groups, normalized) do
+      nil -> find_or_create_group(trimmed, normalized, actor)
+      group -> {:ok, group}
+    end
+  end
+
+  defp find_group_in_list(groups, normalized) do
+    Enum.find(groups, fn group -> normalize_name(group.name) == normalized end)
+  end
+
+  defp find_or_create_group(trimmed, normalized, actor) do
+    case fetch_group_by_normalized_name(normalized, actor) do
+      nil -> create_group(trimmed, normalized, actor)
+      group -> {:ok, group}
+    end
+  end
+
+  # Normalizes the Ash code-interface return to a two-shape result.
+  #
+  # On a create failure the group may have been created concurrently by another
+  # import session between our read and our write (the DB unique index is the
+  # final arbiter, and the name validation is fail-open). Re-fetch by normalized
+  # name and link to the existing group rather than failing the row.
+  defp create_group(name, normalized, actor) do
+    case Mv.Membership.create_group(%{name: name}, actor: actor) do
+      {:ok, %Mv.Membership.Group{} = group} ->
+        {:ok, group}
+
+      {:error, reason} ->
+        case fetch_group_by_normalized_name(normalized, actor) do
+          nil -> {:error, reason}
+          group -> {:ok, group}
+        end
+    end
+  end
+
+  # Fetches a single group by case-insensitive name using a name-filtered query
+  # rather than reading the whole groups table. `normalized` is the trimmed,
+  # lower-cased name; the DB comparison uses LOWER(name) consistent with the
+  # Group resource's case-insensitive uniqueness constraint.
+  defp fetch_group_by_normalized_name(normalized, actor) do
+    require Ash.Query
+
+    Mv.Membership.Group
+    |> Ash.Query.filter(fragment("LOWER(?) = ?", name, ^normalized))
+    |> Ash.read(actor: actor, domain: Mv.Membership)
+    |> case do
+      {:ok, [group | _]} -> group
+      _ -> nil
+    end
+  end
+
+  @doc """
+  Splits a raw groups-cell value into trimmed, non-empty group names.
+  """
+  @spec split_group_names(String.t() | nil) :: [String.t()]
+  def split_group_names(nil), do: []
+
+  def split_group_names(cell) when is_binary(cell) do
+    cell
+    |> String.split(",")
+    |> Enum.map(&String.trim/1)
+    |> Enum.reject(&(&1 == ""))
+  end
+
+  defp unique_group_names(rows, index) do
+    rows
+    |> Enum.flat_map(fn {_line, values} ->
+      values
+      |> Enum.at(index)
+      |> split_group_names()
+    end)
+    |> Enum.uniq_by(&normalize_name/1)
+  end
+
+  defp preview_rows(rows) do
+    rows
+    |> Enum.take(@preview_row_limit)
+    |> Enum.map(fn {_line, values} -> values end)
+  end
+
+  defp list_groups(actor) do
+    Mv.Membership.list_groups!(actor: actor)
+  end
+
+  defp build_group_lookup(groups) do
+    Enum.reduce(groups, %{}, fn group, acc ->
+      Map.put(acc, normalize_name(group.name), group)
+    end)
+  end
+
+  # Case-insensitive comparison consistent with the Group resource's
+  # case-insensitive name uniqueness.
+  defp normalize_name(name) when is_binary(name) do
+    name |> String.trim() |> String.downcase()
+  end
+end

lib/mv/membership/import/header_mapper.ex

@@ -29,12 +29,21 @@ defmodule Mv.Membership.Import.HeaderMapper do
 
   Supports English and German header variants (e.g. "Email" / "E-Mail", "Join Date" / "Beitrittsdatum").
 
+  ## Special columns
+
+  - **groups** – Many-to-many relationship (through member_groups). Recognized via the
+    `groups_column_index` key (headers `Groups`, `Gruppen`, `Gruppe`). Comma-separated
+    names are resolved during processing; missing groups are auto-created.
+  - **membership_fee_type** – Recognized via the `fee_type_column_index` key (headers
+    `Fee Type`, `fee_type`, `membership_fee_type`, `Beitragsart`). Names are matched to
+    existing fee types; unknown names fall back to the default fee type.
+
   ## Fields not supported for import
 
   - **membership_fee_status** – Computed (calculation from membership fee cycles). Not stored;
-    cannot be set via CSV. Export can include it.
+    cannot be set via CSV. Export can include it. Fee-status header variants
-  - **groups** – Many-to-many relationship (through member_groups). Import would require
+    (`Membership Fee Status`, `Bezahlstatus`, `Mitgliedsbeitragsstatus`) are explicitly
-    resolving group names/slugs to IDs and creating associations; not in current import scope.
+    placed in the `ignored` list and never mapped.
 
   ## Custom Field Detection
 
@@ -47,10 +56,10 @@ defmodule Mv.Membership.Import.HeaderMapper do
       "e-mail"
 
       iex> HeaderMapper.build_maps(["Email", "First Name"], [])
-      {:ok, %{member: %{email: 0, first_name: 1}, custom: %{}, unknown: []}}
+      {:ok, %{member: %{email: 0, first_name: 1}, custom: %{}, unknown: [], ignored: [], groups_column_index: nil, fee_type_column_index: nil}}
 
       iex> HeaderMapper.build_maps(["Email", "CustomField"], [%{id: "cf1", name: "CustomField"}])
-      {:ok, %{member: %{email: 0}, custom: %{"cf1" => 1}, unknown: []}}
+      {:ok, %{member: %{email: 0}, custom: %{"cf1" => 1}, unknown: [], ignored: [], groups_column_index: nil, fee_type_column_index: nil}}
   """
 
   @type column_map :: %{atom() => non_neg_integer()}
@@ -60,6 +69,33 @@ defmodule Mv.Membership.Import.HeaderMapper do
   # Required member fields
   @required_member_fields [:email]
 
+  # Fee-status header variants that must never be imported (computed/read-only field).
+  # Stored already-normalized; checked before member, custom, groups, and fee-type mapping.
+  # Maintain this list when new locale translations for fee-status are added.
+  @ignored_normalized [
+    "membershipfeestatus",
+    "mitgliedsbeitragsstatus",
+    "bezahlstatus",
+    # DE export label for membership_fee_start_date — system-managed, not importable
+    "startdatummitgliedsbeitrag"
+  ]
+
+  # Normalized header variants for the groups column. The column is resolved to
+  # group associations during import; it is never a member or custom field.
+  @groups_column_normalized [
+    "groups",
+    "gruppen",
+    "gruppe"
+  ]
+
+  # Normalized header variants for the membership fee-type column. The column is
+  # resolved to a MembershipFeeType during import; it is never a member or custom field.
+  @fee_type_column_normalized [
+    "membershipfeetype",
+    "feetype",
+    "beitragsart"
+  ]
+
   # Canonical member fields with their raw variants
   # These will be normalized at runtime when building the lookup map
   @member_field_variants_raw %{
@@ -239,30 +275,79 @@ defmodule Mv.Membership.Import.HeaderMapper do
 
   ## Returns
 
-  - `{:ok, %{member: column_map, custom: custom_field_map, unknown: unknown_headers}}` on success
+  - `{:ok, %{member: column_map, custom: custom_field_map, unknown: unknown_headers,
+    ignored: [non_neg_integer], groups_column_index: non_neg_integer | nil,
+    fee_type_column_index: non_neg_integer | nil}}` on success
   - `{:error, reason}` on error (missing required field, duplicate headers)
 
+  The `ignored` list holds the indices of fee-status columns (computed/read-only),
+  which are never mapped to member or custom fields.
+
   ## Examples
 
       iex> build_maps(["Email", "First Name"], [])
-      {:ok, %{member: %{email: 0, first_name: 1}, custom: %{}, unknown: []}}
+      {:ok, %{member: %{email: 0, first_name: 1}, custom: %{}, unknown: [], ignored: [], groups_column_index: nil, fee_type_column_index: nil}}
 
       iex> build_maps(["Email", "CustomField"], [%{id: "cf1", name: "CustomField"}])
-      {:ok, %{member: %{email: 0}, custom: %{"cf1" => 1}, unknown: []}}
+      {:ok, %{member: %{email: 0}, custom: %{"cf1" => 1}, unknown: [], ignored: [], groups_column_index: nil, fee_type_column_index: nil}}
 
   """
   @spec build_maps([String.t()], [map()]) ::
-          {:ok, %{member: column_map(), custom: custom_field_map(), unknown: unknown_headers()}}
+          {:ok,
+           %{
+             member: column_map(),
+             custom: custom_field_map(),
+             unknown: unknown_headers(),
+             ignored: [non_neg_integer()],
+             groups_column_index: non_neg_integer() | nil,
+             fee_type_column_index: non_neg_integer() | nil
+           }}
           | {:error, String.t()}
   def build_maps(headers, custom_fields) when is_list(headers) and is_list(custom_fields) do
-    with {:ok, member_map, unknown_after_member} <- build_member_map(headers),
+    ignored = ignored_indices(headers)
+    groups_column_index = first_matching_index(headers, @groups_column_normalized)
+    fee_type_column_index = first_matching_index(headers, @fee_type_column_normalized)
+
+    reserved =
+      [groups_column_index, fee_type_column_index | ignored]
+      |> Enum.reject(&is_nil/1)
+      |> MapSet.new()
+
+    with {:ok, member_map, unknown_after_member} <- build_member_map(headers, reserved),
          {:ok, custom_map, unknown_after_custom} <-
            build_custom_field_map(headers, unknown_after_member, custom_fields, member_map) do
       unknown = Enum.map(unknown_after_custom, &Enum.at(headers, &1))
-      {:ok, %{member: member_map, custom: custom_map, unknown: unknown}}
+
+      {:ok,
+       %{
+         member: member_map,
+         custom: custom_map,
+         unknown: unknown,
+         ignored: ignored,
+         groups_column_index: groups_column_index,
+         fee_type_column_index: fee_type_column_index
+       }}
     end
   end
 
+  # Returns the index of the first header whose normalized form is in `variants`,
+  # or nil if none match.
+  defp first_matching_index(headers, variants) do
+    headers
+    |> Enum.with_index()
+    |> Enum.find_value(fn {header, index} ->
+      if normalize_header(header) in variants, do: index
+    end)
+  end
+
+  # Returns the column indices whose normalized header is in the fee-status ignore list.
+  defp ignored_indices(headers) do
+    headers
+    |> Enum.with_index()
+    |> Enum.filter(fn {header, _index} -> normalize_header(header) in @ignored_normalized end)
+    |> Enum.map(fn {_header, index} -> index end)
+  end
+
   # --- Private Functions ---
 
   # Transliterates German umlauts and special characters
@@ -304,13 +389,14 @@ defmodule Mv.Membership.Import.HeaderMapper do
     |> String.replace(" ", "")
   end
 
-  # Builds member field column map
+  # Builds member field column map, skipping reserved (e.g. ignored) indices.
-  defp build_member_map(headers) do
+  defp build_member_map(headers, reserved) do
     result =
       headers
       |> Enum.with_index()
       |> Enum.reduce_while({%{}, []}, fn {header, index}, {acc_map, acc_unknown} ->
-        normalized = normalize_header(header)
+        normalized =
+          if MapSet.member?(reserved, index), do: "", else: normalize_header(header)
 
         case process_member_header(header, index, normalized, acc_map, %{}) do
           {:error, reason} ->

lib/mv/membership/import/import_runner.ex

@@ -80,7 +80,7 @@ defmodule Mv.Membership.Import.ImportRunner do
     all_errors = progress.errors ++ chunk_result.errors
     new_errors = Enum.take(all_errors, max_errors)
     errors_truncated? = length(all_errors) > max_errors
-    new_warnings = progress.warnings ++ Map.get(chunk_result, :warnings, [])
+    new_warnings = Enum.uniq(progress.warnings ++ Map.get(chunk_result, :warnings, []))
 
     chunks_processed = current_chunk_idx + 1
     new_status = if chunks_processed >= progress.total_chunks, do: :done, else: :running
@@ -97,6 +97,20 @@ defmodule Mv.Membership.Import.ImportRunner do
     }
   end
 
+  @doc """
+  Carries the in-memory group snapshot grown by a chunk back into `import_state`
+  so the next chunk reuses groups created earlier instead of re-reading the
+  Group table. When the chunk result omits `groups_found`, the state is returned
+  unchanged.
+  """
+  @spec carry_groups_forward(map(), map()) :: map()
+  def carry_groups_forward(import_state, chunk_result) do
+    case Map.fetch(chunk_result, :groups_found) do
+      {:ok, groups_found} -> Map.put(import_state, :groups_found, groups_found)
+      :error -> import_state
+    end
+  end
+
   @doc """
   Returns the next action after processing a chunk: send the next chunk index or done.
   """

lib/mv/membership/import/member_csv.ex

@@ -6,7 +6,7 @@ defmodule Mv.Membership.Import.MemberCSV do
 
   This module provides the core API for CSV member import functionality:
   - `prepare/2` - Parses and validates CSV content, returns import state
-  - `process_chunk/3` - Processes a chunk of rows and creates members
+  - `process_chunk/4` - Processes a chunk of rows and creates members
 
   ## Error Handling
 
@@ -22,13 +22,24 @@ defmodule Mv.Membership.Import.MemberCSV do
   - `column_map` - Map of canonical field names to column indices
   - `custom_field_map` - Map of custom field names to column indices
   - `warnings` - List of warning messages (e.g., unknown custom field columns)
+  - `headers` - The raw CSV header row
+  - `ignored` - Header names of ignored (fee-status) columns
+  - `groups_column_index` / `fee_type_column_index` - Indices for resolved columns (or nil)
+  - `groups_found` / `groups_to_create` - Existing and to-be-created groups from the preview
+  - `fee_type_map` - Normalized fee-type name to id, for matched fee types
+  - `fee_type_warnings` - Unmatched fee-type names surfaced in the preview
+  - `has_empty_fee_type_cells?` - Whether any fee-type cell is blank (default applies)
+  - `preview_rows` - Up to 3 sample data rows for the mapping preview
 
   ## Chunk Results
 
-  The `chunk_result` returned by `process_chunk/3` contains:
+  The `chunk_result` returned by `process_chunk/4` contains:
   - `inserted` - Number of successfully created members
   - `failed` - Number of failed member creations
   - `errors` - List of `%MemberCSV.Error{}` structs (capped at 50 per import)
+  - `groups_found` - The in-memory group snapshot grown while processing this
+    chunk; thread it into the next chunk's `:groups_found` opt so groups created
+    in an earlier chunk are reused without re-reading the Group table
 
   ## Examples
 
@@ -37,7 +48,9 @@ defmodule Mv.Membership.Import.MemberCSV do
 
       # Process first chunk
       chunk = Enum.at(import_state.chunks, 0)
-      {:ok, result} = MemberCSV.process_chunk(chunk, import_state.column_map)
+
+      {:ok, result} =
+        MemberCSV.process_chunk(chunk, import_state.column_map, import_state.custom_field_map, [])
   """
 
   defmodule Error do
@@ -66,16 +79,29 @@ defmodule Mv.Membership.Import.MemberCSV do
           custom_field_lookup: %{
             String.t() => %{id: String.t(), value_type: atom(), name: String.t()}
           },
-          warnings: list(String.t())
+          warnings: list(String.t()),
+          headers: list(String.t()),
+          ignored: list(String.t()),
+          groups_column_index: non_neg_integer() | nil,
+          fee_type_column_index: non_neg_integer() | nil,
+          groups_found: list(%{id: String.t(), name: String.t()}),
+          groups_to_create: list(String.t()),
+          fee_type_map: %{String.t() => String.t()},
+          fee_type_warnings: list(String.t()),
+          has_empty_fee_type_cells?: boolean(),
+          preview_rows: list(list(String.t()))
         }
 
   @type chunk_result :: %{
           inserted: non_neg_integer(),
           failed: non_neg_integer(),
           errors: list(Error.t()),
-          errors_truncated?: boolean()
+          errors_truncated?: boolean(),
+          warnings: list(String.t()),
+          groups_found: list(Mv.Membership.Group.t() | %{id: String.t(), name: String.t()})
         }
 
+  alias Mv.Membership.Import.ColumnResolver
   alias Mv.Membership.Import.CsvParser
   alias Mv.Membership.Import.HeaderMapper
 
@@ -139,13 +165,27 @@ defmodule Mv.Membership.Import.MemberCSV do
       # Build custom field lookup for efficient value processing
       custom_field_lookup = build_custom_field_lookup(custom_fields)
 
+      # Resolve DB-backed columns (groups, fee types) read-only for the preview.
+      resolution = ColumnResolver.resolve(maps, rows, actor)
+      ignored_headers = Enum.map(maps.ignored, &Enum.at(headers, &1))
+
       {:ok,
        %{
          chunks: chunks,
          column_map: maps.member,
          custom_field_map: maps.custom,
          custom_field_lookup: custom_field_lookup,
-         warnings: warnings
+         warnings: warnings,
+         headers: headers,
+         ignored: ignored_headers,
+         groups_column_index: maps.groups_column_index,
+         fee_type_column_index: maps.fee_type_column_index,
+         groups_found: resolution.groups_found,
+         groups_to_create: resolution.groups_to_create,
+         fee_type_map: resolution.fee_type_map,
+         fee_type_warnings: resolution.fee_type_warnings,
+         has_empty_fee_type_cells?: resolution.has_empty_fee_type_cells?,
+         preview_rows: resolution.preview_rows
        }}
     end
   end
@@ -180,7 +220,7 @@ defmodule Mv.Membership.Import.MemberCSV do
       end)
 
     case HeaderMapper.build_maps(headers, custom_field_maps) do
-      {:ok, %{member: member_map, custom: custom_map, unknown: unknown}} ->
+      {:ok, %{unknown: unknown} = maps} ->
         # Build warnings for unknown custom field columns
         warnings =
           unknown
@@ -197,7 +237,7 @@ defmodule Mv.Membership.Import.MemberCSV do
             )
           end)
 
-        {:ok, %{member: member_map, custom: custom_map}, warnings}
+        {:ok, maps, warnings}
 
       {:error, reason} ->
         {:error, reason}
@@ -250,9 +290,20 @@ defmodule Mv.Membership.Import.MemberCSV do
         Map.put(acc, custom_field_id, value)
       end)
 
-    %{member: member_map, custom: custom_map}
+    %{
+      member: member_map,
+      custom: custom_map,
+      fee_type: cell_at(row_tuple, tuple_size, maps.fee_type_column_index),
+      groups: cell_at(row_tuple, tuple_size, maps.groups_column_index)
+    }
   end
 
+  # Returns the raw cell at the given index, or nil if the column is absent.
+  defp cell_at(_row_tuple, _size, nil), do: nil
+
+  defp cell_at(row_tuple, size, index) when index < size, do: elem(row_tuple, index)
+  defp cell_at(_row_tuple, _size, _index), do: ""
+
   @doc """
   Processes a chunk of CSV rows and creates members.
 
@@ -268,12 +319,18 @@ defmodule Mv.Membership.Import.MemberCSV do
   - `chunk_rows_with_lines` - List of tuples `{csv_line_number, row_map}` where:
     - `csv_line_number` - Physical line number in CSV (1-based)
     - `row_map` - Map with `:member` and `:custom` keys containing field values
-  - `column_map` - Map of canonical field names (atoms) to column indices (for reference)
+  - `column_map` - Unused; kept for backward-compatible call sites. Field values are
-  - `custom_field_map` - Map of custom field IDs (strings) to column indices (for reference)
+    read from each row's pre-built `:member`/`:custom` maps, not from this argument.
+  - `custom_field_map` - Unused; kept for backward-compatible call sites (see above).
   - `opts` - Optional keyword list for processing options:
     - `:custom_field_lookup` - Map of custom field IDs to metadata (default: `%{}`)
     - `:existing_error_count` - Number of errors already collected in previous chunks (default: `0`)
     - `:max_errors` - Maximum number of errors to collect per import overall (default: `50`)
+    - `:actor` - Actor used for all writes (default: the system actor)
+    - `:fee_type_map` - Map of normalized fee-type name to fee-type id, used to resolve
+      each row's fee-type cell (default: `%{}`)
+    - `:groups_found` - List of pre-fetched `Group` structs seeding in-memory group
+      resolution; the snapshot grows as groups are auto-created (default: `[]`)
 
   ## Error Capping
 
@@ -312,27 +369,49 @@ defmodule Mv.Membership.Import.MemberCSV do
     existing_error_count = Keyword.get(opts, :existing_error_count, 0)
     max_errors = Keyword.get(opts, :max_errors, @default_max_errors)
     actor = Keyword.get(opts, :actor, SystemActor.get_system_actor())
+    fee_type_map = Keyword.get(opts, :fee_type_map, %{})
+    groups_found = Keyword.get(opts, :groups_found, [])
 
-    {inserted, failed, errors, _collected_error_count, truncated?} =
+    base_row_opts = %{
-      Enum.reduce(chunk_rows_with_lines, {0, 0, [], 0, false}, fn {line_number, row_map},
+      custom_field_lookup: custom_field_lookup,
-                                                                  {acc_inserted, acc_failed,
+      fee_type_map: fee_type_map,
-                                                                   acc_errors, acc_error_count,
+      actor: actor
-                                                                   acc_truncated?} ->
+    }
+
+    {inserted, failed, errors, _collected_error_count, truncated?, warnings, groups_acc} =
+      Enum.reduce(chunk_rows_with_lines, {0, 0, [], 0, false, [], groups_found}, fn {line_number,
+                                                                                     row_map},
+                                                                                    {acc_inserted,
+                                                                                     acc_failed,
+                                                                                     acc_errors,
+                                                                                     acc_error_count,
+                                                                                     acc_truncated?,
+                                                                                     acc_warnings,
+                                                                                     acc_groups} ->
         current_error_count = existing_error_count + acc_error_count
+        row_opts = Map.put(base_row_opts, :groups_found, acc_groups)
 
-        case process_row(row_map, line_number, custom_field_lookup, actor) do
+        case process_row(row_map, line_number, row_opts) do
-          {:ok, _member} ->
+          {:ok, _member, row_warnings, new_groups} ->
+            {new_inserted, new_failed, new_errors, new_error_count, new_truncated?} =
               update_inserted(
                 {acc_inserted, acc_failed, acc_errors, acc_error_count, acc_truncated?}
               )
 
-          {:error, error} ->
+            {new_inserted, new_failed, new_errors, new_error_count, new_truncated?,
+             acc_warnings ++ row_warnings, new_groups}
+
+          {:error, error, new_groups} ->
+            {new_inserted, new_failed, new_errors, new_error_count, new_truncated?} =
               handle_row_error(
                 {acc_inserted, acc_failed, acc_errors, acc_error_count, acc_truncated?},
                 error,
                 current_error_count,
                 max_errors
               )
+
+            {new_inserted, new_failed, new_errors, new_error_count, new_truncated?, acc_warnings,
+             new_groups}
         end
       end)
 
@@ -341,7 +420,9 @@ defmodule Mv.Membership.Import.MemberCSV do
        inserted: inserted,
        failed: failed,
        errors: Enum.reverse(errors),
-       errors_truncated?: truncated?
+       errors_truncated?: truncated?,
+       warnings: warnings,
+       groups_found: groups_acc
      }}
   end
 
@@ -505,18 +586,27 @@ defmodule Mv.Membership.Import.MemberCSV do
 
   defp gettext_error_message(_), do: gettext("Email is invalid.")
 
-  # Processes a single row and creates member with custom field values
+  # Processes a single row and creates member with custom field values.
+  # On success returns {:ok, member, warnings, groups}; warnings carry non-fatal
+  # notices such as an unresolved fee-type name. The returned groups list is the
+  # accumulated in-memory group snapshot (seeded from the chunk, grown with any
+  # group created while linking this row) so later rows reuse it instead of
+  # re-reading the whole Group table per row.
   defp process_row(
          row_map,
          line_number,
-         custom_field_lookup,
+         %{
-         actor
+           custom_field_lookup: custom_field_lookup,
+           fee_type_map: fee_type_map,
+           groups_found: groups_found,
+           actor: actor
+         } = _row_opts
        ) do
     # Validate row before database insertion
     case validate_row(row_map, line_number, []) do
       {:error, error} ->
         # Return validation error immediately, no DB insert attempted
-        {:error, error}
+        {:error, error, groups_found}
 
       {:ok, %{member: trimmed_member_attrs, custom: custom_attrs}} ->
         # Prepare custom field values for Ash
@@ -524,20 +614,119 @@ defmodule Mv.Membership.Import.MemberCSV do
           {:error, validation_errors} ->
             # Custom field validation errors - return first error
             first_error = List.first(validation_errors)
-            {:error, %Error{csv_line_number: line_number, field: nil, message: first_error}}
+
+            {:error, %Error{csv_line_number: line_number, field: nil, message: first_error},
+             groups_found}
 
           {:ok, custom_field_values} ->
-            create_member_with_custom_fields(
+            {fee_attrs, warnings} =
-              trimmed_member_attrs,
+              resolve_fee_type_attrs(Map.get(row_map, :fee_type), fee_type_map)
+
+            create_member_and_assign_groups(
+              Map.merge(trimmed_member_attrs, fee_attrs),
               custom_field_values,
+              Map.get(row_map, :groups),
+              groups_found,
               line_number,
-              actor
+              actor,
+              warnings
             )
         end
     end
   rescue
     e ->
-      {:error, %Error{csv_line_number: line_number, field: nil, message: Exception.message(e)}}
+      {:error, %Error{csv_line_number: line_number, field: nil, message: Exception.message(e)},
+       groups_found}
+  end
+
+  # Creates the member, then assigns groups as a post-creation step. A group
+  # assignment failure fails the row (the member was already created, but the
+  # row is reported as failed so the operator can act on it).
+  defp create_member_and_assign_groups(
+         member_attrs,
+         custom_field_values,
+         groups_cell,
+         groups_found,
+         line_number,
+         actor,
+         warnings
+       ) do
+    case create_member_with_custom_fields(
+           member_attrs,
+           custom_field_values,
+           line_number,
+           actor,
+           warnings
+         ) do
+      {:ok, member, member_warnings} ->
+        assign_groups(member, groups_cell, groups_found, line_number, actor, member_warnings)
+
+      {:error, error} ->
+        {:error, error, groups_found}
+    end
+  end
+
+  # Assigns the member to all groups listed in the cell, creating missing groups.
+  # Returns the (possibly grown) group snapshot so the caller can reuse it.
+  defp assign_groups(member, groups_cell, groups_found, line_number, actor, warnings) do
+    names = ColumnResolver.split_group_names(groups_cell)
+
+    Enum.reduce_while(names, {:ok, member, warnings, groups_found}, fn name,
+                                                                       {:ok, _m, _w, acc_groups} ->
+      case link_member_to_group(member, name, acc_groups, actor) do
+        {:ok, group} ->
+          {:cont, {:ok, member, warnings, add_group(acc_groups, group)}}
+
+        {:error, reason} ->
+          {:halt,
+           {:error,
+            %Error{
+              csv_line_number: line_number,
+              field: nil,
+              message: gettext("Group assignment failed: %{reason}", reason: inspect(reason))
+            }, acc_groups}}
+      end
+    end)
+  end
+
+  defp add_group(groups, group) do
+    if Enum.any?(groups, &(&1.id == group.id)), do: groups, else: [group | groups]
+  end
+
+  defp link_member_to_group(member, name, groups_found, actor) do
+    with {:ok, group} <- ColumnResolver.create_or_find_group(name, groups_found, actor),
+         {:ok, _member_group} <-
+           Mv.Membership.create_member_group(
+             %{member_id: member.id, group_id: group.id},
+             actor: actor
+           ) do
+      {:ok, group}
+    end
+  end
+
+  # Resolves the fee-type cell into member attrs plus optional warnings.
+  # Empty cell -> default fee type (SetDefaultMembershipFeeType), no warning.
+  # Matched name -> membership_fee_type_id attr.
+  # Unmatched name -> no attr (default applies), warning naming the value.
+  defp resolve_fee_type_attrs(nil, _fee_type_map), do: {%{}, []}
+
+  defp resolve_fee_type_attrs(cell, fee_type_map) when is_binary(cell) do
+    trimmed = String.trim(cell)
+
+    if trimmed == "" do
+      {%{}, []}
+    else
+      case Map.get(fee_type_map, ColumnResolver.normalize_fee_type_name(trimmed)) do
+        nil ->
+          {%{},
+           [
+             gettext("Fee type '%{name}' not found; using the default fee type.", name: trimmed)
+           ]}
+
+        fee_type_id ->
+          {%{membership_fee_type_id: fee_type_id}, []}
+      end
+    end
   end
 
   # Creates a member with custom field values, handling errors appropriately
@@ -545,7 +734,8 @@ defmodule Mv.Membership.Import.MemberCSV do
          trimmed_member_attrs,
          custom_field_values,
          line_number,
-         actor
+         actor,
+         warnings
        ) do
     # Convert empty strings to nil for date fields so Ash accepts them
     member_attrs = sanitize_date_fields(trimmed_member_attrs)
@@ -565,7 +755,7 @@ defmodule Mv.Membership.Import.MemberCSV do
 
     case Mv.Membership.create_member(final_attrs, actor: actor) do
       {:ok, member} ->
-        {:ok, member}
+        {:ok, member, warnings}
 
       {:error, %Ash.Error.Invalid{} = error} ->
         # Extract email from final_attrs for better error messages

lib/mv_web/controllers/import_template_controller.ex

@@ -0,0 +1,120 @@
+defmodule MvWeb.ImportTemplateController do
+  @moduledoc """
+  Serves CSV import templates generated on the fly from the current custom fields.
+
+  Two actions provide an English (`en/2`) and a German (`de/2`) template. Each
+  template has a single header row listing the standard member columns followed
+  by every existing custom field name (exact match, as the import expects), plus
+  the importable groups and fee-type columns. A single placeholder example row is
+  included to illustrate the format.
+
+  Both actions require the same authorization as the import page
+  (`can?(:create, Member)`); unauthorized requests are rejected.
+  """
+  use MvWeb, :controller
+
+  alias Mv.Authorization.Actor
+  alias Mv.Membership.Member
+  alias Mv.Membership.MembersCSV
+  alias MvWeb.Authorization
+
+  # Standard member columns in template order, with their English and German headers
+  # and a placeholder example value. Groups and fee type are importable extras.
+  @columns [
+    {"first name", "Vorname", "John", "Max"},
+    {"last name", "Nachname", "Doe", "Mustermann"},
+    {"email", "E-Mail", "john.doe@example.com", "max.mustermann@example.com"},
+    {"country", "Land", "Germany", "Deutschland"},
+    {"city", "Stadt", "Berlin", "Berlin"},
+    {"street", "Straße", "Main Street", "Hauptstraße"},
+    {"house number", "Hausnummer", "1a", "12"},
+    {"postal_code", "PLZ", "12345", "10115"},
+    {"join_date", "Beitrittsdatum", "2020-01-15", "2020-01-15"},
+    {"exit_date", "Austrittsdatum", "", ""},
+    {"notes", "Notizen", "", ""},
+    {"membership_fee_start_date", "Beitragsbeginn", "", ""},
+    {"Groups", "Gruppen", "", ""},
+    {"Fee Type", "Beitragsart", "", ""}
+  ]
+
+  @spec en(Plug.Conn.t(), map()) :: Plug.Conn.t()
+  def en(conn, _params) do
+    serve_template(conn, :en, "member_import_en.csv")
+  end
+
+  @spec de(Plug.Conn.t(), map()) :: Plug.Conn.t()
+  def de(conn, _params) do
+    serve_template(conn, :de, "member_import_de.csv")
+  end
+
+  defp serve_template(conn, locale, filename) do
+    actor = current_actor(conn)
+
+    if Authorization.can?(actor, :create, Member) do
+      csv = build_csv(locale, actor)
+
+      send_download(conn, {:binary, csv},
+        filename: filename,
+        content_type: "text/csv; charset=utf-8"
+      )
+    else
+      return_forbidden(conn)
+    end
+  end
+
+  defp build_csv(locale, actor) do
+    custom_field_names = custom_field_names(actor)
+
+    header =
+      Enum.map(@columns, &header_for(&1, locale)) ++ custom_field_names
+
+    example =
+      Enum.map(@columns, &example_for(&1, locale)) ++ Enum.map(custom_field_names, fn _ -> "" end)
+
+    [csv_row(header), csv_row(example)]
+    |> Enum.join("\n")
+  end
+
+  defp header_for({en, _de, _ex_en, _ex_de}, :en), do: en
+  defp header_for({_en, de, _ex_en, _ex_de}, :de), do: de
+
+  defp example_for({_en, _de, ex_en, _ex_de}, :en), do: ex_en
+  defp example_for({_en, _de, _ex_en, ex_de}, :de), do: ex_de
+
+  defp custom_field_names(actor) do
+    Mv.Membership.list_custom_fields!(actor: actor)
+    |> Enum.map(& &1.name)
+  end
+
+  # Serializes a row using the semicolon delimiter (the import auto-detects it),
+  # quoting any field that contains a delimiter, quote, or newline.
+  defp csv_row(fields) do
+    Enum.map_join(fields, ";", &escape_field/1)
+  end
+
+  # Neutralizes spreadsheet formula triggers (the same guard the export writer
+  # applies) before RFC 4180 quoting, so a custom-field name like
+  # `=HYPERLINK(...)` is not evaluated when the template is opened.
+  defp escape_field(field) do
+    field = field |> to_string() |> MembersCSV.safe_cell()
+
+    if String.contains?(field, [";", "\"", "\n", "\r"]) do
+      "\"" <> String.replace(field, "\"", "\"\"") <> "\""
+    else
+      field
+    end
+  end
+
+  defp current_actor(conn) do
+    conn.assigns[:current_user]
+    |> Actor.ensure_loaded()
+  end
+
+  defp return_forbidden(conn) do
+    conn
+    |> put_status(403)
+    |> put_resp_content_type("application/json")
+    |> json(%{error: "Forbidden"})
+    |> halt()
+  end
+end

lib/mv_web/helpers/join_description_renderer.ex

@@ -0,0 +1,70 @@
+defmodule MvWeb.Helpers.JoinDescriptionRenderer do
+  @moduledoc """
+  Renders a custom field's `join_description` into Phoenix-safe HTML for the
+  public join form.
+
+  The renderer auto-links two patterns into `<a href="...">` tags:
+
+  - Markdown links of the form `[text](url)` (processed first)
+  - bare `http(s)://` URLs in the remaining text
+
+  All other content is HTML-escaped: only `<a href="...">` tags are ever
+  emitted, so arbitrary HTML in the input is rendered as inert text. This is a
+  defense-in-depth measure — `join_description` is admin-set content, never
+  end-user input — but the renderer must not become a vector for injecting
+  arbitrary markup.
+
+  Markdown links are matched before bare URLs and their matched region is
+  consumed, so a Markdown link whose URL also looks like a bare URL is linked
+  exactly once (no nested anchors).
+  """
+
+  @markdown_link ~r/\[([^\]]+)\]\((https?:\/\/[^\s)]+)\)/
+  @bare_url ~r/(https?:\/\/[^\s<]+)/
+  @bare_url_anchored ~r/\A(https?:\/\/[^\s<]+)\z/
+
+  @doc """
+  Converts `value` to a Phoenix-safe HTML iolist.
+
+  Returns `{:safe, ""}` for `nil`. For a string, returns `{:safe, iolist}` with
+  links rendered and all other text HTML-escaped.
+  """
+  @spec render(String.t() | nil) :: Phoenix.HTML.safe()
+  def render(nil), do: {:safe, ""}
+
+  def render(value) when is_binary(value) do
+    {:safe, render_segments(value)}
+  end
+
+  # Split on Markdown links first; for each non-Markdown segment, link bare URLs;
+  # everything that is not a link is HTML-escaped.
+  defp render_segments(text) do
+    Regex.split(@markdown_link, text, include_captures: true)
+    |> Enum.map(&render_markdown_or_plain/1)
+  end
+
+  defp render_markdown_or_plain(segment) do
+    case Regex.run(@markdown_link, segment) do
+      [^segment, label, url] -> anchor(url, label)
+      _ -> render_plain(segment)
+    end
+  end
+
+  # Auto-link bare URLs in a plain-text segment, escaping all surrounding text.
+  defp render_plain(segment) do
+    Regex.split(@bare_url, segment, include_captures: true)
+    |> Enum.map(fn part ->
+      if Regex.match?(@bare_url_anchored, part) do
+        anchor(part, part)
+      else
+        escape(part)
+      end
+    end)
+  end
+
+  defp anchor(url, label) do
+    ["<a href=\"", escape(url), "\" class=\"link link-primary\">", escape(label), "</a>"]
+  end
+
+  defp escape(text), do: Phoenix.HTML.html_escape(text) |> Phoenix.HTML.safe_to_string()
+end

lib/mv_web/live/custom_field_live/form_component.ex

@@ -91,6 +91,45 @@ defmodule MvWeb.CustomFieldLive.FormComponent do
           <% end %>
 
           <.input field={@form[:description]} type="text" label={gettext("Description")} />
+
+          <fieldset class="mb-2 fieldset">
+            <label>
+              <span class="mb-1 label flex items-center gap-2">
+                {gettext("Description for join form")}
+                <.tooltip
+                  content={
+                    gettext(
+                      "You can add links: full addresses (https://…) or as [link text](https://…)."
+                    )
+                  }
+                  position="right"
+                >
+                  <span
+                    data-testid="join-description-link-hint"
+                    aria-label={
+                      gettext(
+                        "You can add links: full addresses (https://…) or as [link text](https://…)."
+                      )
+                    }
+                  >
+                    <.icon
+                      name="hero-information-circle"
+                      class="w-4 h-4 text-base-content/60 cursor-help"
+                      aria-hidden="true"
+                    />
+                  </span>
+                </.tooltip>
+              </span>
+              <input
+                type="text"
+                name={@form[:join_description].name}
+                id={@form[:join_description].id}
+                value={Phoenix.HTML.Form.normalize_value("text", @form[:join_description].value)}
+                class="w-full input"
+              />
+            </label>
+          </fieldset>
+
           <.input field={@form[:required]} type="checkbox" label={gettext("Required")} />
           <.input
             field={@form[:show_in_overview]}

lib/mv_web/live/import_live.ex

@@ -99,7 +99,12 @@ defmodule MvWeb.ImportLive do
           <.form_section title={gettext("Choose CSV file")}>
             <Components.custom_fields_notice {assigns} />
             <Components.template_links {assigns} />
+            <%= if @import_status != :preview do %>
               <Components.import_form {assigns} />
+            <% end %>
+            <%= if @import_status == :preview do %>
+              <Components.preview {assigns} />
+            <% end %>
             <%= if @import_status == :running or @import_status == :done or @import_status == :error do %>
               <Components.import_progress {assigns} />
             <% end %>
@@ -133,6 +138,29 @@ defmodule MvWeb.ImportLive do
     end
   end
 
+  @impl true
+  def handle_event("confirm_import", _params, socket) do
+    case socket.assigns do
+      %{import_state: import_state} when is_map(import_state) ->
+        start_import(socket, import_state)
+
+      _ ->
+        {:noreply,
+         put_flash(socket, :error, gettext("No prepared import to confirm. Please upload again."))}
+    end
+  end
+
+  @impl true
+  def handle_event("cancel_import", _params, socket) do
+    socket =
+      socket
+      |> assign(:import_state, nil)
+      |> assign(:import_progress, nil)
+      |> assign(:import_status, :idle)
+
+    {:noreply, socket}
+  end
+
   # Checks if all prerequisites for starting an import are met.
   #
   # Validates:
@@ -169,10 +197,10 @@ defmodule MvWeb.ImportLive do
     end
   end
 
-  # Processes CSV upload and starts import process.
+  # Processes CSV upload and enters the mapping preview.
   #
-  # Reads the uploaded CSV file, prepares it for import, and initiates
+  # Reads the uploaded CSV file and prepares it (read-only at the DB level), then
-  # the chunked processing workflow.
+  # shows the mapping preview. No member is created until the user confirms.
   @spec process_csv_upload(Phoenix.LiveView.Socket.t()) ::
           {:noreply, Phoenix.LiveView.Socket.t()}
   defp process_csv_upload(socket) do
@@ -181,7 +209,7 @@ defmodule MvWeb.ImportLive do
     with {:ok, content} <- consume_and_read_csv(socket),
          {:ok, import_state} <-
            MemberCSV.prepare(content, max_rows: Config.csv_import_max_rows(), actor: actor) do
-      start_import(socket, import_state)
+      enter_preview(socket, import_state)
     else
       {:error, reason} when is_binary(reason) ->
         {:noreply,
@@ -193,6 +221,19 @@ defmodule MvWeb.ImportLive do
     end
   end
 
+  # Shows the mapping preview without starting any processing.
+  @spec enter_preview(Phoenix.LiveView.Socket.t(), map()) ::
+          {:noreply, Phoenix.LiveView.Socket.t()}
+  defp enter_preview(socket, import_state) do
+    socket =
+      socket
+      |> assign(:import_state, import_state)
+      |> assign(:import_progress, nil)
+      |> assign(:import_status, :preview)
+
+    {:noreply, socket}
+  end
+
   # Starts the import process by initializing progress tracking and scheduling the first chunk.
   @spec start_import(Phoenix.LiveView.Socket.t(), map()) ::
           {:noreply, Phoenix.LiveView.Socket.t()}
@@ -263,7 +304,9 @@ defmodule MvWeb.ImportLive do
       custom_field_lookup: import_state.custom_field_lookup,
       existing_error_count: length(progress.errors),
       max_errors: @max_errors,
-      actor: actor
+      actor: actor,
+      fee_type_map: import_state.fee_type_map,
+      groups_found: import_state.groups_found
     ]
 
     _ =
@@ -324,8 +367,11 @@ defmodule MvWeb.ImportLive do
     new_progress =
       ImportRunner.merge_progress(progress, chunk_result, idx, max_errors: @max_errors)
 
+    new_import_state = ImportRunner.carry_groups_forward(import_state, chunk_result)
+
     socket =
       socket
+      |> assign(:import_state, new_import_state)
       |> assign(:import_progress, new_progress)
       |> assign(:import_status, new_progress.status)
       |> maybe_send_next_chunk(idx, length(import_state.chunks))

lib/mv_web/live/import_live/components.ex

@@ -25,7 +25,22 @@ defmodule MvWeb.ImportLive.Components do
       <div>
         <p class="text-sm mb-2">
           {gettext(
-            "Use the data field name as the CSV column header in your file. Data fields must exist in Mila before importing, because unknown data field columns will be ignored. Groups and membership fees are not supported for import."
+            "Use the data field name as the CSV column header in your file. Data fields must exist in Mila before importing, because unknown data field columns will be ignored."
+          )}
+        </p>
+        <p class="text-sm mb-2">
+          {gettext(
+            "Groups column (recognized headers): Groups, Gruppen, Gruppe. Comma-separated group names are supported and missing groups are created automatically."
+          )}
+        </p>
+        <p class="text-sm mb-2">
+          {gettext(
+            "Fee type column (recognized headers): Fee Type, fee type, fee_type, membership_fee_type, Beitragsart. Unknown fee types fall back to the default."
+          )}
+        </p>
+        <p class="text-sm">
+          {gettext(
+            "Fee status columns (Membership Fee Status, Bezahlstatus, Mitgliedsbeitragsstatus) are always ignored and cannot be imported."
           )}
         </p>
       </div>
@@ -44,20 +59,12 @@ defmodule MvWeb.ImportLive.Components do
       </p>
       <ul class="list-disc list-inside space-y-1">
         <li>
-          <.link
+          <.link href={~p"/admin/import/template/en"} class="link link-primary">
-            href={~p"/templates/member_import_en.csv"}
-            download="member_import_en.csv"
-            class="link link-primary"
-          >
             {gettext("English Template")}
           </.link>
         </li>
         <li>
-          <.link
+          <.link href={~p"/admin/import/template/de"} class="link link-primary">
-            href={~p"/templates/member_import_de.csv"}
-            download="member_import_de.csv"
-            class="link link-primary"
-          >
             {gettext("German Template")}
           </.link>
         </li>
@@ -108,6 +115,194 @@ defmodule MvWeb.ImportLive.Components do
     """
   end
 
+  @doc """
+  Renders the mapping preview shown between upload and processing.
+
+  Shows the column-to-role mapping, up to 3 sample rows, and notices for
+  auto-created groups, unresolved fee types, empty fee-type cells, and unknown
+  columns. Nothing is written until the user confirms.
+  """
+  def preview(assigns) do
+    state = assigns.import_state
+    column_roles = column_roles(state)
+    column_samples = column_samples(state.preview_rows, length(state.headers))
+
+    assigns =
+      assigns
+      |> assign(:column_roles, column_roles)
+      |> assign(:column_samples, column_samples)
+
+    ~H"""
+    <section
+      class="mt-4 space-y-4"
+      data-testid="import-preview"
+      aria-labelledby="import-preview-heading"
+    >
+      <h2 id="import-preview-heading" class="text-lg font-semibold">
+        {gettext("Preview import")}
+      </h2>
+
+      <div class="overflow-x-auto">
+        <table class="table table-sm w-full" data-testid="preview-mapping-table">
+          <thead>
+            <tr>
+              <th>{gettext("Role")}</th>
+              <th>{gettext("Column")}</th>
+              <th class="text-base-content/60">{gettext("Row 1")}</th>
+              <th class="text-base-content/60">{gettext("Row 2")}</th>
+              <th class="text-base-content/60">{gettext("Row 3")}</th>
+            </tr>
+          </thead>
+          <tbody>
+            <%= for {{header, role}, samples} <- Enum.zip(@column_roles, @column_samples) do %>
+              <tr class={role_row_class(role)} data-testid="preview-column-row">
+                <td>
+                  <span class={"badge badge-sm #{role_badge_class(role)}"}>
+                    {role_label(role)}
+                  </span>
+                </td>
+                <td class="font-medium">{header}</td>
+                <%= for sample <- samples do %>
+                  <td class="text-base-content/70 max-w-32 truncate">{sample}</td>
+                <% end %>
+              </tr>
+            <% end %>
+          </tbody>
+        </table>
+      </div>
+
+      <%= if @import_state.groups_to_create != [] do %>
+        <div class="alert alert-info" role="note" data-testid="preview-groups-notice">
+          <.icon name="hero-information-circle" class="size-5" aria-hidden="true" />
+          <div>
+            <p class="text-sm">
+              {gettext("These groups will be created automatically: %{names}",
+                names: Enum.join(@import_state.groups_to_create, ", ")
+              )}
+            </p>
+          </div>
+        </div>
+      <% end %>
+
+      <%= if @import_state.fee_type_warnings != [] do %>
+        <div class="alert alert-warning" role="alert" data-testid="preview-fee-type-warning">
+          <.icon name="hero-exclamation-circle" class="size-5" aria-hidden="true" />
+          <div>
+            <p class="text-sm">
+              {gettext("Unknown fee types (members get the default): %{names}",
+                names: Enum.join(@import_state.fee_type_warnings, ", ")
+              )}
+            </p>
+            <.link
+              navigate={~p"/membership_fee_settings/new_fee_type"}
+              class="link link-primary text-sm"
+            >
+              {gettext("Create fee type")}
+            </.link>
+          </div>
+        </div>
+      <% end %>
+
+      <%= if @import_state.has_empty_fee_type_cells? do %>
+        <div class="alert alert-info" role="note" data-testid="preview-fee-type-info">
+          <.icon name="hero-information-circle" class="size-5" aria-hidden="true" />
+          <div>
+            <p class="text-sm">
+              {gettext("Rows with an empty fee type will get the default fee type.")}
+            </p>
+          </div>
+        </div>
+      <% end %>
+
+      <%= if @import_state.warnings != [] do %>
+        <div class="alert alert-warning" role="alert" data-testid="preview-unknown-warning">
+          <.icon name="hero-information-circle" class="size-5" aria-hidden="true" />
+          <div>
+            <ul class="list-disc list-inside space-y-1 text-sm">
+              <%= for warning <- @import_state.warnings do %>
+                <li>{warning}</li>
+              <% end %>
+            </ul>
+            <.link navigate={~p"/admin/datafields"} class="link link-primary text-sm">
+              {gettext("Create custom field")}
+            </.link>
+          </div>
+        </div>
+      <% end %>
+
+      <div class="flex gap-2">
+        <.button
+          type="button"
+          phx-click="confirm_import"
+          variant="primary"
+          data-testid="confirm-import-button"
+        >
+          {gettext("Confirm and Import")}
+        </.button>
+        <.button type="button" phx-click="cancel_import" data-testid="cancel-import-button">
+          {gettext("Cancel")}
+        </.button>
+      </div>
+    </section>
+    """
+  end
+
+  # Pairs each CSV header with its resolved role for the preview mapping table.
+  defp column_roles(state) do
+    member_indices = MapSet.new(Map.values(state.column_map))
+    custom_indices = MapSet.new(Map.values(state.custom_field_map))
+    ignored_headers = MapSet.new(state.ignored)
+
+    state.headers
+    |> Enum.with_index()
+    |> Enum.map(fn {header, index} ->
+      {header, role_for(index, header, state, member_indices, custom_indices, ignored_headers)}
+    end)
+  end
+
+  defp role_for(index, header, state, member_indices, custom_indices, ignored_headers) do
+    cond do
+      index == state.groups_column_index -> :groups
+      index == state.fee_type_column_index -> :fee_type
+      MapSet.member?(ignored_headers, header) -> :ignored
+      MapSet.member?(member_indices, index) -> :member_field
+      MapSet.member?(custom_indices, index) -> :custom_field
+      true -> :unknown
+    end
+  end
+
+  defp role_label(:member_field), do: gettext("Member field")
+  defp role_label(:custom_field), do: gettext("Custom field")
+  defp role_label(:groups), do: gettext("Groups")
+  defp role_label(:fee_type), do: gettext("Fee type")
+  defp role_label(:ignored), do: gettext("Ignored (system-computed field)")
+  defp role_label(:unknown), do: gettext("Unknown (ignored)")
+
+  defp role_badge_class(:member_field), do: "badge-primary"
+  defp role_badge_class(:custom_field), do: "badge-secondary"
+  defp role_badge_class(:groups), do: "badge-success"
+  defp role_badge_class(:fee_type), do: "badge-warning"
+  defp role_badge_class(:ignored), do: "badge-ghost"
+  defp role_badge_class(:unknown), do: "badge-error"
+
+  defp role_row_class(:ignored), do: "opacity-50"
+  defp role_row_class(:unknown), do: "opacity-50"
+  defp role_row_class(_), do: nil
+
+  defp column_samples([], col_count), do: List.duplicate([], col_count)
+
+  defp column_samples(rows, col_count) do
+    Enum.map(0..(col_count - 1), fn col_idx ->
+      rows
+      |> Enum.map(fn row -> Enum.at(row, col_idx, "") end)
+      |> pad_to(3, "")
+    end)
+  end
+
+  defp pad_to(list, target, fill) do
+    list ++ List.duplicate(fill, max(0, target - length(list)))
+  end
+
   @doc """
   Renders import progress text and, when done or aborted, the import results section.
   """
@@ -254,8 +449,10 @@ defmodule MvWeb.ImportLive.Components do
   @doc """
   Returns whether the Start Import button should be disabled.
   """
-  @spec import_button_disabled?(:idle | :running | :done | :error, [map()]) :: boolean()
+  @spec import_button_disabled?(:idle | :preview | :running | :done | :error, [map()]) ::
+          boolean()
   def import_button_disabled?(:running, _entries), do: true
+  def import_button_disabled?(:preview, _entries), do: true
   def import_button_disabled?(_status, []), do: true
   def import_button_disabled?(_status, [entry | _]) when not entry.done?, do: true
   def import_button_disabled?(_status, _entries), do: false

lib/mv_web/live/join_live.ex

@@ -8,6 +8,7 @@ defmodule MvWeb.JoinLive do
   alias Ash.Resource.Info
   alias Mv.Membership
   alias Mv.Membership.CustomFieldLookup
+  alias MvWeb.Helpers.JoinDescriptionRenderer
   alias MvWeb.JoinRateLimit
   alias MvWeb.Translations.MemberFields
 
@@ -96,14 +97,20 @@ defmodule MvWeb.JoinLive do
                           class="checkbox checkbox-sm"
                         />
                         <span class="label-text">
-                          {field.label}<span :if={field.required} aria-hidden="true"> *</span>
+                          {render_field_label(field)}<span
+                            :if={field.required}
+                            aria-hidden="true"
+                          > *</span>
                         </span>
                       </label>
                     <% else %>
                       <div>
                         <label for={"join-field-#{field.id}"} class="label">
                           <span class="label-text">
-                            {field.label}<span :if={field.required} aria-hidden="true"> *</span>
+                            {render_field_label(field)}<span
+                              :if={field.required}
+                              aria-hidden="true"
+                            > *</span>
                           </span>
                         </label>
                         <input
@@ -237,6 +244,17 @@ defmodule MvWeb.JoinLive do
      |> assign(:form, to_form(params, as: "join"))}
   end
 
+  # Renders a join field's label. When a custom field has a join_description it is
+  # rendered with auto-linked URLs/Markdown; otherwise the plain field label is used.
+  # Safe: join_description is admin-set settings content, never end-user input, and
+  # JoinDescriptionRenderer escapes all non-link text (only emits <a href> tags).
+  defp render_field_label(%{join_description: join_description})
+       when is_binary(join_description) do
+    JoinDescriptionRenderer.render(join_description)
+  end
+
+  defp render_field_label(%{label: label}), do: label
+
   defp build_join_fields_with_labels(allowlist) do
     member_field_strings = Mv.Constants.member_fields() |> Enum.map(&Atom.to_string/1)
     custom_field_by_id = custom_field_map(allowlist, member_field_strings)
@@ -249,20 +267,36 @@ defmodule MvWeb.JoinLive do
   defp build_join_field(id, required, member_field_strings, custom_field_by_id) do
     if id in member_field_strings do
       label = MemberFields.label(String.to_existing_atom(id))
-      %{id: id, label: label, required: required, input_type: member_field_input_type(id)}
+
+      %{
+        id: id,
+        label: label,
+        required: required,
+        input_type: member_field_input_type(id),
+        join_description: nil
+      }
     else
       custom_field = Map.get(custom_field_by_id, id)
       label = if custom_field, do: custom_field.name, else: gettext("Field")
       input_type = custom_field_input_type(custom_field && custom_field.value_type)
 
-      %{id: id, label: label, required: required, input_type: input_type}
+      %{
+        id: id,
+        label: label,
+        required: required,
+        input_type: input_type,
+        join_description: custom_field && custom_field.join_description
+      }
     end
   end
 
   defp custom_field_map(allowlist, _member_field_strings) do
     allowlist
     |> Enum.map(& &1.id)
-    |> CustomFieldLookup.fetch_map_by_ids(authorize?: false, select: [:id, :name, :value_type])
+    |> CustomFieldLookup.fetch_map_by_ids(
+      authorize?: false,
+      select: [:id, :name, :value_type, :join_description]
+    )
   end
 
   defp initial_form_params(join_fields) do

lib/mv_web/live/member_live/show.ex

@@ -235,6 +235,19 @@ defmodule MvWeb.MemberLive.Show do
                       <%= for custom_field <- @custom_fields do %>
                         <% cfv = find_custom_field_value(@member.custom_field_values, custom_field.id) %>
                         <.data_field label={custom_field.name}>
+                          <:label_suffix :if={custom_field.join_description}>
+                            <.tooltip
+                              content={"#{gettext("Join form:")} #{custom_field.join_description}"}
+                              wrap_class="ml-1 inline-flex items-center"
+                            >
+                              <span data-testid="join-description-tooltip">
+                                <.icon
+                                  name="hero-information-circle"
+                                  class="size-3.5 text-base-content/50"
+                                />
+                              </span>
+                            </.tooltip>
+                          </:label_suffix>
                           {format_custom_field_value(cfv, custom_field.value_type)}
                         </.data_field>
                       <% end %>
@@ -605,11 +618,14 @@ defmodule MvWeb.MemberLive.Show do
   attr :value, :string, default: nil
   attr :class, :string, default: ""
   slot :inner_block
+  slot :label_suffix
 
   defp data_field(assigns) do
     ~H"""
     <dl class={@class}>
-      <dt class="text-sm font-medium text-base-content/70">{@label}</dt>
+      <dt class="text-sm font-medium text-base-content/70 flex items-center">
+        {@label}{render_slot(@label_suffix)}
+      </dt>
       <dd class="mt-1 text-base-content">
         <%= if @inner_block != [] do %>
           {render_slot(@inner_block)}

lib/mv_web/router.ex

@@ -102,6 +102,10 @@ defmodule MvWeb.Router do
       # Import (Admin only)
       live "/admin/import", ImportLive
 
+      # Dynamic CSV import templates (admin only; generated from current custom fields)
+      get "/admin/import/template/en", ImportTemplateController, :en
+      get "/admin/import/template/de", ImportTemplateController, :de
+
       post "/members/export.csv", MemberExportController, :export
       post "/members/export.pdf", MemberPdfExportController, :export
       post "/set_locale", LocaleController, :set_locale

priv/gettext/de/LC_MESSAGES/default.po

@@ -386,6 +386,7 @@ msgstr "Kann jederzeit geändert werden. Änderungen des Betrags betreffen nur z
 #: lib/mv_web/live/custom_field_live/form_component.ex
 #: lib/mv_web/live/custom_field_live/index_component.ex
 #: lib/mv_web/live/group_live/show.ex
+#: lib/mv_web/live/import_live/components.ex
 #: lib/mv_web/live/member_field_live/form_component.ex
 #: lib/mv_web/live/member_live/form.ex
 #: lib/mv_web/live/member_live/show.ex
@@ -1315,6 +1316,7 @@ msgstr "Feb."
 msgid "Fee Type"
 msgstr "Beitragsart"
 
+#: lib/mv_web/live/import_live/components.ex
 #: lib/mv_web/live/statistics_live.ex
 #, elixir-autogen, elixir-format
 msgid "Fee type"
@@ -1474,6 +1476,7 @@ msgstr "Gruppe erfolgreich gespeichert."
 #: lib/mv_web/components/layouts/sidebar.ex
 #: lib/mv_web/live/components/member_filter_component.ex
 #: lib/mv_web/live/group_live/index.ex
+#: lib/mv_web/live/import_live/components.ex
 #: lib/mv_web/live/member_live/index.html.heex
 #: lib/mv_web/live/member_live/show.ex
 #: lib/mv_web/translations/member_fields.ex
@@ -2614,6 +2617,7 @@ msgstr "Geprüft von"
 msgid "Reviewed at"
 msgstr "Geprüft am"
 
+#: lib/mv_web/live/import_live/components.ex
 #: lib/mv_web/live/role_live/form.ex
 #: lib/mv_web/live/user_live/form.ex
 #: lib/mv_web/live/user_live/index.html.heex
@@ -3274,11 +3278,6 @@ msgstr "Aufhebung der Verknüpfung geplant"
 msgid "Unpaid"
 msgstr "Unbezahlt"
 
-#: lib/mv_web/live/import_live/components.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Use the data field name as the CSV column header in your file. Data fields must exist in Mila before importing, because unknown data field columns will be ignored. Groups and membership fees are not supported for import."
-msgstr "Verwende die Namen der Datenfelder als Spaltennamen in der CSV-Datei. Datenfelder müssen in Mila bereits angelegt sein, da unbekannte Spaltennamen ignoriert werden. Gruppen und Beitragsstatus können nicht importiert werden."
-
 #: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "User"
@@ -3939,15 +3938,140 @@ msgstr "Zeitraum"
 msgid "To"
 msgstr "Bis"
 
-#: lib/mv_web/components/bulk_actions_dropdown.ex
+#: lib/mv_web/live/member_live/show.ex
 #, elixir-autogen, elixir-format
-msgid "Export to CSV"
+msgid "Join form:"
-msgstr "Als CSV exportieren"
+msgstr "Beitrittsformular:"
+
+#: lib/mv_web/live/custom_field_live/form_component.ex
+#, elixir-autogen, elixir-format
+msgid "Description for join form"
+msgstr "Beschreibung für das Beitrittsformular"
+
+#: lib/mv_web/live/custom_field_live/form_component.ex
+#, elixir-autogen, elixir-format
+msgid "You can add links: full addresses (https://…) or as [link text](https://…)."
+msgstr "Du kannst Links einfügen: ganze Adressen (https://…) oder als [Linktext](https://…)."
+
+#: lib/mv/membership/import/member_csv.ex
+#, elixir-autogen, elixir-format
+msgid "Fee type '%{name}' not found; using the default fee type."
+msgstr "Beitragsart '%{name}' nicht gefunden; Standard-Beitragsart wird verwendet."
+
+#: lib/mv/membership/import/member_csv.ex
+#, elixir-autogen, elixir-format
+msgid "Group assignment failed: %{reason}"
+msgstr "Gruppenzuordnung fehlgeschlagen: %{reason}"
+
+#: lib/mv_web/live/import_live/components.ex
+#, elixir-autogen, elixir-format
+msgid "Confirm and Import"
+msgstr "Bestätigen und importieren"
+
+#: lib/mv_web/live/import_live.ex
+#, elixir-autogen, elixir-format
+msgid "No prepared import to confirm. Please upload again."
+msgstr "Kein vorbereiteter Import zum Bestätigen. Bitte erneut hochladen."
+
+#: lib/mv_web/live/import_live/components.ex
+#, elixir-autogen, elixir-format
+msgid "Preview import"
+msgstr "Importvorschau"
+
+#: lib/mv_web/live/import_live/components.ex
+#, elixir-autogen, elixir-format
+msgid "Column"
+msgstr "Spalte"
+
+#: lib/mv_web/live/import_live/components.ex
+#, elixir-autogen, elixir-format
+msgid "Custom field"
+msgstr "Benutzerdefiniertes Feld"
+
+#: lib/mv_web/live/import_live/components.ex
+#, elixir-autogen, elixir-format
+msgid "Ignored (system-computed field)"
+msgstr "Ignoriert (vom System berechnetes Feld)"
+
+#: lib/mv_web/live/import_live/components.ex
+#, elixir-autogen, elixir-format
+msgid "Member field"
+msgstr "Mitgliedsfeld"
+
+#: lib/mv_web/live/import_live/components.ex
+#, elixir-autogen, elixir-format
+msgid "Rows with an empty fee type will get the default fee type."
+msgstr "Zeilen ohne Beitragsart erhalten die Standard-Beitragsart."
+
+#: lib/mv_web/live/import_live/components.ex
+#, elixir-autogen, elixir-format
+msgid "These groups will be created automatically: %{names}"
+msgstr "Diese Gruppen werden automatisch erstellt: %{names}"
+
+#: lib/mv_web/live/import_live/components.ex
+#, elixir-autogen, elixir-format
+msgid "Unknown (ignored)"
+msgstr "Unbekannt (ignoriert)"
+
+#: lib/mv_web/live/import_live/components.ex
+#, elixir-autogen, elixir-format
+msgid "Unknown fee types (members get the default): %{names}"
+msgstr "Unbekannte Beitragsarten (Mitglieder erhalten den Standard): %{names}"
+
+#: lib/mv_web/live/import_live/components.ex
+#, elixir-autogen, elixir-format
+msgid "Fee status columns (Membership Fee Status, Bezahlstatus, Mitgliedsbeitragsstatus) are always ignored and cannot be imported."
+msgstr "Beitragsstatus-Spalten (Membership Fee Status, Bezahlstatus, Mitgliedsbeitragsstatus) werden immer ignoriert und können nicht importiert werden."
+
+#: lib/mv_web/live/import_live/components.ex
+#, elixir-autogen, elixir-format
+msgid "Groups column (recognized headers): Groups, Gruppen, Gruppe. Comma-separated group names are supported and missing groups are created automatically."
+msgstr "Gruppen-Spalte (erkannte Spaltennamen): Groups, Gruppen, Gruppe. Mehrere durch Komma getrennte Gruppennamen werden unterstützt; fehlende Gruppen werden automatisch erstellt."
+
+#: lib/mv_web/live/import_live/components.ex
+#, elixir-autogen, elixir-format
+msgid "Use the data field name as the CSV column header in your file. Data fields must exist in Mila before importing, because unknown data field columns will be ignored."
+msgstr "Verwende die Namen der Datenfelder als Spaltennamen in der CSV-Datei. Datenfelder müssen in Mila bereits angelegt sein, da unbekannte Spaltennamen ignoriert werden."
+
+#: lib/mv_web/live/import_live/components.ex
+#, elixir-autogen, elixir-format
+msgid "Fee type column (recognized headers): Fee Type, fee type, fee_type, membership_fee_type, Beitragsart. Unknown fee types fall back to the default."
+msgstr "Beitragsart-Spalte (erkannte Spaltennamen): Fee Type, fee type, fee_type, membership_fee_type, Beitragsart. Unbekannte Beitragsarten erhalten die Standard-Beitragsart."
+
+#: lib/mv_web/live/import_live/components.ex
+#, elixir-autogen, elixir-format
+msgid "Create custom field"
+msgstr "Datenfeld erstellen"
+
+#: lib/mv_web/live/import_live/components.ex
+#, elixir-autogen, elixir-format
+msgid "Create fee type"
+msgstr "Beitragsart erstellen"
+
+#: lib/mv_web/live/import_live/components.ex
+#, elixir-autogen, elixir-format
+msgid "Row 1"
+msgstr "Zeile 1"
+
+#: lib/mv_web/live/import_live/components.ex
+#, elixir-autogen, elixir-format
+msgid "Row 2"
+msgstr "Zeile 2"
+
+#: lib/mv_web/live/import_live/components.ex
+#, elixir-autogen, elixir-format
+msgid "Row 3"
+msgstr "Zeile 3"
 
 #: lib/mv_web/components/bulk_actions_dropdown.ex
-#, elixir-autogen, elixir-format
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Export to CSV"
+msgstr "Mitglieder als CSV exportieren"
+
+#: lib/mv_web/components/bulk_actions_dropdown.ex
+#, elixir-autogen, elixir-format, fuzzy
 msgid "Export to PDF"
-msgstr "Als PDF exportieren"
+msgstr "Mitglieder als PDF exportieren"
 
 #: lib/mv_web/components/bulk_actions_dropdown.ex
 #, elixir-autogen, elixir-format
@@ -3958,3 +4082,33 @@ msgstr "Zu viele Empfänger für diese Funktion. Kopiere die Adressen oder expor
 #, elixir-autogen, elixir-format
 msgid "filtered"
 msgstr "gefiltert"
+
+#~ #: lib/mv_web/components/export_dropdown.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "CSV"
+#~ msgstr "CSV"
+
+#~ #: lib/mv_web/live/member_live/index.html.heex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Copy email addresses of selected members"
+#~ msgstr "E-Mail-Adressen der ausgewählten Mitglieder kopieren"
+
+#~ #: lib/mv_web/components/export_dropdown.ex
+#~ #, elixir-autogen, elixir-format, fuzzy
+#~ msgid "Export"
+#~ msgstr "Export"
+
+#~ #: lib/mv_web/live/member_live/index.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "No members selected"
+#~ msgstr "Keine Mitglieder ausgewählt"
+
+#~ #: lib/mv_web/live/member_live/index.html.heex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Open email program with BCC recipients"
+#~ msgstr "E-Mail-Programm mit BCC-Empfänger*innen öffnen"
+
+#~ #: lib/mv_web/components/export_dropdown.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "PDF"
+#~ msgstr "PDF"

priv/gettext/default.pot

@@ -387,6 +387,7 @@ msgstr ""
 #: lib/mv_web/live/custom_field_live/form_component.ex
 #: lib/mv_web/live/custom_field_live/index_component.ex
 #: lib/mv_web/live/group_live/show.ex
+#: lib/mv_web/live/import_live/components.ex
 #: lib/mv_web/live/member_field_live/form_component.ex
 #: lib/mv_web/live/member_live/form.ex
 #: lib/mv_web/live/member_live/show.ex
@@ -1316,6 +1317,7 @@ msgstr ""
 msgid "Fee Type"
 msgstr ""
 
+#: lib/mv_web/live/import_live/components.ex
 #: lib/mv_web/live/statistics_live.ex
 #, elixir-autogen, elixir-format
 msgid "Fee type"
@@ -1475,6 +1477,7 @@ msgstr ""
 #: lib/mv_web/components/layouts/sidebar.ex
 #: lib/mv_web/live/components/member_filter_component.ex
 #: lib/mv_web/live/group_live/index.ex
+#: lib/mv_web/live/import_live/components.ex
 #: lib/mv_web/live/member_live/index.html.heex
 #: lib/mv_web/live/member_live/show.ex
 #: lib/mv_web/translations/member_fields.ex
@@ -2615,6 +2618,7 @@ msgstr ""
 msgid "Reviewed at"
 msgstr ""
 
+#: lib/mv_web/live/import_live/components.ex
 #: lib/mv_web/live/role_live/form.ex
 #: lib/mv_web/live/user_live/form.ex
 #: lib/mv_web/live/user_live/index.html.heex
@@ -3275,11 +3279,6 @@ msgstr ""
 msgid "Unpaid"
 msgstr ""
 
-#: lib/mv_web/live/import_live/components.ex
-#, elixir-autogen, elixir-format
-msgid "Use the data field name as the CSV column header in your file. Data fields must exist in Mila before importing, because unknown data field columns will be ignored. Groups and membership fees are not supported for import."
-msgstr ""
-
 #: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "User"
@@ -3939,6 +3938,131 @@ msgstr ""
 msgid "To"
 msgstr ""
 
+#: lib/mv_web/live/member_live/show.ex
+#, elixir-autogen, elixir-format
+msgid "Join form:"
+msgstr ""
+
+#: lib/mv_web/live/custom_field_live/form_component.ex
+#, elixir-autogen, elixir-format
+msgid "Description for join form"
+msgstr ""
+
+#: lib/mv_web/live/custom_field_live/form_component.ex
+#, elixir-autogen, elixir-format
+msgid "You can add links: full addresses (https://…) or as [link text](https://…)."
+msgstr ""
+
+#: lib/mv/membership/import/member_csv.ex
+#, elixir-autogen, elixir-format
+msgid "Fee type '%{name}' not found; using the default fee type."
+msgstr ""
+
+#: lib/mv/membership/import/member_csv.ex
+#, elixir-autogen, elixir-format
+msgid "Group assignment failed: %{reason}"
+msgstr ""
+
+#: lib/mv_web/live/import_live/components.ex
+#, elixir-autogen, elixir-format
+msgid "Confirm and Import"
+msgstr ""
+
+#: lib/mv_web/live/import_live.ex
+#, elixir-autogen, elixir-format
+msgid "No prepared import to confirm. Please upload again."
+msgstr ""
+
+#: lib/mv_web/live/import_live/components.ex
+#, elixir-autogen, elixir-format
+msgid "Preview import"
+msgstr ""
+
+#: lib/mv_web/live/import_live/components.ex
+#, elixir-autogen, elixir-format
+msgid "Column"
+msgstr ""
+
+#: lib/mv_web/live/import_live/components.ex
+#, elixir-autogen, elixir-format
+msgid "Custom field"
+msgstr ""
+
+#: lib/mv_web/live/import_live/components.ex
+#, elixir-autogen, elixir-format
+msgid "Ignored (system-computed field)"
+msgstr ""
+
+#: lib/mv_web/live/import_live/components.ex
+#, elixir-autogen, elixir-format
+msgid "Member field"
+msgstr ""
+
+#: lib/mv_web/live/import_live/components.ex
+#, elixir-autogen, elixir-format
+msgid "Rows with an empty fee type will get the default fee type."
+msgstr ""
+
+#: lib/mv_web/live/import_live/components.ex
+#, elixir-autogen, elixir-format
+msgid "These groups will be created automatically: %{names}"
+msgstr ""
+
+#: lib/mv_web/live/import_live/components.ex
+#, elixir-autogen, elixir-format
+msgid "Unknown (ignored)"
+msgstr ""
+
+#: lib/mv_web/live/import_live/components.ex
+#, elixir-autogen, elixir-format
+msgid "Unknown fee types (members get the default): %{names}"
+msgstr ""
+
+#: lib/mv_web/live/import_live/components.ex
+#, elixir-autogen, elixir-format
+msgid "Fee status columns (Membership Fee Status, Bezahlstatus, Mitgliedsbeitragsstatus) are always ignored and cannot be imported."
+msgstr ""
+
+#: lib/mv_web/live/import_live/components.ex
+#, elixir-autogen, elixir-format
+msgid "Groups column (recognized headers): Groups, Gruppen, Gruppe. Comma-separated group names are supported and missing groups are created automatically."
+msgstr ""
+
+#: lib/mv_web/live/import_live/components.ex
+#, elixir-autogen, elixir-format
+msgid "Use the data field name as the CSV column header in your file. Data fields must exist in Mila before importing, because unknown data field columns will be ignored."
+msgstr ""
+
+#: lib/mv_web/live/import_live/components.ex
+#, elixir-autogen, elixir-format
+msgid "Fee type column (recognized headers): Fee Type, fee type, fee_type, membership_fee_type, Beitragsart. Unknown fee types fall back to the default."
+msgstr ""
+
+#: lib/mv_web/live/import_live/components.ex
+#, elixir-autogen, elixir-format
+msgid "Create custom field"
+msgstr ""
+
+#: lib/mv_web/live/import_live/components.ex
+#, elixir-autogen, elixir-format
+msgid "Create fee type"
+msgstr ""
+
+#: lib/mv_web/live/import_live/components.ex
+#, elixir-autogen, elixir-format
+msgid "Row 1"
+msgstr ""
+
+#: lib/mv_web/live/import_live/components.ex
+#, elixir-autogen, elixir-format
+msgid "Row 2"
+msgstr ""
+
+#: lib/mv_web/live/import_live/components.ex
+#, elixir-autogen, elixir-format
+msgid "Row 3"
+msgstr ""
+
 #: lib/mv_web/components/bulk_actions_dropdown.ex
 #, elixir-autogen, elixir-format
 msgid "Export to CSV"

priv/gettext/en/LC_MESSAGES/default.po

@@ -387,6 +387,7 @@ msgstr ""
 #: lib/mv_web/live/custom_field_live/form_component.ex
 #: lib/mv_web/live/custom_field_live/index_component.ex
 #: lib/mv_web/live/group_live/show.ex
+#: lib/mv_web/live/import_live/components.ex
 #: lib/mv_web/live/member_field_live/form_component.ex
 #: lib/mv_web/live/member_live/form.ex
 #: lib/mv_web/live/member_live/show.ex
@@ -1316,6 +1317,7 @@ msgstr ""
 msgid "Fee Type"
 msgstr "Fee Type"
 
+#: lib/mv_web/live/import_live/components.ex
 #: lib/mv_web/live/statistics_live.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Fee type"
@@ -1475,6 +1477,7 @@ msgstr ""
 #: lib/mv_web/components/layouts/sidebar.ex
 #: lib/mv_web/live/components/member_filter_component.ex
 #: lib/mv_web/live/group_live/index.ex
+#: lib/mv_web/live/import_live/components.ex
 #: lib/mv_web/live/member_live/index.html.heex
 #: lib/mv_web/live/member_live/show.ex
 #: lib/mv_web/translations/member_fields.ex
@@ -2615,6 +2618,7 @@ msgstr "Review by"
 msgid "Reviewed at"
 msgstr "Review date"
 
+#: lib/mv_web/live/import_live/components.ex
 #: lib/mv_web/live/role_live/form.ex
 #: lib/mv_web/live/user_live/form.ex
 #: lib/mv_web/live/user_live/index.html.heex
@@ -3275,11 +3279,6 @@ msgstr ""
 msgid "Unpaid"
 msgstr ""
 
-#: lib/mv_web/live/import_live/components.ex
-#, elixir-autogen, elixir-format, fuzzy
-msgid "Use the data field name as the CSV column header in your file. Data fields must exist in Mila before importing, because unknown data field columns will be ignored. Groups and membership fees are not supported for import."
-msgstr ""
-
 #: lib/mv_web/live/user_live/form.ex
 #, elixir-autogen, elixir-format
 msgid "User"
@@ -3939,6 +3938,131 @@ msgstr ""
 msgid "To"
 msgstr ""
 
+#: lib/mv_web/live/member_live/show.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Join form:"
+msgstr ""
+
+#: lib/mv_web/live/custom_field_live/form_component.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Description for join form"
+msgstr ""
+
+#: lib/mv_web/live/custom_field_live/form_component.ex
+#, elixir-autogen, elixir-format
+msgid "You can add links: full addresses (https://…) or as [link text](https://…)."
+msgstr ""
+
+#: lib/mv/membership/import/member_csv.ex
+#, elixir-autogen, elixir-format
+msgid "Fee type '%{name}' not found; using the default fee type."
+msgstr ""
+
+#: lib/mv/membership/import/member_csv.ex
+#, elixir-autogen, elixir-format
+msgid "Group assignment failed: %{reason}"
+msgstr ""
+
+#: lib/mv_web/live/import_live/components.ex
+#, elixir-autogen, elixir-format
+msgid "Confirm and Import"
+msgstr ""
+
+#: lib/mv_web/live/import_live.ex
+#, elixir-autogen, elixir-format
+msgid "No prepared import to confirm. Please upload again."
+msgstr ""
+
+#: lib/mv_web/live/import_live/components.ex
+#, elixir-autogen, elixir-format
+msgid "Preview import"
+msgstr ""
+
+#: lib/mv_web/live/import_live/components.ex
+#, elixir-autogen, elixir-format
+msgid "Column"
+msgstr ""
+
+#: lib/mv_web/live/import_live/components.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Custom field"
+msgstr ""
+
+#: lib/mv_web/live/import_live/components.ex
+#, elixir-autogen, elixir-format
+msgid "Ignored (system-computed field)"
+msgstr ""
+
+#: lib/mv_web/live/import_live/components.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Member field"
+msgstr ""
+
+#: lib/mv_web/live/import_live/components.ex
+#, elixir-autogen, elixir-format
+msgid "Rows with an empty fee type will get the default fee type."
+msgstr ""
+
+#: lib/mv_web/live/import_live/components.ex
+#, elixir-autogen, elixir-format
+msgid "These groups will be created automatically: %{names}"
+msgstr ""
+
+#: lib/mv_web/live/import_live/components.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Unknown (ignored)"
+msgstr ""
+
+#: lib/mv_web/live/import_live/components.ex
+#, elixir-autogen, elixir-format
+msgid "Unknown fee types (members get the default): %{names}"
+msgstr ""
+
+#: lib/mv_web/live/import_live/components.ex
+#, elixir-autogen, elixir-format
+msgid "Fee status columns (Membership Fee Status, Bezahlstatus, Mitgliedsbeitragsstatus) are always ignored and cannot be imported."
+msgstr ""
+
+#: lib/mv_web/live/import_live/components.ex
+#, elixir-autogen, elixir-format
+msgid "Groups column (recognized headers): Groups, Gruppen, Gruppe. Comma-separated group names are supported and missing groups are created automatically."
+msgstr ""
+
+#: lib/mv_web/live/import_live/components.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Use the data field name as the CSV column header in your file. Data fields must exist in Mila before importing, because unknown data field columns will be ignored."
+msgstr ""
+
+#: lib/mv_web/live/import_live/components.ex
+#, elixir-autogen, elixir-format, fuzzy
+msgid "Fee type column (recognized headers): Fee Type, fee type, fee_type, membership_fee_type, Beitragsart. Unknown fee types fall back to the default."
+msgstr ""
+
+#: lib/mv_web/live/import_live/components.ex
+#, elixir-autogen, elixir-format
+msgid "Create custom field"
+msgstr ""
+
+#: lib/mv_web/live/import_live/components.ex
+#, elixir-autogen, elixir-format
+msgid "Create fee type"
+msgstr ""
+
+#: lib/mv_web/live/import_live/components.ex
+#, elixir-autogen, elixir-format
+msgid "Row 1"
+msgstr ""
+
+#: lib/mv_web/live/import_live/components.ex
+#, elixir-autogen, elixir-format
+msgid "Row 2"
+msgstr ""
+
+#: lib/mv_web/live/import_live/components.ex
+#, elixir-autogen, elixir-format
+msgid "Row 3"
+msgstr ""
+
 #: lib/mv_web/components/bulk_actions_dropdown.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Export to CSV"
@@ -3958,3 +4082,33 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "filtered"
 msgstr ""
+
+#~ #: lib/mv_web/components/export_dropdown.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "CSV"
+#~ msgstr ""
+
+#~ #: lib/mv_web/live/member_live/index.html.heex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Copy email addresses of selected members"
+#~ msgstr ""
+
+#~ #: lib/mv_web/components/export_dropdown.ex
+#~ #, elixir-autogen, elixir-format, fuzzy
+#~ msgid "Export"
+#~ msgstr ""
+
+#~ #: lib/mv_web/live/member_live/index.ex
+#~ #, elixir-autogen, elixir-format, fuzzy
+#~ msgid "No members selected"
+#~ msgstr ""
+
+#~ #: lib/mv_web/live/member_live/index.html.heex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "Open email program with BCC recipients"
+#~ msgstr ""
+
+#~ #: lib/mv_web/components/export_dropdown.ex
+#~ #, elixir-autogen, elixir-format
+#~ msgid "PDF"
+#~ msgstr ""

priv/repo/migrations/20260603000531_add_join_description_to_custom_fields.exs

@@ -0,0 +1,21 @@
+defmodule Mv.Repo.Migrations.AddJoinDescriptionToCustomFields do
+  @moduledoc """
+  Updates resources based on their most recent snapshots.
+
+  This file was autogenerated with `mix ash_postgres.generate_migrations`
+  """
+
+  use Ecto.Migration
+
+  def up do
+    alter table(:custom_fields) do
+      add :join_description, :text
+    end
+  end
+
+  def down do
+    alter table(:custom_fields) do
+      remove :join_description
+    end
+  end
+end

priv/repo/seeds_bootstrap.exs

@@ -81,9 +81,11 @@ custom_field_configs = [
     show_in_overview: true
   },
   %{
-    name: "Datenschutzerklärung akzeptiert",
+    name: "DSGVO",
     value_type: :boolean,
-    description: "Angabe, ob Datenschutzerklärung akzeptiert wurde",
+    description: "Angabe, ob die Datenschutzerklärung akzeptiert wurde",
+    join_description:
+      "Ich habe die [Datenschutzerklärung](https://example.org/datenschutz) gelesen und akzeptiere sie.",
     required: false,
     show_in_overview: false
   },
@@ -302,11 +304,15 @@ case Membership.get_settings() do
             ArgumentError -> Map.has_key?(vis, k)
           end
         end
+
         merged =
           Enum.reduce(default_hidden_in_overview, visibility_config, fn {key, val}, vis ->
             if has_key.(vis, key), do: vis, else: Map.put(vis, key, val)
           end)
-        if merged != visibility_config, do: Map.put(acc, :member_field_visibility, merged), else: acc
+
+        if merged != visibility_config,
+          do: Map.put(acc, :member_field_visibility, merged),
+          else: acc
       end)
 
     if map_size(updates) > 0 do
@@ -332,9 +338,7 @@ IO.puts(
   "   - Fee types: 5 (Standard, Ermäßigt, Unterstützer, Fördermitglied, Probemitgliedschaft)"
 )
 
-IO.puts(
+IO.puts("   - Custom fields: 6 (Geburtsdatum shown in overview; others hidden by default)")
-  "   - Custom fields: 6 (Geburtsdatum shown in overview; others hidden by default)"
-)
 
 IO.puts("   - Roles: 5 (Mitglied, Vorstand, Kassenwart, Buchhaltung, Admin)")
 IO.puts("   - Default fee type: Standard (120€ yearly)")

priv/repo/seeds_dev.exs

@@ -431,15 +431,16 @@ end)
 all_custom_fields = Ash.read!(Membership.CustomField, actor: admin_user_with_role)
 find_field = fn name -> Enum.find(all_custom_fields, &(&1.name == name)) end
 
-# 16 members with 4–6 custom field values each (Geburtsdatum, Datenschutz, SEPA, Rechnungs-E-Mail, IBAN, Stunden)
+# 16 members with 4–6 custom field values each (Geburtsdatum, DSGVO, SEPA, Rechnungs-E-Mail, IBAN, Stunden)
 custom_value_assignments =
   Enum.map(1..16, fn n ->
     email = "mitglied#{n}@example.de"
     # Vary birth dates and values per index
     base_date = Date.add(~D[1970-01-01], 365 * (n + 10) + rem(n * 31, 365))
+
     values = [
       {"Geburtsdatum", %{"_union_type" => "date", "_union_value" => base_date}},
-      {"Datenschutzerklärung akzeptiert",
+      {"DSGVO",
        %{"_union_type" => "boolean", "_union_value" => n in [1, 2, 3, 5, 7, 9, 11, 13, 15]}},
       {"SEPA-Mandat", %{"_union_type" => "boolean", "_union_value" => rem(n, 3) != 0}},
       {"Rechnungs-E-Mail",
@@ -448,10 +449,12 @@ custom_value_assignments =
        %{
          "_union_type" => "string",
          "_union_value" =>
-           "DE8937040044#{String.pad_leading(to_string(rem(532013000 + n, 1_000_000_000)), 10, "0")}"
+           "DE8937040044#{String.pad_leading(to_string(rem(532_013_000 + n, 1_000_000_000)), 10, "0")}"
        }},
-      {"Stunden ehrenamtlich", %{"_union_type" => "integer", "_union_value" => 5 + rem(n * 3, 25)}}
+      {"Stunden ehrenamtlich",
+       %{"_union_type" => "integer", "_union_value" => 5 + rem(n * 3, 25)}}
     ]
+
     # Drop 0–2 fields per member so not all have 6 (still ~80% overall filled)
     drop_count = rem(n, 3)
     {email, Enum.take(values, 6 - drop_count)}
@@ -502,19 +505,36 @@ case Membership.get_settings() do
       Membership.update_settings(settings, %{
         join_form_enabled: true,
         join_form_field_ids: settings.join_form_field_ids || default_join_form_field_ids,
-        join_form_field_required: settings.join_form_field_required || default_join_form_field_required
+        join_form_field_required:
+          settings.join_form_field_required || default_join_form_field_required
       })
     end
+
   _ ->
     :ok
 end
 
 # Membership applications (join requests) for UI testing: 4 submitted, 1 with extra form_data
 join_request_configs = [
-  %{email: "antrag1@example.de", first_name: "Sandra", last_name: "Meier", form_data: %{"city" => "Berlin"}},
+  %{
+    email: "antrag1@example.de",
+    first_name: "Sandra",
+    last_name: "Meier",
+    form_data: %{"city" => "Berlin"}
+  },
   %{email: "antrag2@example.de", first_name: "Thomas", last_name: "Bauer", form_data: %{}},
-  %{email: "antrag3@example.de", first_name: "Julia", last_name: "Krause", form_data: %{"city" => "Hamburg", "notes" => "Interesse an Jugendgruppe"}},
+  %{
-  %{email: "antrag4@example.de", first_name: "Michael", last_name: "Schmitt", form_data: %{"city" => "München"}}
+    email: "antrag3@example.de",
+    first_name: "Julia",
+    last_name: "Krause",
+    form_data: %{"city" => "Hamburg", "notes" => "Interesse an Jugendgruppe"}
+  },
+  %{
+    email: "antrag4@example.de",
+    first_name: "Michael",
+    last_name: "Schmitt",
+    form_data: %{"city" => "München"}
+  }
 ]
 
 for config <- join_request_configs do
@@ -532,8 +552,15 @@ for config <- join_request_configs do
 end
 
 IO.puts("✅ Dev seeds completed.")
-IO.puts("   - Members: 20 with country (mostly Deutschland, 1 Österreich, 1 Schweiz), fee types distributed, 5 with exit date")
+
-IO.puts("   - Test users: 4 linked to mitglied1–4 with roles Mitglied, Vorstand, Kassenwart, Buchhaltung")
+IO.puts(
+  "   - Members: 20 with country (mostly Deutschland, 1 Österreich, 1 Schweiz), fee types distributed, 5 with exit date"
+)
+
+IO.puts(
+  "   - Test users: 4 linked to mitglied1–4 with roles Mitglied, Vorstand, Kassenwart, Buchhaltung"
+)
+
 IO.puts("   - Groups: Vorstand, Jugend, Newsletter (with assignments)")
 IO.puts("   - Custom field values: ~80% filled (16 members, 4–6 fields each)")
 IO.puts("   - Join form enabled; 4 membership applications (join requests) for UI testing")

priv/resource_snapshots/repo/custom_fields/20260603000204.json

@@ -0,0 +1,145 @@
+{
+  "attributes": [
+    {
+      "allow_nil?": false,
+      "default": "fragment(\"gen_random_uuid()\")",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": true,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "id",
+      "type": "uuid"
+    },
+    {
+      "allow_nil?": false,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "name",
+      "type": "text"
+    },
+    {
+      "allow_nil?": false,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "slug",
+      "type": "text"
+    },
+    {
+      "allow_nil?": false,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "value_type",
+      "type": "text"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "description",
+      "type": "text"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "join_description",
+      "type": "text"
+    },
+    {
+      "allow_nil?": false,
+      "default": "false",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "required",
+      "type": "boolean"
+    },
+    {
+      "allow_nil?": false,
+      "default": "true",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "show_in_overview",
+      "type": "boolean"
+    }
+  ],
+  "base_filter": null,
+  "check_constraints": [],
+  "create_table_options": null,
+  "custom_indexes": [],
+  "custom_statements": [],
+  "has_create_action": true,
+  "hash": "2600667D140A2A846F9A848ACEFCADA1F1206950B38EF407B0BB13816E508A2A",
+  "identities": [
+    {
+      "all_tenants?": false,
+      "base_filter": null,
+      "index_name": "custom_fields_unique_name_index",
+      "keys": [
+        {
+          "type": "atom",
+          "value": "name"
+        }
+      ],
+      "name": "unique_name",
+      "nils_distinct?": true,
+      "where": null
+    },
+    {
+      "all_tenants?": false,
+      "base_filter": null,
+      "index_name": "custom_fields_unique_slug_index",
+      "keys": [
+        {
+          "type": "atom",
+          "value": "slug"
+        }
+      ],
+      "name": "unique_slug",
+      "nils_distinct?": true,
+      "where": null
+    }
+  ],
+  "multitenancy": {
+    "attribute": null,
+    "global": null,
+    "strategy": null
+  },
+  "repo": "Elixir.Mv.Repo",
+  "schema": null,
+  "table": "custom_fields"
+}

publiccode.yml

@@ -0,0 +1,100 @@
+publiccodeYmlVersion: "0.2"
+name: Mila
+url: "https://git.local-it.org/local-it/mitgliederverwaltung"
+softwareVersion: "1.2.0"
+releaseDate: "2026-05-08"
+developmentStatus: beta
+logo: logo.png
+platforms:
+- web
+softwareType: standalone/web
+categories:
+- contact-management
+- crm
+- billing-and-invoicing
+intendedAudience:
+  scope:
+  - society
+dependsOn:
+  open:
+  - name: PostgreSQL
+    versionMin: "18"
+maintenance:
+  type: internal
+  contacts:
+  - name: "Local-IT e.V."
+    email: "info@local-it.org"
+legal:
+  license: AGPL-3.0-only
+  mainCopyrightOwner: "Local-IT e.V."
+  repoOwner: "Local-IT e.V."
+localisation:
+  localisationReady: true
+  availableLanguages:
+  - de
+  - en
+description:
+  de:
+    genericName: Mitgliederverwaltung
+    shortDescription: >-
+      Einfache, barrierearme und freie Mitgliederverwaltung
+      für kleine und mittlere Vereine.
+    longDescription: >
+      **Mila** ist eine freie und quelloffene Mitgliederverwaltung, die auf
+      die realen Bedürfnisse von Vereinen ausgerichtet ist. Statt
+      überladener Funktionen oder teurer Lizenzen setzt Mila auf
+      Bedienbarkeit, Barrierefreiheit und DSGVO-Konformität. Vereine
+      verwalten ihre Mitgliederdaten, behalten Mitgliedsbeiträge und
+      Zahlungsstatus im Blick und passen erfasste Datenfelder, Rollen und
+      Berechtigungen flexibel an ihre Struktur an. Die Anwendung ist
+      self-hosting-freundlich, mehrsprachig (Deutsch und Englisch) und
+      unterstützt Single Sign-on über OIDC sowie Self-Service und
+      Online-Aufnahmeanträge für Mitglieder.
+    documentation: "https://wiki.local-it.org/s/mila-user-dokumentation"
+    features:
+    - Mitgliederdaten komfortabel verwalten
+    - Mitglieder in Gruppen organisieren
+    - Mitgliedsbeiträge und Zahlungsstatus verfolgen
+    - Volltextsuche mit unscharfer Suche (Fuzzy-Matching)
+    - Rollen und Berechtigungen (RBAC)
+    - Anpassbare Datenfelder pro Verein
+    - Single Sign-on über OIDC (Authentik, Rauthy, Keycloak)
+    - Self-Service und Online-Aufnahmeanträge
+    - Mitglieder per CSV importieren (mit Vorschau und Vorlagen)
+    - Anbindung an die Buchhaltungssoftware Vereinfacht
+    screenshots:
+    - .opencode/screenshots/01_mitglieder.png
+    - .opencode/screenshots/02_statistik.png
+    - .opencode/screenshots/03_beitraege.png
+    - .opencode/screenshots/04_aufnahmeantraege.png
+  en:
+    genericName: Membership management
+    shortDescription: >-
+      Simple, accessible and free membership management
+      for small and mid-sized clubs.
+    longDescription: >
+      **Mila** is a free and open-source membership management tool designed
+      for the real needs of clubs and associations. Instead of feature
+      overload or expensive licences, Mila focuses on usability,
+      accessibility and GDPR compliance. Clubs manage their member data,
+      keep track of membership fees and payment status, and adapt the
+      collected data fields, roles and permissions to their own structure.
+      The application is self-hosting friendly, multilingual (German and
+      English) and supports single sign-on via OIDC as well as member
+      self-service and online membership applications.
+    features:
+    - Manage member data with ease
+    - Organize members into groups
+    - Track membership fees and payment status
+    - Full-text search with fuzzy matching
+    - Roles and permissions (RBAC)
+    - Custom data fields per club
+    - Single sign-on via OIDC (Authentik, Rauthy, Keycloak)
+    - Member self-service and online application
+    - Import members via CSV (with preview and templates)
+    - Integration with the Vereinfacht accounting software
+    screenshots:
+    - .opencode/screenshots/01_mitglieder.png
+    - .opencode/screenshots/02_statistik.png
+    - .opencode/screenshots/03_beitraege.png
+    - .opencode/screenshots/04_aufnahmeantraege.png

test/membership/custom_field_validation_test.exs

@@ -159,6 +159,61 @@ defmodule Mv.Membership.CustomFieldValidationTest do
     end
   end
 
+  describe "join_description" do
+    test "persists join_description when set", %{actor: actor} do
+      assert {:ok, custom_field} =
+               CustomField
+               |> Ash.Changeset.for_create(:create, %{
+                 name: "dsgvo_field",
+                 value_type: :boolean,
+                 join_description: "hereby I confirm the GDPR"
+               })
+               |> Ash.create(actor: actor)
+
+      assert custom_field.join_description == "hereby I confirm the GDPR"
+    end
+
+    test "defaults to nil when not given", %{actor: actor} do
+      assert {:ok, custom_field} =
+               CustomField
+               |> Ash.Changeset.for_create(:create, %{
+                 name: "no_join_desc",
+                 value_type: :boolean
+               })
+               |> Ash.create(actor: actor)
+
+      assert custom_field.join_description == nil
+    end
+
+    test "rejects join_description longer than 1000 characters", %{actor: actor} do
+      assert {:error, changeset} =
+               CustomField
+               |> Ash.Changeset.for_create(:create, %{
+                 name: "too_long_join_desc",
+                 value_type: :boolean,
+                 join_description: String.duplicate("a", 1001)
+               })
+               |> Ash.create(actor: actor)
+
+      assert [%{field: :join_description, message: message}] = changeset.errors
+      assert message =~ "max" or message =~ "length" or message =~ "1000"
+    end
+
+    test "is writable via the update action", %{actor: actor} do
+      {:ok, custom_field} =
+        CustomField
+        |> Ash.Changeset.for_create(:create, %{name: "updatable", value_type: :boolean})
+        |> Ash.create(actor: actor)
+
+      assert {:ok, updated} =
+               custom_field
+               |> Ash.Changeset.for_update(:update, %{join_description: "Accept the GDPR"})
+               |> Ash.update(actor: actor)
+
+      assert updated.join_description == "Accept the GDPR"
+    end
+  end
+
   describe "name uniqueness" do
     test "rejects duplicate names", %{actor: actor} do
       assert {:ok, _} =

test/mv/membership/custom_field_value_formatter_test.exs

@@ -0,0 +1,27 @@
+defmodule Mv.Membership.CustomFieldValueFormatterTest do
+  use ExUnit.Case, async: true
+
+  alias Mv.Membership.CustomFieldValueFormatter
+
+  describe "format_custom_field_value/2 for :date" do
+    test "formats an Ash.Union date value as ISO-8601" do
+      union = %Ash.Union{value: ~D[2024-03-15], type: :date}
+
+      assert CustomFieldValueFormatter.format_custom_field_value(union, %{value_type: :date}) ==
+               "2024-03-15"
+    end
+
+    test "formats a direct Date value as ISO-8601" do
+      assert CustomFieldValueFormatter.format_custom_field_value(~D[2024-03-15], %{
+               value_type: :date
+             }) == "2024-03-15"
+    end
+
+    test "formats an already-stored ISO-8601 string date as ISO-8601" do
+      union = %Ash.Union{value: "2024-03-15", type: :date}
+
+      assert CustomFieldValueFormatter.format_custom_field_value(union, %{value_type: :date}) ==
+               "2024-03-15"
+    end
+  end
+end

test/mv/membership/import/column_resolver_query_test.exs

@@ -0,0 +1,72 @@
+defmodule Mv.Membership.Import.ColumnResolverQueryTest do
+  # async: false — attaches a global telemetry handler to inspect emitted SQL.
+  use Mv.DataCase, async: false
+
+  alias Mv.Membership.Import.ColumnResolver
+
+  setup do
+    %{actor: Mv.Helpers.SystemActor.get_system_actor()}
+  end
+
+  describe "create_or_find_group/3 group lookup is name-filtered (no full-table scan)" do
+    test "resolving a new name absent from the snapshot queries by name, not the whole table",
+         %{actor: actor} do
+      # Populate the table so a full-table read would be costly and observable.
+      for n <- 1..20, do: Mv.Fixtures.group_fixture(%{name: "Existing #{n}"})
+
+      queries =
+        capture_group_select_queries(fn ->
+          # The name is absent from the (empty) snapshot, forcing a DB lookup
+          # before the create attempt. That lookup must filter by name.
+          assert {:ok, group} = ColumnResolver.create_or_find_group("New One", [], actor)
+          assert group.name == "New One"
+        end)
+
+      # No SELECT against the groups table issued during resolution may be an
+      # unfiltered full-table scan. The pre-create existence check must filter by
+      # name (carry a WHERE predicate).
+      refute Enum.any?(queries, &unfiltered_groups_select?/1),
+             "expected no unfiltered groups table scan, got:\n#{Enum.join(queries, "\n")}"
+    end
+  end
+
+  defp capture_group_select_queries(fun) do
+    test_pid = self()
+    handler_id = "test-group-query-#{System.unique_integer([:positive])}"
+
+    :telemetry.attach(
+      handler_id,
+      [:mv, :repo, :query],
+      fn _event, _measurements, metadata, _config ->
+        sql = metadata[:query] || ""
+
+        if String.contains?(sql, "SELECT") and String.contains?(sql, "\"groups\"") do
+          send(test_pid, {:group_query, sql})
+        end
+      end,
+      nil
+    )
+
+    try do
+      fun.()
+    after
+      :telemetry.detach(handler_id)
+    end
+
+    collect_group_queries([])
+  end
+
+  defp collect_group_queries(acc) do
+    receive do
+      {:group_query, sql} -> collect_group_queries([sql | acc])
+    after
+      0 -> Enum.reverse(acc)
+    end
+  end
+
+  # An unfiltered groups SELECT reads the whole table: it selects FROM "groups"
+  # with no WHERE clause at all. A name-filtered lookup carries a WHERE predicate.
+  defp unfiltered_groups_select?(sql) do
+    String.contains?(sql, "FROM \"groups\"") and not String.contains?(sql, "WHERE")
+  end
+end

test/mv/membership/import/column_resolver_test.exs

@@ -0,0 +1,227 @@
+defmodule Mv.Membership.Import.ColumnResolverTest do
+  use Mv.DataCase, async: true
+  use ExUnitProperties
+
+  alias Mv.Membership.Import.ColumnResolver
+
+  setup do
+    %{actor: Mv.Helpers.SystemActor.get_system_actor()}
+  end
+
+  defp fee_type_fixture(name, actor) do
+    {:ok, fee_type} =
+      Mv.MembershipFees.create_membership_fee_type(
+        %{name: name, amount: Decimal.new("10.00"), interval: :yearly},
+        actor: actor
+      )
+
+    fee_type
+  end
+
+  defp header_maps(overrides) do
+    Map.merge(
+      %{
+        member: %{email: 0},
+        custom: %{},
+        unknown: [],
+        ignored: [],
+        groups_column_index: nil,
+        fee_type_column_index: nil
+      },
+      overrides
+    )
+  end
+
+  describe "resolve/3 group classification" do
+    test "splits group names into found (existing) and to_create (missing)", %{actor: actor} do
+      existing = Mv.Fixtures.group_fixture(%{name: "Orchester"})
+
+      maps = header_maps(%{member: %{email: 0}, groups_column_index: 1})
+
+      rows = [
+        {2, ["a@example.com", "Orchester"]},
+        {3, ["b@example.com", "Neues Ensemble"]}
+      ]
+
+      result = ColumnResolver.resolve(maps, rows, actor)
+
+      assert Enum.any?(result.groups_found, &(&1.name == "Orchester" and &1.id == existing.id))
+      assert "Neues Ensemble" in result.groups_to_create
+      refute "Orchester" in result.groups_to_create
+    end
+
+    test "groups_found and groups_to_create are empty when no groups column", %{actor: actor} do
+      maps = header_maps(%{})
+      rows = [{2, ["a@example.com"]}]
+
+      result = ColumnResolver.resolve(maps, rows, actor)
+
+      assert result.groups_found == []
+      assert result.groups_to_create == []
+    end
+  end
+
+  describe "resolve/3 preview rows" do
+    test "returns up to 3 preview rows", %{actor: actor} do
+      maps = header_maps(%{})
+
+      rows = [
+        {2, ["a@example.com"]},
+        {3, ["b@example.com"]},
+        {4, ["c@example.com"]},
+        {5, ["d@example.com"]}
+      ]
+
+      result = ColumnResolver.resolve(maps, rows, actor)
+
+      assert length(result.preview_rows) == 3
+      assert result.preview_rows == [["a@example.com"], ["b@example.com"], ["c@example.com"]]
+    end
+
+    test "returns fewer preview rows when file has fewer data rows", %{actor: actor} do
+      maps = header_maps(%{})
+      rows = [{2, ["a@example.com"]}]
+
+      result = ColumnResolver.resolve(maps, rows, actor)
+
+      assert result.preview_rows == [["a@example.com"]]
+    end
+  end
+
+  describe "resolve/3 fee-type resolution" do
+    test "maps known fee-type names to their id by normalized name", %{actor: actor} do
+      standard = fee_type_fixture("Standard", actor)
+
+      maps = header_maps(%{fee_type_column_index: 1})
+      rows = [{2, ["a@example.com", "Standard"]}]
+
+      result = ColumnResolver.resolve(maps, rows, actor)
+
+      assert result.fee_type_map["standard"] == standard.id
+      assert result.fee_type_warnings == []
+    end
+
+    test "records a warning for an unknown fee-type name", %{actor: actor} do
+      maps = header_maps(%{fee_type_column_index: 1})
+      rows = [{2, ["a@example.com", "Nonexistent Type"]}]
+
+      result = ColumnResolver.resolve(maps, rows, actor)
+
+      assert "Nonexistent Type" in result.fee_type_warnings
+    end
+
+    test "sets has_empty_fee_type_cells? when a fee-type cell is blank", %{actor: actor} do
+      fee_type_fixture("Standard", actor)
+
+      maps = header_maps(%{fee_type_column_index: 1})
+
+      rows = [
+        {2, ["a@example.com", "Standard"]},
+        {3, ["b@example.com", "  "]}
+      ]
+
+      result = ColumnResolver.resolve(maps, rows, actor)
+
+      assert result.has_empty_fee_type_cells? == true
+    end
+
+    test "has_empty_fee_type_cells? is false when all cells filled", %{actor: actor} do
+      fee_type_fixture("Standard", actor)
+
+      maps = header_maps(%{fee_type_column_index: 1})
+      rows = [{2, ["a@example.com", "Standard"]}]
+
+      result = ColumnResolver.resolve(maps, rows, actor)
+
+      assert result.has_empty_fee_type_cells? == false
+    end
+
+    test "fee-type resolution defaults are empty when no fee-type column", %{actor: actor} do
+      maps = header_maps(%{})
+      rows = [{2, ["a@example.com"]}]
+
+      result = ColumnResolver.resolve(maps, rows, actor)
+
+      assert result.fee_type_map == %{}
+      assert result.fee_type_warnings == []
+      assert result.has_empty_fee_type_cells? == false
+    end
+  end
+
+  describe "create_or_find_group/3" do
+    test "creates a new group when none exists", %{actor: actor} do
+      assert {:ok, group} = ColumnResolver.create_or_find_group("Brand New Group", [], actor)
+      assert group.name == "Brand New Group"
+    end
+
+    test "returns the existing group from the pre-fetched list without creating", %{actor: actor} do
+      existing = Mv.Fixtures.group_fixture(%{name: "Existing Group"})
+      before_count = length(Mv.Membership.list_groups!(actor: actor))
+
+      assert {:ok, group} =
+               ColumnResolver.create_or_find_group("Existing Group", [existing], actor)
+
+      assert group.id == existing.id
+      assert length(Mv.Membership.list_groups!(actor: actor)) == before_count
+    end
+
+    test "resolves to a group created concurrently after the snapshot was taken",
+         %{actor: actor} do
+      # Simulates a concurrent import session: the group name is absent from the
+      # caller's pre-fetched snapshot, but the group now exists in the DB. The
+      # resolver must link to the existing group, never error or duplicate it.
+      stale_snapshot = []
+      _concurrently_created = Mv.Fixtures.group_fixture(%{name: "Concurrent Group"})
+      before_count = length(Mv.Membership.list_groups!(actor: actor))
+
+      assert {:ok, group} =
+               ColumnResolver.create_or_find_group("Concurrent Group", stale_snapshot, actor)
+
+      assert group.name == "Concurrent Group"
+      assert length(Mv.Membership.list_groups!(actor: actor)) == before_count
+    end
+
+    property "is idempotent: same names never create duplicate groups", %{actor: actor} do
+      check all(
+              names <-
+                StreamData.list_of(
+                  StreamData.string(:alphanumeric, min_length: 1, max_length: 20),
+                  min_length: 1,
+                  max_length: 5
+                ),
+              max_runs: 25
+            ) do
+        names = Enum.map(names, &("grp-" <> &1))
+
+        existing = Mv.Membership.list_groups!(actor: actor)
+        first_ids = resolve_all(names, existing, actor)
+
+        existing_after = Mv.Membership.list_groups!(actor: actor)
+        second_ids = resolve_all(names, existing_after, actor)
+
+        # Same name always resolves to the same group id across both passes.
+        assert first_ids == second_ids
+
+        # No duplicate groups exist for any of the names (case-insensitive).
+        all_groups = Mv.Membership.list_groups!(actor: actor)
+
+        for name <- Enum.uniq_by(names, &String.downcase/1) do
+          matching =
+            Enum.filter(all_groups, fn g ->
+              String.downcase(g.name) == String.downcase(name)
+            end)
+
+          assert length(matching) == 1
+        end
+      end
+    end
+  end
+
+  defp resolve_all(names, existing, actor) do
+    Enum.map(names, fn name ->
+      {:ok, group} = ColumnResolver.create_or_find_group(name, existing, actor)
+      {String.downcase(name), group.id}
+    end)
+    |> Map.new()
+  end
+end

test/mv/membership/import/header_mapper_test.exs

@@ -1,5 +1,6 @@
 defmodule Mv.Membership.Import.HeaderMapperTest do
   use ExUnit.Case, async: true
+  use ExUnitProperties
 
   alias Mv.Membership.Import.HeaderMapper
 
@@ -272,4 +273,167 @@ defmodule Mv.Membership.Import.HeaderMapperTest do
       assert unknown == []
     end
   end
+
+  describe "build_maps/2 fee-status ignore list" do
+    test "places fee-status variants in ignored, not member or custom map" do
+      headers = ["email", "Bezahlstatus"]
+
+      assert {:ok, result} = HeaderMapper.build_maps(headers, [])
+
+      assert result.member[:email] == 0
+      assert result.custom == %{}
+      assert result.ignored == [1]
+      refute Map.has_key?(result.member, :bezahlstatus)
+    end
+
+    test "ignores membership_fee_status snake-case variant" do
+      headers = ["email", "membership_fee_status"]
+
+      assert {:ok, result} = HeaderMapper.build_maps(headers, [])
+
+      assert result.ignored == [1]
+      assert result.custom == %{}
+    end
+
+    test "ignores German Mitgliedsbeitragsstatus variant" do
+      headers = ["email", "Mitgliedsbeitragsstatus"]
+
+      assert {:ok, result} = HeaderMapper.build_maps(headers, [])
+
+      assert result.ignored == [1]
+    end
+
+    test "fee-status takes priority over a same-named custom field" do
+      headers = ["email", "Bezahlstatus"]
+      custom_fields = [%{id: "cf1", name: "Bezahlstatus"}]
+
+      assert {:ok, result} = HeaderMapper.build_maps(headers, custom_fields)
+
+      assert result.ignored == [1]
+      assert result.custom == %{}
+    end
+
+    test "result carries groups_column_index and fee_type_column_index keys" do
+      assert {:ok, result} = HeaderMapper.build_maps(["email"], [])
+
+      assert Map.has_key?(result, :groups_column_index)
+      assert Map.has_key?(result, :fee_type_column_index)
+    end
+  end
+
+  describe "build_maps/2 groups column detection" do
+    test "detects German Gruppen variant and excludes it from member/custom maps" do
+      headers = ["email", "Gruppen"]
+
+      assert {:ok, result} = HeaderMapper.build_maps(headers, [])
+
+      assert result.groups_column_index == 1
+      assert result.custom == %{}
+      assert result.unknown == []
+      refute Map.has_key?(result.member, :gruppen)
+    end
+
+    test "detects English Groups variant" do
+      headers = ["email", "Groups"]
+
+      assert {:ok, result} = HeaderMapper.build_maps(headers, [])
+
+      assert result.groups_column_index == 1
+    end
+
+    test "detects singular Gruppe and lowercase groups variants" do
+      assert {:ok, %{groups_column_index: 1}} = HeaderMapper.build_maps(["email", "Gruppe"], [])
+      assert {:ok, %{groups_column_index: 1}} = HeaderMapper.build_maps(["email", "groups"], [])
+    end
+
+    test "groups column takes priority over a same-named custom field" do
+      headers = ["email", "Gruppen"]
+      custom_fields = [%{id: "cf1", name: "Gruppen"}]
+
+      assert {:ok, result} = HeaderMapper.build_maps(headers, custom_fields)
+
+      assert result.groups_column_index == 1
+      assert result.custom == %{}
+    end
+
+    test "groups_column_index is nil when no groups column present" do
+      assert {:ok, %{groups_column_index: nil}} = HeaderMapper.build_maps(["email"], [])
+    end
+  end
+
+  describe "build_maps/2 fee-type column detection" do
+    test "detects German Beitragsart variant and excludes it from member/custom maps" do
+      headers = ["email", "Beitragsart"]
+
+      assert {:ok, result} = HeaderMapper.build_maps(headers, [])
+
+      assert result.fee_type_column_index == 1
+      assert result.custom == %{}
+      assert result.unknown == []
+    end
+
+    test "detects English fee type variants" do
+      assert {:ok, %{fee_type_column_index: 1}} =
+               HeaderMapper.build_maps(["email", "Fee Type"], [])
+
+      assert {:ok, %{fee_type_column_index: 1}} =
+               HeaderMapper.build_maps(["email", "fee type"], [])
+
+      assert {:ok, %{fee_type_column_index: 1}} =
+               HeaderMapper.build_maps(["email", "fee_type"], [])
+
+      assert {:ok, %{fee_type_column_index: 1}} =
+               HeaderMapper.build_maps(["email", "membership_fee_type"], [])
+    end
+
+    test "fee-type column takes priority over a same-named custom field" do
+      headers = ["email", "Beitragsart"]
+      custom_fields = [%{id: "cf1", name: "Beitragsart"}]
+
+      assert {:ok, result} = HeaderMapper.build_maps(headers, custom_fields)
+
+      assert result.fee_type_column_index == 1
+      assert result.custom == %{}
+    end
+
+    test "fee_type_column_index is nil when no fee-type column present" do
+      assert {:ok, %{fee_type_column_index: nil}} = HeaderMapper.build_maps(["email"], [])
+    end
+
+    test "detects groups and fee-type columns together" do
+      headers = ["email", "Gruppen", "Beitragsart"]
+
+      assert {:ok, result} = HeaderMapper.build_maps(headers, [])
+
+      assert result.groups_column_index == 1
+      assert result.fee_type_column_index == 2
+      assert result.member[:email] == 0
+      assert result.custom == %{}
+      assert result.unknown == []
+    end
+  end
+
+  describe "build_maps/2 fee-status ignore property" do
+    property "every fee-status variant is ignored, never member or custom" do
+      check all(
+              variant <-
+                StreamData.member_of([
+                  "Membership Fee Status",
+                  "membership_fee_status",
+                  "Mitgliedsbeitragsstatus",
+                  "Bezahlstatus",
+                  " Bezahlstatus ",
+                  "BEZAHLSTATUS"
+                ])
+            ) do
+        custom_fields = [%{id: "cf1", name: variant}]
+
+        assert {:ok, result} = HeaderMapper.build_maps(["email", variant], custom_fields)
+
+        assert result.ignored == [1]
+        assert result.custom == %{}
+        refute Map.has_key?(result.member, :bezahlstatus)
+      end
+    end
+  end
 end

test/mv/membership/import/import_runner_test.exs

@@ -3,6 +3,83 @@ defmodule Mv.Membership.Import.ImportRunnerTest do
 
   alias Mv.Membership.Import.ImportRunner
 
+  describe "carry_groups_forward/2" do
+    test "replaces import_state groups_found with the chunk's grown snapshot" do
+      import_state = %{groups_found: [%{id: "1", name: "A"}]}
+      chunk_result = %{groups_found: [%{id: "1", name: "A"}, %{id: "2", name: "B"}]}
+
+      assert ImportRunner.carry_groups_forward(import_state, chunk_result) == %{
+               groups_found: [%{id: "1", name: "A"}, %{id: "2", name: "B"}]
+             }
+    end
+
+    test "leaves import_state unchanged when the chunk result omits groups_found" do
+      import_state = %{groups_found: [%{id: "1", name: "A"}], other: :kept}
+      chunk_result = %{inserted: 1}
+
+      assert ImportRunner.carry_groups_forward(import_state, chunk_result) == import_state
+    end
+  end
+
+  describe "merge_progress/4 warning accumulation" do
+    test "deduplicates identical warnings across chunks instead of growing unbounded" do
+      progress = %{
+        inserted: 0,
+        failed: 0,
+        errors: [],
+        warnings: ["Fee type 'Ghost' not found; using the default fee type."],
+        status: :running,
+        current_chunk: 0,
+        total_chunks: 3
+      }
+
+      chunk_result = %{
+        inserted: 2,
+        failed: 0,
+        errors: [],
+        errors_truncated?: false,
+        warnings: [
+          "Fee type 'Ghost' not found; using the default fee type.",
+          "Fee type 'Ghost' not found; using the default fee type."
+        ]
+      }
+
+      result = ImportRunner.merge_progress(progress, chunk_result, 0)
+
+      assert result.warnings == ["Fee type 'Ghost' not found; using the default fee type."]
+    end
+
+    test "preserves distinct warnings while collapsing duplicates" do
+      progress = %{
+        inserted: 0,
+        failed: 0,
+        errors: [],
+        warnings: ["Fee type 'A' not found; using the default fee type."],
+        status: :running,
+        current_chunk: 0,
+        total_chunks: 2
+      }
+
+      chunk_result = %{
+        inserted: 1,
+        failed: 0,
+        errors: [],
+        errors_truncated?: false,
+        warnings: [
+          "Fee type 'A' not found; using the default fee type.",
+          "Fee type 'B' not found; using the default fee type."
+        ]
+      }
+
+      result = ImportRunner.merge_progress(progress, chunk_result, 0)
+
+      assert result.warnings == [
+               "Fee type 'A' not found; using the default fee type.",
+               "Fee type 'B' not found; using the default fee type."
+             ]
+    end
+  end
+
   describe "read_file_entry/2" do
     test "returns {:ok, content} for a readable file" do
       path =

test/mv/membership/import/member_csv_test.exs

@@ -1,5 +1,6 @@
 defmodule Mv.Membership.Import.MemberCSVTest do
   use Mv.DataCase, async: true
+  use ExUnitProperties
 
   alias Mv.Membership.Import.MemberCSV
 
@@ -899,4 +900,302 @@ defmodule Mv.Membership.Import.MemberCSVTest do
       assert import_state.chunks != []
     end
   end
+
+  describe "prepare/2 column resolution integration" do
+    setup do
+      %{actor: Mv.Helpers.SystemActor.get_system_actor()}
+    end
+
+    test "exposes resolver output keys in import_state", %{actor: actor} do
+      csv_content = "email\njohn@example.com"
+
+      assert {:ok, import_state} = MemberCSV.prepare(csv_content, actor: actor)
+
+      assert Map.has_key?(import_state, :ignored)
+      assert Map.has_key?(import_state, :groups_to_create)
+      assert Map.has_key?(import_state, :fee_type_map)
+      assert Map.has_key?(import_state, :fee_type_warnings)
+      assert Map.has_key?(import_state, :has_empty_fee_type_cells?)
+      assert Map.has_key?(import_state, :preview_rows)
+    end
+
+    test "fee-status column is reported as ignored, not as a custom field", %{actor: actor} do
+      {:ok, _custom_field} =
+        Mv.Membership.CustomField
+        |> Ash.Changeset.for_create(:create, %{name: "Bezahlstatus", value_type: :string})
+        |> Ash.create(actor: actor)
+
+      csv_content = "email;Bezahlstatus\njohn@example.com;paid"
+
+      assert {:ok, import_state} = MemberCSV.prepare(csv_content, actor: actor)
+
+      assert import_state.ignored == ["Bezahlstatus"]
+      assert import_state.custom_field_map == %{}
+    end
+
+    test "preview rows are limited to 3", %{actor: actor} do
+      csv_content = "email\na@example.com\nb@example.com\nc@example.com\nd@example.com"
+
+      assert {:ok, import_state} = MemberCSV.prepare(csv_content, actor: actor)
+
+      assert length(import_state.preview_rows) == 3
+    end
+  end
+
+  describe "process_chunk/4 fee-type assignment" do
+    setup do
+      actor = Mv.Helpers.SystemActor.get_system_actor()
+
+      {:ok, fee_type} =
+        Mv.MembershipFees.create_membership_fee_type(
+          %{name: "Premium", amount: Decimal.new("25.00"), interval: :yearly},
+          actor: actor
+        )
+
+      %{actor: actor, fee_type: fee_type}
+    end
+
+    test "sets membership_fee_type_id when fee-type cell matches a known type", %{
+      actor: actor,
+      fee_type: fee_type
+    } do
+      chunk = [
+        {2, %{member: %{email: "fee-known@example.com"}, custom: %{}, fee_type: "Premium"}}
+      ]
+
+      opts = [
+        actor: actor,
+        fee_type_map: %{"premium" => fee_type.id}
+      ]
+
+      assert {:ok, result} = MemberCSV.process_chunk(chunk, %{email: 0}, %{}, opts)
+      assert result.inserted == 1
+
+      member =
+        Mv.Membership.list_members!(actor: actor)
+        |> Enum.find(&(&1.email == "fee-known@example.com"))
+
+      assert member.membership_fee_type_id == fee_type.id
+    end
+
+    test "adds a warning when the fee-type name is unknown", %{actor: actor} do
+      chunk = [
+        {2, %{member: %{email: "fee-unknown@example.com"}, custom: %{}, fee_type: "Ghost Type"}}
+      ]
+
+      opts = [actor: actor, fee_type_map: %{}]
+
+      assert {:ok, result} = MemberCSV.process_chunk(chunk, %{email: 0}, %{}, opts)
+      assert result.inserted == 1
+      assert Enum.any?(result.warnings, &(&1 =~ "Ghost Type"))
+    end
+
+    test "uses the default fee type when the fee-type cell is empty", %{
+      actor: actor,
+      fee_type: fee_type
+    } do
+      {:ok, settings} = Mv.Membership.get_settings()
+
+      {:ok, _settings} =
+        Mv.Membership.update_settings(
+          settings,
+          %{default_membership_fee_type_id: fee_type.id},
+          actor: actor
+        )
+
+      chunk = [{2, %{member: %{email: "fee-empty@example.com"}, custom: %{}, fee_type: ""}}]
+
+      opts = [actor: actor, fee_type_map: %{}]
+
+      assert {:ok, result} = MemberCSV.process_chunk(chunk, %{email: 0}, %{}, opts)
+      assert result.inserted == 1
+
+      member =
+        Mv.Membership.list_members!(actor: actor)
+        |> Enum.find(&(&1.email == "fee-empty@example.com"))
+
+      # Default fee type assigned via SetDefaultMembershipFeeType.
+      assert member.membership_fee_type_id == fee_type.id
+    end
+  end
+
+  describe "process_chunk/4 group assignment" do
+    setup do
+      %{actor: Mv.Helpers.SystemActor.get_system_actor()}
+    end
+
+    defp group_names_for(email, actor) do
+      member =
+        Mv.Membership.list_members!(actor: actor)
+        |> Enum.find(&(&1.email == email))
+
+      member = Ash.load!(member, :groups, actor: actor)
+      member.groups |> Enum.map(& &1.name) |> Enum.sort()
+    end
+
+    test "assigns member to an existing group", %{actor: actor} do
+      existing = Mv.Fixtures.group_fixture(%{name: "Orchester"})
+
+      chunk = [
+        {2, %{member: %{email: "g-existing@example.com"}, custom: %{}, groups: "Orchester"}}
+      ]
+
+      opts = [actor: actor, groups_found: [existing]]
+
+      assert {:ok, result} = MemberCSV.process_chunk(chunk, %{email: 0}, %{}, opts)
+      assert result.inserted == 1
+
+      assert group_names_for("g-existing@example.com", actor) == ["Orchester"]
+
+      # No new group was created.
+      orchester = Enum.filter(Mv.Membership.list_groups!(actor: actor), &(&1.name == "Orchester"))
+      assert length(orchester) == 1
+    end
+
+    test "auto-creates an unknown group and assigns the member", %{actor: actor} do
+      chunk = [
+        {2, %{member: %{email: "g-new@example.com"}, custom: %{}, groups: "Frische Gruppe"}}
+      ]
+
+      opts = [actor: actor, groups_found: []]
+
+      assert {:ok, result} = MemberCSV.process_chunk(chunk, %{email: 0}, %{}, opts)
+      assert result.inserted == 1
+
+      assert group_names_for("g-new@example.com", actor) == ["Frische Gruppe"]
+      assert Enum.any?(Mv.Membership.list_groups!(actor: actor), &(&1.name == "Frische Gruppe"))
+    end
+
+    test "handles multiple comma-separated groups", %{actor: actor} do
+      chunk = [
+        {2, %{member: %{email: "g-multi@example.com"}, custom: %{}, groups: "Orchester, Chor"}}
+      ]
+
+      opts = [actor: actor, groups_found: []]
+
+      assert {:ok, result} = MemberCSV.process_chunk(chunk, %{email: 0}, %{}, opts)
+      assert result.inserted == 1
+
+      assert group_names_for("g-multi@example.com", actor) == ["Chor", "Orchester"]
+    end
+
+    test "does not re-read the group table once per row for a repeated novel name",
+         %{actor: actor} do
+      rows =
+        for i <- 1..10 do
+          {i + 1,
+           %{member: %{email: "g-nplus1-#{i}@example.com"}, custom: %{}, groups: "Shared Group"}}
+        end
+
+      group_read_count = Agent.start_link(fn -> 0 end) |> elem(1)
+      test_pid = self()
+
+      # process_chunk runs synchronously in this test process, so the telemetry
+      # handler (invoked in the query-executing process) sees self() == test_pid.
+      # Filtering on the pid keeps concurrent tests' group queries out of the count.
+      handler = fn _event, _measurements, metadata, _config ->
+        if self() == test_pid and metadata[:source] == "groups" and
+             is_binary(metadata[:query]) and String.starts_with?(metadata.query, "SELECT") do
+          Agent.update(group_read_count, &(&1 + 1))
+        end
+      end
+
+      handler_id = "test-group-read-counter-#{System.unique_integer([:positive])}"
+      :telemetry.attach(handler_id, [:mv, :repo, :query], handler, nil)
+
+      assert {:ok, %{inserted: 10}} =
+               MemberCSV.process_chunk(rows, %{email: 0}, %{}, actor: actor, groups_found: [])
+
+      reads = Agent.get(group_read_count, & &1)
+      :telemetry.detach(handler_id)
+
+      # The novel group is created on the first row and reused in memory for the
+      # remaining nine. Without accumulation each row triggers a fresh full-table
+      # read, scaling linearly with the row count.
+      assert reads <= 3,
+             "Expected the group table read at most a few times, got #{reads} reads for 10 rows (N+1)."
+    end
+
+    test "returns the grown group snapshot so later chunks skip the table read",
+         %{actor: actor} do
+      chunk1 = [
+        {2, %{member: %{email: "g-xchunk-1@example.com"}, custom: %{}, groups: "Shared X"}}
+      ]
+
+      chunk2 = [
+        {3, %{member: %{email: "g-xchunk-2@example.com"}, custom: %{}, groups: "Shared X"}}
+      ]
+
+      assert {:ok, result1} =
+               MemberCSV.process_chunk(chunk1, %{email: 0}, %{}, actor: actor, groups_found: [])
+
+      # The chunk result must expose the accumulated snapshot, including the group
+      # auto-created while processing this chunk, so the LiveView can thread it
+      # into the next chunk's opts.
+      assert is_list(result1.groups_found)
+      assert Enum.any?(result1.groups_found, &(&1.name == "Shared X"))
+
+      group_read_count = Agent.start_link(fn -> 0 end) |> elem(1)
+      test_pid = self()
+
+      handler = fn _event, _measurements, metadata, _config ->
+        if self() == test_pid and metadata[:source] == "groups" and
+             is_binary(metadata[:query]) and String.starts_with?(metadata.query, "SELECT") do
+          Agent.update(group_read_count, &(&1 + 1))
+        end
+      end
+
+      handler_id = "test-xchunk-group-read-#{System.unique_integer([:positive])}"
+      :telemetry.attach(handler_id, [:mv, :repo, :query], handler, nil)
+
+      assert {:ok, %{inserted: 1}} =
+               MemberCSV.process_chunk(chunk2, %{email: 0}, %{},
+                 actor: actor,
+                 groups_found: result1.groups_found
+               )
+
+      reads = Agent.get(group_read_count, & &1)
+      :telemetry.detach(handler_id)
+
+      # The second chunk receives the snapshot grown by the first, so the shared
+      # group resolves from memory without any full-table read.
+      assert reads == 0,
+             "Expected no group table read in the second chunk, got #{reads} (snapshot not threaded across chunks)."
+    end
+
+    test "empty groups cell leaves the member without group assignment", %{actor: actor} do
+      chunk = [{2, %{member: %{email: "g-empty@example.com"}, custom: %{}, groups: "  "}}]
+      opts = [actor: actor, groups_found: []]
+
+      assert {:ok, result} = MemberCSV.process_chunk(chunk, %{email: 0}, %{}, opts)
+      assert result.inserted == 1
+      assert result.errors == []
+
+      assert group_names_for("g-empty@example.com", actor) == []
+    end
+
+    property "re-importing the same groups does not create duplicates", %{actor: actor} do
+      check all(
+              name <- StreamData.string(:alphanumeric, min_length: 1, max_length: 15),
+              max_runs: 15
+            ) do
+        group_name = "dup-" <> name
+        email1 = "dup-#{System.unique_integer([:positive])}@example.com"
+        email2 = "dup-#{System.unique_integer([:positive])}@example.com"
+        opts = [actor: actor, groups_found: []]
+
+        chunk1 = [{2, %{member: %{email: email1}, custom: %{}, groups: group_name}}]
+        chunk2 = [{2, %{member: %{email: email2}, custom: %{}, groups: group_name}}]
+
+        assert {:ok, %{inserted: 1}} = MemberCSV.process_chunk(chunk1, %{email: 0}, %{}, opts)
+        assert {:ok, %{inserted: 1}} = MemberCSV.process_chunk(chunk2, %{email: 0}, %{}, opts)
+
+        matching =
+          Mv.Membership.list_groups!(actor: actor)
+          |> Enum.filter(&(String.downcase(&1.name) == String.downcase(group_name)))
+
+        assert length(matching) == 1
+      end
+    end
+  end
 end

test/mv_web/controllers/import_template_controller_test.exs

@@ -0,0 +1,104 @@
+defmodule MvWeb.ImportTemplateControllerTest do
+  use MvWeb.ConnCase, async: true
+
+  setup %{conn: conn} do
+    actor = Mv.Helpers.SystemActor.get_system_actor()
+
+    {:ok, custom_field} =
+      Mv.Membership.CustomField
+      |> Ash.Changeset.for_create(:create, %{name: "Lieblingsfarbe", value_type: :string})
+      |> Ash.create(actor: actor)
+
+    %{conn: conn, custom_field: custom_field}
+  end
+
+  describe "authenticated EN template" do
+    setup %{conn: conn} do
+      admin = Mv.Fixtures.user_with_role_fixture("admin")
+      %{conn: MvWeb.ConnCase.conn_with_password_user(conn, admin)}
+    end
+
+    test "returns CSV with English headers and current custom fields", %{conn: conn} do
+      conn = get(conn, ~p"/admin/import/template/en")
+
+      assert response_content_type(conn, :csv) =~ "text/csv"
+      body = response(conn, 200)
+
+      header = body |> String.split("\n") |> List.first()
+      assert header =~ "email"
+      # EN headers use the canonical English variant from HeaderMapper, not the
+      # underscore form, so the template stays faithful to the documented variant list.
+      assert header =~ "first name"
+      assert header =~ "last name"
+      refute header =~ "first_name"
+      assert header =~ "house number"
+      refute header =~ "house_number"
+      assert header =~ "Lieblingsfarbe"
+
+      assert get_resp_header(conn, "content-disposition")
+             |> Enum.any?(&(&1 =~ "member_import_en.csv"))
+    end
+
+    test "neutralizes formula-injection in a custom field header", %{conn: conn} do
+      actor = Mv.Helpers.SystemActor.get_system_actor()
+
+      {:ok, _} =
+        Mv.Membership.CustomField
+        |> Ash.Changeset.for_create(:create, %{
+          name: "=cmd|'/c calc'!A1",
+          value_type: :string
+        })
+        |> Ash.create(actor: actor)
+
+      conn = get(conn, ~p"/admin/import/template/en")
+      body = response(conn, 200)
+      header = body |> String.split("\n") |> List.first()
+
+      # The dangerous cell must be prefixed with a single quote so spreadsheet
+      # software does not evaluate it as a formula, matching the export writer.
+      refute header =~ ~r/(^|;)=cmd/
+      assert header =~ "'=cmd|'/c calc'!A1"
+    end
+  end
+
+  describe "authenticated DE template" do
+    setup %{conn: conn} do
+      admin = Mv.Fixtures.user_with_role_fixture("admin")
+      %{conn: MvWeb.ConnCase.conn_with_password_user(conn, admin)}
+    end
+
+    test "returns CSV with German headers and current custom fields", %{conn: conn} do
+      conn = get(conn, ~p"/admin/import/template/de")
+
+      body = response(conn, 200)
+      header = body |> String.split("\n") |> List.first()
+
+      assert header =~ "E-Mail"
+      assert header =~ "Vorname"
+      assert header =~ "Lieblingsfarbe"
+
+      assert get_resp_header(conn, "content-disposition")
+             |> Enum.any?(&(&1 =~ "member_import_de.csv"))
+    end
+  end
+
+  describe "authorization" do
+    @tag role: :unauthenticated
+    test "unauthenticated request does not receive a CSV", %{conn: conn} do
+      conn = get(conn, ~p"/admin/import/template/en")
+
+      refute conn.status == 200
+      refute get_resp_header(conn, "content-type") |> Enum.any?(&(&1 =~ "text/csv"))
+      refute to_string(conn.resp_body) =~ "email"
+    end
+
+    @tag role: :member
+    test "user without import permission is forbidden", %{conn: conn} do
+      conn = get(conn, ~p"/admin/import/template/en")
+
+      refute conn.status == 200
+      refute get_resp_header(conn, "content-type") |> Enum.any?(&(&1 =~ "text/csv"))
+      refute to_string(conn.resp_body) =~ "email"
+    end
+  end
+end

test/mv_web/helpers/join_description_renderer_test.exs

@@ -0,0 +1,85 @@
+defmodule MvWeb.Helpers.JoinDescriptionRendererTest do
+  @moduledoc """
+  Tests for the join-description renderer that auto-links raw URLs and Markdown
+  links while escaping all other content.
+  """
+  use ExUnit.Case, async: true
+  use ExUnitProperties
+
+  alias MvWeb.Helpers.JoinDescriptionRenderer
+
+  defp html(value) do
+    value
+    |> JoinDescriptionRenderer.render()
+    |> Phoenix.HTML.safe_to_string()
+  end
+
+  describe "render/1" do
+    test "converts a raw URL to an anchor tag with the standard link class" do
+      result = html("Akzeptiere https://example.com/dsgvo")
+
+      assert result =~ ~s(<a href="https://example.com/dsgvo" class="link link-primary")
+      assert result =~ "https://example.com/dsgvo</a>"
+      assert result =~ "Akzeptiere "
+    end
+
+    test "converts Markdown [text](url) to an anchor tag with the standard link class" do
+      result = html("[Datenschutzerklärung](https://example.com/dsgvo)")
+
+      assert result =~ ~s(<a href="https://example.com/dsgvo" class="link link-primary")
+      assert result =~ ">Datenschutzerklärung</a>"
+    end
+
+    test "returns an empty safe string for nil input" do
+      assert JoinDescriptionRenderer.render(nil) == {:safe, ""}
+    end
+
+    test "escapes arbitrary HTML in non-link text" do
+      result = html("<script>alert(1)</script>")
+
+      refute result =~ "<script>"
+      assert result =~ "&lt;script&gt;"
+    end
+
+    test "does not double-link a Markdown link whose URL also looks like a raw URL" do
+      result = html("[Datenschutz](https://example.com/x)")
+
+      # exactly one anchor, no nested anchor for the inner raw URL
+      assert result |> :binary.matches("<a ") |> length() == 1
+    end
+  end
+
+  describe "property: link-free text" do
+    property "preserves non-link text content as HTML-escaped output" do
+      check all(text <- link_free_string()) do
+        result = html(text)
+
+        # No links emitted, and text content equals the HTML-escaped input.
+        refute result =~ "<a "
+        assert result == Phoenix.HTML.html_escape(text) |> Phoenix.HTML.safe_to_string()
+      end
+    end
+  end
+
+  describe "property: well-formed Markdown links" do
+    property "renders every [text](https://...) as a single anchor with verbatim text and url" do
+      check all(
+              label <- string(:alphanumeric, min_length: 1),
+              path <- string(:alphanumeric)
+            ) do
+        url = "https://example.com/#{path}"
+        result = html("[#{label}](#{url})")
+
+        assert result =~ ~s(<a href="#{url}" class="link link-primary">#{label}</a>)
+        assert result |> :binary.matches("<a ") |> length() == 1
+      end
+    end
+  end
+
+  # Printable strings that contain no bare URLs and no Markdown-link opening bracket.
+  defp link_free_string do
+    :printable
+    |> string()
+    |> filter(fn s -> not String.contains?(s, "http") and not String.contains?(s, "[") end)
+  end
+end

test/mv_web/live/custom_field_live/form_test.exs

@@ -0,0 +1,102 @@
+defmodule MvWeb.CustomFieldLive.FormTest do
+  @moduledoc """
+  Tests for the CustomFieldLive.FormComponent join_description input.
+
+  Covers that an admin can set and persist a custom field's join_description via
+  the settings edit form.
+  """
+  use MvWeb.ConnCase, async: true
+
+  import Phoenix.LiveViewTest
+  require Ash.Query
+
+  alias Mv.Membership.CustomField
+
+  setup do
+    system_actor = Mv.Helpers.SystemActor.get_system_actor()
+    admin_role = Mv.Fixtures.role_fixture("admin")
+
+    {:ok, user} =
+      Mv.Accounts.User
+      |> Ash.Changeset.for_create(:register_with_password, %{
+        email: "admin#{System.unique_integer([:positive])}@mv.local",
+        password: "testpassword123"
+      })
+      |> Ash.create(actor: system_actor)
+
+    {:ok, user} =
+      user
+      |> Ash.Changeset.for_update(:update, %{})
+      |> Ash.Changeset.manage_relationship(:role, admin_role, type: :append_and_remove)
+      |> Ash.update(actor: system_actor)
+
+    user_with_role = Ash.load!(user, :role, domain: Mv.Accounts, actor: system_actor)
+    conn = log_in_user(build_conn(), user_with_role)
+    session = conn.private[:plug_session] || %{}
+    conn = Plug.Test.init_test_session(conn, Map.put(session, "locale", "en"))
+    %{conn: conn, actor: system_actor}
+  end
+
+  defp log_in_user(conn, user) do
+    conn
+    |> Phoenix.ConnTest.init_test_session(%{})
+    |> AshAuthentication.Plug.Helpers.store_in_session(user)
+  end
+
+  defp open_edit_form(view, custom_field) do
+    view
+    |> element("tr#custom_fields-#{custom_field.id} td", custom_field.name)
+    |> render_click()
+  end
+
+  describe "join_description input" do
+    test "form shows a join_description input", %{conn: conn, actor: actor} do
+      {:ok, custom_field} =
+        CustomField
+        |> Ash.Changeset.for_create(:create, %{name: "dsgvo_field", value_type: :boolean})
+        |> Ash.create(actor: actor)
+
+      {:ok, view, _html} = live(conn, ~p"/admin/datafields")
+      open_edit_form(view, custom_field)
+
+      assert has_element?(view, "input[name='custom_field[join_description]']")
+    end
+
+    test "form shows an info tooltip explaining allowed link syntax", %{conn: conn, actor: actor} do
+      {:ok, custom_field} =
+        CustomField
+        |> Ash.Changeset.for_create(:create, %{name: "dsgvo_field", value_type: :boolean})
+        |> Ash.create(actor: actor)
+
+      {:ok, view, _html} = live(conn, ~p"/admin/datafields")
+      open_edit_form(view, custom_field)
+
+      assert has_element?(
+               view,
+               "[data-testid='join-description-link-hint'] .hero-information-circle"
+             )
+    end
+
+    test "form accepts and persists join_description", %{conn: conn, actor: actor} do
+      {:ok, custom_field} =
+        CustomField
+        |> Ash.Changeset.for_create(:create, %{name: "dsgvo_field", value_type: :boolean})
+        |> Ash.create(actor: actor)
+
+      {:ok, view, _html} = live(conn, ~p"/admin/datafields")
+      open_edit_form(view, custom_field)
+
+      view
+      |> form("#custom-field-form-#{custom_field.id}-form", %{
+        "custom_field" => %{
+          "name" => custom_field.name,
+          "join_description" => "Accept the GDPR at https://example.com/dsgvo"
+        }
+      })
+      |> render_submit()
+
+      updated = Ash.get!(CustomField, custom_field.id, actor: actor)
+      assert updated.join_description == "Accept the GDPR at https://example.com/dsgvo"
+    end
+  end
+end

test/mv_web/live/import_live/components_test.exs

@@ -0,0 +1,31 @@
+defmodule MvWeb.ImportLive.ComponentsTest do
+  use ExUnit.Case, async: true
+
+  alias MvWeb.ImportLive.Components
+
+  describe "import_button_disabled?/2" do
+    @done_entry %{done?: true}
+
+    test "disables the Start Import button while the preview is displayed" do
+      # During :preview the upload entry is done, but re-clicking Start Import
+      # would re-run the upload processing and overwrite the current preview.
+      assert Components.import_button_disabled?(:preview, [@done_entry]) == true
+    end
+
+    test "disables the button while an import is running" do
+      assert Components.import_button_disabled?(:running, [@done_entry]) == true
+    end
+
+    test "disables the button when there are no upload entries" do
+      assert Components.import_button_disabled?(:idle, []) == true
+    end
+
+    test "disables the button while an upload entry is not yet done" do
+      assert Components.import_button_disabled?(:idle, [%{done?: false}]) == true
+    end
+
+    test "enables the button at idle with a completed upload" do
+      assert Components.import_button_disabled?(:idle, [@done_entry]) == false
+    end
+  end
+end

test/mv_web/live/import_live_test.exs

@@ -27,6 +27,16 @@ defmodule MvWeb.ImportLiveTest do
 
   defp submit_import(view), do: view |> form("#csv-upload-form", %{}) |> render_submit()
 
+  defp confirm_import(view),
+    do: view |> element("[data-testid='confirm-import-button']") |> render_click()
+
+  # Full flow: upload, enter preview (start), then confirm to begin processing.
+  defp run_full_import(view, csv_content, filename \\ "test_import.csv") do
+    upload_csv_file(view, csv_content, filename)
+    submit_import(view)
+    confirm_import(view)
+  end
+
   defp wait_for_import_completion, do: Process.sleep(1000)
 
   # ---------- Business logic: Authorization ----------
@@ -56,8 +66,7 @@ defmodule MvWeb.ImportLiveTest do
         |> File.read!()
 
       {:ok, view, _html} = live(conn, ~p"/admin/import")
-      upload_csv_file(view, csv_content)
+      run_full_import(view, csv_content)
-      submit_import(view)
       wait_for_import_completion()
 
       assert has_element?(view, "[data-testid='import-results-panel']")
@@ -121,8 +130,7 @@ defmodule MvWeb.ImportLiveTest do
       invalid_csv: csv_content
     } do
       {:ok, view, _html} = live(conn, ~p"/admin/import")
-      upload_csv_file(view, csv_content, "invalid_import.csv")
+      run_full_import(view, csv_content, "invalid_import.csv")
-      submit_import(view)
       wait_for_import_completion()
 
       assert has_element?(view, "[data-testid='import-results-panel']")
@@ -141,8 +149,7 @@ defmodule MvWeb.ImportLiveTest do
       invalid_rows =
         for i <- 1..100, do: "Row#{i};Last#{i};;Country#{i};City#{i};Street#{i};12345\n"
 
-      upload_csv_file(view, header <> Enum.join(invalid_rows), "large_invalid.csv")
+      run_full_import(view, header <> Enum.join(invalid_rows), "large_invalid.csv")
-      submit_import(view)
       wait_for_import_completion()
 
       assert has_element?(view, "[data-testid='import-results-panel']")
@@ -174,8 +181,7 @@ defmodule MvWeb.ImportLiveTest do
         Path.join([__DIR__, "..", "..", "fixtures", "csv_with_bom_semicolon.csv"])
         |> File.read!()
 
-      upload_csv_file(view, csv_content, "bom_import.csv")
+      run_full_import(view, csv_content, "bom_import.csv")
-      submit_import(view)
       wait_for_import_completion()
 
       assert has_element?(view, "[data-testid='import-results-panel']")
@@ -193,8 +199,7 @@ defmodule MvWeb.ImportLiveTest do
         Path.join([__DIR__, "..", "..", "fixtures", "csv_with_empty_lines.csv"])
         |> File.read!()
 
-      upload_csv_file(view, csv_content, "empty_lines.csv")
+      run_full_import(view, csv_content, "empty_lines.csv")
-      submit_import(view)
       wait_for_import_completion()
 
       assert has_element?(view, "[data-testid='import-error-list']")
@@ -208,8 +213,7 @@ defmodule MvWeb.ImportLiveTest do
       unknown_custom_field_csv: csv_content
     } do
       {:ok, view, _html} = live(conn, ~p"/admin/import")
-      upload_csv_file(view, csv_content, "unknown_custom.csv")
+      run_full_import(view, csv_content, "unknown_custom.csv")
-      submit_import(view)
       wait_for_import_completion()
 
       assert has_element?(view, "[data-testid='import-results-panel']")
@@ -240,23 +244,41 @@ defmodule MvWeb.ImportLiveTest do
       assert has_element?(view, "[data-testid='start-import-button']")
     end
 
-    test "template links and file input are present", %{conn: conn} do
+    test "template links point to the dynamic import template routes", %{conn: conn} do
+      {:ok, view, _html} = live(conn, ~p"/admin/import")
+      assert has_element?(view, "a[href='/admin/import/template/en']")
+      assert has_element?(view, "a[href='/admin/import/template/de']")
+      refute has_element?(view, "a[href*='/templates/member_import_en.csv']")
+    end
+
+    test "file input is present", %{conn: conn} do
       {:ok, view, _html} = live(conn, ~p"/admin/import")
-      assert has_element?(view, "a[href*='/templates/member_import_en.csv']")
-      assert has_element?(view, "a[href*='/templates/member_import_de.csv']")
       assert has_element?(view, "label[for='csv_file']")
       assert has_element?(view, "#csv_file_help")
       assert has_element?(view, "[data-testid='csv-upload-form'] input[type='file']")
     end
 
+    test "custom fields notice lists accepted groups and fee-type column names", %{conn: conn} do
+      {:ok, _view, html} = live(conn, ~p"/admin/import")
+
+      # Groups column variants (both EN and DE)
+      assert html =~ "Groups"
+      assert html =~ "Gruppen"
+      # Fee type column variants (both EN and DE)
+      assert html =~ "Beitragsart"
+      assert html =~ "Fee Type"
+      assert html =~ "fee type"
+      # Fee status is always ignored (named explicitly)
+      assert html =~ "Bezahlstatus"
+    end
+
     test "after successful import, progress container has aria-live", %{conn: conn} do
       csv_content =
         Path.join([__DIR__, "..", "..", "fixtures", "valid_member_import.csv"])
         |> File.read!()
 
       {:ok, view, _html} = live(conn, ~p"/admin/import")
-      upload_csv_file(view, csv_content)
+      run_full_import(view, csv_content)
-      submit_import(view)
       wait_for_import_completion()
       assert has_element?(view, "[data-testid='import-progress-container']")
       html = render(view)
@@ -275,4 +297,187 @@ defmodule MvWeb.ImportLiveTest do
     html = render(view)
     assert html =~ "Failed to prepare"
   end
+
+  describe "preview state machine" do
+    setup %{conn: conn} do
+      admin_user = Mv.Fixtures.user_with_role_fixture("admin")
+
+      conn =
+        conn
+        |> MvWeb.ConnCase.conn_with_password_user(admin_user)
+        |> put_locale_en()
+
+      valid_csv =
+        Path.join([__DIR__, "..", "..", "fixtures", "valid_member_import.csv"])
+        |> File.read!()
+
+      {:ok, conn: conn, valid_csv: valid_csv}
+    end
+
+    test "start_import transitions to preview without processing", %{
+      conn: conn,
+      valid_csv: csv_content
+    } do
+      {:ok, view, _html} = live(conn, ~p"/admin/import")
+      upload_csv_file(view, csv_content)
+      submit_import(view)
+
+      # Preview is shown; no results panel yet because nothing was processed.
+      assert has_element?(view, "[data-testid='import-preview']")
+      refute has_element?(view, "[data-testid='import-results-panel']")
+
+      # No member was created during preview (read-only step).
+      system_actor = Mv.Helpers.SystemActor.get_system_actor()
+      {:ok, members} = Membership.list_members(actor: system_actor)
+
+      refute Enum.any?(
+               members,
+               &(&1.email in ["alice.smith@example.com", "bob.johnson@example.com"])
+             )
+    end
+
+    test "confirm_import starts processing and creates members", %{
+      conn: conn,
+      valid_csv: csv_content
+    } do
+      {:ok, view, _html} = live(conn, ~p"/admin/import")
+      run_full_import(view, csv_content)
+      wait_for_import_completion()
+
+      assert has_element?(view, "[data-testid='import-results-panel']")
+
+      system_actor = Mv.Helpers.SystemActor.get_system_actor()
+      {:ok, members} = Membership.list_members(actor: system_actor)
+
+      imported =
+        Enum.filter(
+          members,
+          &(&1.email in ["alice.smith@example.com", "bob.johnson@example.com"])
+        )
+
+      assert length(imported) == 2
+    end
+
+    test "cancel_import returns to idle and hides the preview", %{
+      conn: conn,
+      valid_csv: csv_content
+    } do
+      {:ok, view, _html} = live(conn, ~p"/admin/import")
+      upload_csv_file(view, csv_content)
+      submit_import(view)
+      assert has_element?(view, "[data-testid='import-preview']")
+
+      view |> element("[data-testid='cancel-import-button']") |> render_click()
+
+      refute has_element?(view, "[data-testid='import-preview']")
+      refute has_element?(view, "[data-testid='import-results-panel']")
+    end
+  end
+
+  describe "preview contents" do
+    setup %{conn: conn} do
+      admin_user = Mv.Fixtures.user_with_role_fixture("admin")
+
+      conn =
+        conn
+        |> MvWeb.ConnCase.conn_with_password_user(admin_user)
+        |> put_locale_en()
+
+      {:ok, conn: conn}
+    end
+
+    test "shows the column mapping table with roles for each column", %{conn: conn} do
+      csv = "email;Gruppen;Beitragsart;Bezahlstatus;UnknownCol\na@e.com;Chor;Premium;paid;x"
+
+      {:ok, view, _html} = live(conn, ~p"/admin/import")
+      upload_csv_file(view, csv)
+      submit_import(view)
+
+      assert has_element?(view, "[data-testid='preview-mapping-table']")
+      html = render(view)
+
+      assert html =~ "email"
+      assert html =~ "Gruppen"
+      assert html =~ "Beitragsart"
+      assert html =~ "Bezahlstatus"
+      assert html =~ "UnknownCol"
+    end
+
+    test "lists every CSV column exactly once in the mapping table", %{conn: conn} do
+      headers = ["email", "Gruppen", "Beitragsart", "Bezahlstatus", "UnknownCol"]
+      csv = Enum.join(headers, ";") <> "\na@e.com;Chor;Premium;paid;x"
+
+      {:ok, view, _html} = live(conn, ~p"/admin/import")
+      upload_csv_file(view, csv)
+      submit_import(view)
+
+      # Count the data rows via their stable testid so the assertion is independent
+      # of how Phoenix renders class attributes or tr tags (§1.15).
+      html = render(view)
+
+      row_count =
+        html |> String.split(~s(data-testid="preview-column-row")) |> length() |> Kernel.-(1)
+
+      assert row_count == length(headers)
+    end
+
+    test "shows up to 3 sample data rows", %{conn: conn} do
+      csv = "email\nr1@e.com\nr2@e.com\nr3@e.com\nr4@e.com"
+
+      {:ok, view, _html} = live(conn, ~p"/admin/import")
+      upload_csv_file(view, csv)
+      submit_import(view)
+
+      html = render(view)
+      assert html =~ "r1@e.com"
+      assert html =~ "r2@e.com"
+      assert html =~ "r3@e.com"
+      refute html =~ "r4@e.com"
+    end
+
+    test "shows an auto-create notice for unknown group names", %{conn: conn} do
+      csv = "email;Gruppen\na@e.com;Ganz Neue Gruppe"
+
+      {:ok, view, _html} = live(conn, ~p"/admin/import")
+      upload_csv_file(view, csv)
+      submit_import(view)
+
+      assert has_element?(view, "[data-testid='preview-groups-notice']")
+      assert render(view) =~ "Ganz Neue Gruppe"
+    end
+
+    test "shows a warning and link for unknown fee-type names", %{conn: conn} do
+      csv = "email;Beitragsart\na@e.com;Phantom Tarif"
+
+      {:ok, view, _html} = live(conn, ~p"/admin/import")
+      upload_csv_file(view, csv)
+      submit_import(view)
+
+      assert has_element?(view, "[data-testid='preview-fee-type-warning']")
+      html = render(view)
+      assert html =~ "Phantom Tarif"
+      assert html =~ "/membership_fee_settings"
+    end
+
+    test "shows an info notice when fee-type cells are empty", %{conn: conn} do
+      csv = "email;Beitragsart\na@e.com;\nb@e.com;"
+
+      {:ok, view, _html} = live(conn, ~p"/admin/import")
+      upload_csv_file(view, csv)
+      submit_import(view)
+
+      assert has_element?(view, "[data-testid='preview-fee-type-info']")
+    end
+
+    test "shows a warning for unknown custom-field columns", %{conn: conn} do
+      csv = "email;TotallyUnknown\na@e.com;value"
+
+      {:ok, view, _html} = live(conn, ~p"/admin/import")
+      upload_csv_file(view, csv)
+      submit_import(view)
+
+      assert has_element?(view, "[data-testid='preview-unknown-warning']")
+      assert render(view) =~ "TotallyUnknown"
+    end
+  end
 end

test/mv_web/live/join_live_test.exs

@@ -165,6 +165,36 @@ defmodule MvWeb.JoinLiveTest do
                custom_field.name
              )
     end
+
+    @tag role: :unauthenticated
+    test "renders join_description with rendered link as label when set", %{conn: conn} do
+      {:ok, settings} = Membership.get_settings()
+      system_actor = Mv.Helpers.SystemActor.get_system_actor()
+
+      {:ok, custom_field} =
+        Membership.create_custom_field(
+          %{
+            name: "DSGVO",
+            value_type: :boolean,
+            join_description: "Akzeptiere die [Datenschutzerklärung](https://example.com/dsgvo)"
+          },
+          actor: system_actor
+        )
+
+      {:ok, _} =
+        Membership.update_settings(settings, %{
+          join_form_enabled: true,
+          join_form_field_ids: ["email", custom_field.id],
+          join_form_field_required: %{"email" => true, custom_field.id => false}
+        })
+
+      {:ok, _view, html} = live(conn, "/join")
+
+      assert html =~
+               ~s(<a href="https://example.com/dsgvo" class="link link-primary">Datenschutzerklärung</a>)
+
+      assert html =~ "Akzeptiere die"
+    end
   end
 
   describe "join field input types" do

test/mv_web/member_live/show_test.exs

@@ -220,4 +220,59 @@ defmodule MvWeb.MemberLive.ShowTest do
       assert html =~ "private@example.com"
     end
   end
+
+  describe "custom field join_description tooltip" do
+    test "shows a tooltip on the custom field label when join_description is set", %{
+      conn: conn,
+      member: member,
+      actor: actor
+    } do
+      {:ok, custom_field} =
+        CustomField
+        |> Ash.Changeset.for_create(:create, %{
+          name: "DSGVO",
+          value_type: :boolean,
+          join_description: "Accept the privacy policy"
+        })
+        |> Ash.create(actor: actor)
+
+      conn = conn_with_oidc_user(conn)
+      {:ok, view, html} = live(conn, ~p"/members/#{member}")
+
+      assert has_element?(view, "[data-tip*='Accept the privacy policy']")
+      # Tooltip content conveys both the join-form context and the description text.
+      assert has_element?(view, "[data-tip*='Join form:']")
+      assert html =~ "Accept the privacy policy"
+      assert html =~ custom_field.name
+
+      # The info-icon wrapper must center the icon vertically with the label,
+      # matching the flex-items-center idiom used elsewhere (e.g. custom field edit),
+      # so the icon is flush with the label text and not offset downward.
+      assert has_element?(
+               view,
+               "[data-tip*='Accept the privacy policy'].inline-flex.items-center"
+             )
+    end
+
+    test "shows no tooltip on the custom field label when join_description is nil", %{
+      conn: conn,
+      member: member,
+      actor: actor
+    } do
+      {:ok, _custom_field} =
+        CustomField
+        |> Ash.Changeset.for_create(:create, %{
+          name: "Plain field",
+          value_type: :string
+        })
+        |> Ash.create(actor: actor)
+
+      conn = conn_with_oidc_user(conn)
+      {:ok, view, _html} = live(conn, ~p"/members/#{member}")
+
+      assert has_element?(view, "dt", "Plain field")
+      # The info-icon tooltip beside the label is only rendered when join_description is set.
+      refute has_element?(view, "[data-testid='join-description-tooltip']")
+    end
+  end
 end

test/seeds_test.exs

@@ -123,5 +123,24 @@ defmodule Mv.SeedsTest do
       assert mitglied.permission_set_name == "own_data",
              "Mitglied role must have own_data permission set"
     end
+
+    test "bootstrap seeds create the DSGVO custom field and not the old long name", %{
+      actor: actor
+    } do
+      {:ok, custom_fields} = Ash.read(Mv.Membership.CustomField, actor: actor)
+      names = Enum.map(custom_fields, & &1.name)
+
+      assert "DSGVO" in names, "Bootstrap seeds must create a custom field named DSGVO"
+
+      refute "Datenschutzerklärung akzeptiert" in names,
+             "Old long field name must no longer be seeded"
+
+      dsgvo = Enum.find(custom_fields, &(&1.name == "DSGVO"))
+      assert dsgvo.value_type == :boolean
+
+      assert dsgvo.join_description ==
+               "Ich habe die [Datenschutzerklärung](https://example.org/datenschutz) gelesen und akzeptiere sie.",
+             "DSGVO field must be seeded with a default join_description"
+    end
   end
 end