Merge branch 'main' into feat/299_plz

lib/mv_web/live/member_live/index.html.heex

@@ -331,6 +331,28 @@
     >
       {MvWeb.MemberLive.Index.format_date(member.membership_fee_start_date)}
     </:col>
+    <:col
+      :let={member}
+      :if={:membership_fee_type in @member_fields_visible}
+      label={
+        ~H"""
+        <.live_component
+          module={MvWeb.Components.SortHeaderComponent}
+          id={:sort_membership_fee_type}
+          field={:membership_fee_type}
+          label={gettext("Fee Type")}
+          sort_field={@sort_field}
+          sort_order={@sort_order}
+        />
+        """
+      }
+    >
+      <%= if member.membership_fee_type do %>
+        {member.membership_fee_type.name}
+      <% else %>
+        <span class="text-base-content/50">—</span>
+      <% end %>
+    </:col>
     <:col
       :let={member}
       :if={:membership_fee_status in @member_fields_visible}