From 8d7834a5e36d310a37c1e3c7adf072a36ed39b99 Mon Sep 17 00:00:00 2001
From: Mae Beale <maebeale@gmail.com>
Date: Sun, 30 Aug 2026 16:50:43 -0400
Subject: [PATCH 1/4] Add payment-method filter + status chips to the event
 bulk-payments dashboard

Facilitators reconciling a "Pay for Others" payer couldn't tell at a glance
who still had loose ends, or narrow the list to one payment method. Now each
payer row shows how many of their attendees aren't registered or aren't paid,
and the list filters by the method the payer chose.

- FormSubmission.payment_method scope + PAYMENT_METHOD_FILTER_OPTIONS
- Event bulk-payments dashboard: payment-method filter in a turbo frame so
  only the list swaps on change
- Per-row chips ("N not registered" / "N unpaid"), query-free from the
  already-preloaded matches/allocation totals

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../events/bulk_payments_controller.rb        |  5 +-
 app/models/form_submission.rb                 | 11 ++++
 app/views/events/_bulk_payment_card.html.erb  | 24 ++++++++
 app/views/events/bulk_payments/index.html.erb | 57 +++++++++++++------
 spec/requests/events/bulk_payments_spec.rb    | 56 ++++++++++++++++++
 5 files changed, 134 insertions(+), 19 deletions(-)

diff --git a/app/controllers/events/bulk_payments_controller.rb b/app/controllers/events/bulk_payments_controller.rb
index 360f8168bc..f065f6d69b 100644
--- a/app/controllers/events/bulk_payments_controller.rb
+++ b/app/controllers/events/bulk_payments_controller.rb
@@ -5,11 +5,14 @@ class BulkPaymentsController < ApplicationController
 
     def index
       authorize! @event
-      track_view("events.bulk_payments", { event_id: @event.id })
+      # Skip on the filter turbo-frame reload so filtering doesn't double-count views.
+      track_view("events.bulk_payments", { event_id: @event.id }) unless turbo_frame_request?
 
+      @payment_method = params[:payment_method].presence
       @event_registrations = @event.event_registrations.active.not_transferred_in.includes(:registrant)
       @submissions = @event.form_submissions
                            .where(role: "bulk_payment")
+                           .payment_method(@payment_method)
                            .includes(:person, form_answers: :form_field, payment: :allocations)
                            .order(created_at: :desc)
       @allocated_by_registration = allocated_cents_by_registration(@event_registrations)
diff --git a/app/models/form_submission.rb b/app/models/form_submission.rb
index f1cd964e25..9339076afa 100644
--- a/app/models/form_submission.rb
+++ b/app/models/form_submission.rb
@@ -58,6 +58,17 @@ class FormSubmission < ApplicationRecord
     end
   }
 
+  # The bulk payments "Payment method" filter vocabulary — the method the payer
+  # chose on the form (stored as the `payment_method` answer). Same options the
+  # form offers (FormBuilderService::PAYMENT_METHOD_OPTIONS), value == label.
+  PAYMENT_METHOD_FILTER_OPTIONS = FormBuilderService::PAYMENT_METHOD_OPTIONS.map { |method| [ method, method ] }.freeze
+
+  scope :payment_method, ->(value) {
+    next all if value.blank?
+    joins(form_answers: :form_field)
+      .where(form_fields: { field_identifier: "payment_method" }, form_answers: { submitted_answer: value })
+  }
+
   # Submitted on `created_at` — there is no separate submitted_at column.
   scope :submitted_between, ->(start_date, end_date) {
     scope = all
diff --git a/app/views/events/_bulk_payment_card.html.erb b/app/views/events/_bulk_payment_card.html.erb
index 3f3251f96c..165e19da51 100644
--- a/app/views/events/_bulk_payment_card.html.erb
+++ b/app/views/events/_bulk_payment_card.html.erb
@@ -75,6 +75,30 @@
     </button>
   </div>
 
+  <%# At-a-glance status of who this payer covers: attendees not matched to any
+      registration, and matched registrations not yet paid in full (allocated from
+      the preloaded totals so this stays query-free). %>
+  <% unregistered_count = attendee_matches.count { |attendee| attendee[:matches].empty? }
+     unpaid_count = attendee_matches.count { |attendee|
+       attendee[:matches].present? && attendee[:matches].none? { |reg| allocated_by_registration.fetch(reg.id, 0) >= event_cost_cents }
+     } %>
+  <% if unregistered_count.positive? || unpaid_count.positive? %>
+    <div class="mt-2 flex flex-wrap gap-1.5">
+      <% if unregistered_count.positive? %>
+        <span class="inline-flex items-center gap-1 rounded-full border border-rose-200 bg-rose-50 px-2 py-0.5 text-xs font-medium text-rose-700">
+          <i class="fa-solid fa-user-slash"></i>
+          <%= pluralize(unregistered_count, "attendee") %> not registered
+        </span>
+      <% end %>
+      <% if unpaid_count.positive? %>
+        <span class="inline-flex items-center gap-1 rounded-full border border-amber-200 bg-amber-50 px-2 py-0.5 text-xs font-medium text-amber-700">
+          <i class="fa-solid fa-hand-holding-dollar"></i>
+          <%= pluralize(unpaid_count, "attendee") %> unpaid
+        </span>
+      <% end %>
+    </div>
+  <% end %>
+
   <div id="<%= content_id %>" class="hidden mt-3 pt-3 border-t border-gray-100 space-y-3" data-dropdown-target="content">
     <% if linked_regs.any? %>
       <div class="border-b border-gray-200 pt-2 space-y-1.5">
diff --git a/app/views/events/bulk_payments/index.html.erb b/app/views/events/bulk_payments/index.html.erb
index 22a2a4fb47..99e0143fd6 100644
--- a/app/views/events/bulk_payments/index.html.erb
+++ b/app/views/events/bulk_payments/index.html.erb
@@ -13,27 +13,48 @@
 
   <div class="mb-6 flex flex-wrap items-center justify-between gap-4">
     <h1 class="text-primary font-display text-2xl font-semibold">Bulk payments</h1>
-    <div class="flex items-center gap-3">
-      <%= link_to event_invoice_path(@event),
-                  class: "inline-flex items-center gap-1.5 rounded-lg border border-gray-300 bg-white px-3 py-2 text-sm font-medium text-gray-700 shadow-sm hover:bg-gray-50 transition-colors" do %>
-        <i class="fa-solid fa-file-invoice-dollar text-xs"></i> Blank invoice
-      <% end %>
-      <p class="text-sm text-gray-500"><%= @submissions.size %> submission<%= "s" unless @submissions.size == 1 %></p>
-    </div>
+    <%= link_to event_invoice_path(@event),
+                class: "inline-flex items-center gap-1.5 rounded-lg border border-gray-300 bg-white px-3 py-2 text-sm font-medium text-gray-700 shadow-sm hover:bg-gray-50 transition-colors" do %>
+      <i class="fa-solid fa-file-invoice-dollar text-xs"></i> Blank invoice
+    <% end %>
   </div>
 
-  <% if @submissions.any? %>
-    <div class="grid grid-cols-1 gap-3">
-      <% @submissions.each do |submission| %>
-        <%= render "events/bulk_payment_card", submission: submission,
-              event_registrations: @event_registrations,
-              allocated_by_registration: @allocated_by_registration %>
-      <% end %>
+  <%# Filter by the payment method the payer chose. Auto-submits into the results
+      frame on change so only the list swaps. %>
+  <%= form_with url: bulk_payments_event_path(@event), method: :get, autocomplete: "off",
+        data: { controller: "collection", turbo_frame: "bulk_payments_results" },
+        class: "border-primary/10 mb-6 rounded-2xl border bg-white p-4 shadow-sm" do %>
+    <div class="mb-3 flex items-center gap-2 text-gray-600">
+      <i class="fa-solid fa-filter text-xs" aria-hidden="true"></i>
+      <span class="text-xs font-semibold tracking-wide uppercase">Filters</span>
     </div>
-  <% else %>
-    <div class="border-primary/10 rounded-2xl border bg-white py-16 text-center">
-      <i class="fa-regular fa-receipt mb-3 text-4xl text-gray-300"></i>
-      <p class="text-gray-500">No bulk payment submissions yet.</p>
+    <div class="flex flex-wrap items-end gap-3">
+      <%= render "events/filter_select", param: :payment_method, label: "Payment method",
+            options: FormSubmission::PAYMENT_METHOD_FILTER_OPTIONS, selected: @payment_method,
+            blank: "Any payment method", field_class: search_field_class %>
+      <div class="flex items-end">
+        <%= render "shared/search_clear", url: bulk_payments_event_path(@event) %>
+      </div>
     </div>
   <% end %>
+
+  <%= turbo_frame_tag :bulk_payments_results do %>
+    <div class="mb-3 text-sm text-gray-500">
+      <%= pluralize(@submissions.size, "submission") %><%= " · #{@payment_method}" if @payment_method %>
+    </div>
+    <% if @submissions.any? %>
+      <div class="grid grid-cols-1 gap-3">
+        <% @submissions.each do |submission| %>
+          <%= render "events/bulk_payment_card", submission: submission,
+                event_registrations: @event_registrations,
+                allocated_by_registration: @allocated_by_registration %>
+        <% end %>
+      </div>
+    <% else %>
+      <div class="border-primary/10 rounded-2xl border bg-white py-16 text-center">
+        <i class="fa-regular fa-receipt mb-3 text-4xl text-gray-300"></i>
+        <p class="text-gray-500"><%= @payment_method ? "No bulk payments match this filter." : "No bulk payment submissions yet." %></p>
+      </div>
+    <% end %>
+  <% end %>
 </div>
diff --git a/spec/requests/events/bulk_payments_spec.rb b/spec/requests/events/bulk_payments_spec.rb
index 9717618689..548a2cb485 100644
--- a/spec/requests/events/bulk_payments_spec.rb
+++ b/spec/requests/events/bulk_payments_spec.rb
@@ -106,6 +106,62 @@
       expect(response).to have_http_status(:ok)
       expect(response.body).not_to include("New allocation")
     end
+
+    context "payment method filter" do
+      let(:check_payer) { create(:person, first_name: "Chesney", last_name: "Checkwriter") }
+      let(:card_payer) { create(:person, first_name: "Carla", last_name: "Cardholder") }
+      let!(:check_submission) { create(:form_submission, person: check_payer, form: form, event: event, role: "bulk_payment") }
+      let!(:card_submission) { create(:form_submission, person: card_payer, form: form, event: event, role: "bulk_payment") }
+
+      before do
+        check_submission.form_answers.create!(form_field: payment_method_field, submitted_answer: "Check")
+        card_submission.form_answers.create!(form_field: payment_method_field, submitted_answer: FormBuilderService::PAYMENT_METHOD_PAY_NOW)
+      end
+
+      it "shows only submissions matching the selected payment method" do
+        get bulk_payments_event_path(event, payment_method: "Check")
+
+        expect(response.body).to include("Chesney")
+        expect(response.body).not_to include("Carla")
+      end
+
+      it "shows every submission when no method is selected" do
+        get bulk_payments_event_path(event)
+
+        expect(response.body).to include("Chesney")
+        expect(response.body).to include("Carla")
+      end
+    end
+
+    context "status chips" do
+      let!(:attendees_field) do
+        create(:form_field, form: form, field_identifier: "bulk_payment_attendees", name: "Attendees")
+      end
+
+      it "flags attendees who aren't registered yet" do
+        submission.form_answers.create!(
+          form_field: attendees_field,
+          submitted_answer: [ { first_name: "Nomatch", last_name: "Person", email: "nomatch@example.com" } ].to_json
+        )
+
+        get bulk_payments_event_path(event)
+
+        expect(response.body).to include("not registered")
+      end
+
+      it "flags a matched registration that isn't paid in full" do
+        attendee = create(:person, first_name: "Owen", last_name: "Owing", email: "owen@example.com")
+        create(:event_registration, event: event, registrant: attendee, status: "registered")
+        submission.form_answers.create!(
+          form_field: attendees_field,
+          submitted_answer: [ { first_name: "Owen", last_name: "Owing", email: "owen@example.com" } ].to_json
+        )
+
+        get bulk_payments_event_path(event)
+
+        expect(response.body).to include("unpaid")
+      end
+    end
   end
 
   describe "POST /events/:id/allocate_bulk_payment" do

From 1f03d55a90c5648e47bf0f3e424fe96b6c444af4 Mon Sep 17 00:00:00 2001
From: Mae Beale <maebeale@gmail.com>
Date: Sun, 30 Aug 2026 17:15:49 -0400
Subject: [PATCH 2/4] Share one filter bar across both bulk-payment indexes;
 widen search; move chips
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Both bulk-payment indexes (the global cross-event list and the per-event
dashboard) now use one shared filter partial and the same filter logic, so they
can't drift. One search box spans the payer's name/email, their organization,
every submitted answer, and the raw metadata — and finds account-less payers,
which the old person-only search missed.

- FormSubmission.search: LEFT join person + search form_answers + metadata
- payment_status/payment_method folded into search_by_params; both controllers
  route through it
- Event dashboard gains search + payment status + date filters to match global
- Status chips moved into the payment-status column (under the badge), not a
  second row at the left

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 app/controllers/bulk_payments_controller.rb   |  1 -
 .../events/bulk_payments_controller.rb        |  5 +-
 app/models/form_submission.rb                 | 16 ++++--
 app/views/bulk_payments/_filters.html.erb     | 48 +++++++++++++++++
 app/views/bulk_payments/index.html.erb        | 43 +--------------
 app/views/events/_bulk_payment_card.html.erb  | 54 ++++++++++---------
 app/views/events/bulk_payments/index.html.erb | 25 ++-------
 spec/requests/bulk_payments_spec.rb           | 20 +++++++
 spec/requests/events/bulk_payments_spec.rb    | 14 +++++
 9 files changed, 133 insertions(+), 93 deletions(-)
 create mode 100644 app/views/bulk_payments/_filters.html.erb

diff --git a/app/controllers/bulk_payments_controller.rb b/app/controllers/bulk_payments_controller.rb
index f8361f2a22..e88f38b25f 100644
--- a/app/controllers/bulk_payments_controller.rb
+++ b/app/controllers/bulk_payments_controller.rb
@@ -7,7 +7,6 @@ def index
     if turbo_frame_request?
       @submissions = FormSubmission.bulk_payment
         .search_by_params(params)
-        .payment_status(params[:payment_status])
         .includes(:person, :event, :payment, { form: :events })
         .order(created_at: :desc)
         .paginate(page: params[:page], per_page: 50)
diff --git a/app/controllers/events/bulk_payments_controller.rb b/app/controllers/events/bulk_payments_controller.rb
index f065f6d69b..3c2696acba 100644
--- a/app/controllers/events/bulk_payments_controller.rb
+++ b/app/controllers/events/bulk_payments_controller.rb
@@ -8,11 +8,12 @@ def index
       # Skip on the filter turbo-frame reload so filtering doesn't double-count views.
       track_view("events.bulk_payments", { event_id: @event.id }) unless turbo_frame_request?
 
-      @payment_method = params[:payment_method].presence
       @event_registrations = @event.event_registrations.active.not_transferred_in.includes(:registrant)
+      # Same filter set as the global bulk payments index (search + method +
+      # status + dates), applied to this event's submissions.
       @submissions = @event.form_submissions
                            .where(role: "bulk_payment")
-                           .payment_method(@payment_method)
+                           .search_by_params(params)
                            .includes(:person, form_answers: :form_field, payment: :allocations)
                            .order(created_at: :desc)
       @allocated_by_registration = allocated_cents_by_registration(@event_registrations)
diff --git a/app/models/form_submission.rb b/app/models/form_submission.rb
index 9339076afa..15a9e1d777 100644
--- a/app/models/form_submission.rb
+++ b/app/models/form_submission.rb
@@ -89,10 +89,18 @@ class FormSubmission < ApplicationRecord
     )
   }
 
+  # One box across everything a payer typed: the linked person's name/email (when
+  # they have an account), every submitted answer (payer name/email, organization,
+  # attendees), and the raw metadata. LEFT join so account-less payers — common for
+  # bulk payments — are searchable too.
   scope :search, ->(query) {
-    joins(:person).where(
-      "CONCAT_WS(' ', people.first_name, people.last_name) LIKE :q OR people.email LIKE :q OR people.email_2 LIKE :q",
-      q: "%#{sanitize_sql_like(query)}%"
+    q = "%#{sanitize_sql_like(query)}%"
+    left_joins(:person).where(
+      "CONCAT_WS(' ', people.first_name, people.last_name) LIKE :q " \
+      "OR people.email LIKE :q OR people.email_2 LIKE :q " \
+      "OR CAST(form_submissions.metadata AS CHAR) LIKE :q " \
+      "OR EXISTS (SELECT 1 FROM form_answers WHERE form_answers.form_submission_id = form_submissions.id AND form_answers.submitted_answer LIKE :q)",
+      q: q
     )
   }
 
@@ -190,6 +198,8 @@ def self.search_by_params(params)
     results = results.where(role: params[:role]) if params[:role].present?
     results = results.for_organization(params[:organization_id]) if params[:organization_id].present?
     results = results.search(params[:search]) if params[:search].present?
+    results = results.payment_status(params[:payment_status]) if params[:payment_status].present?
+    results = results.payment_method(params[:payment_method]) if params[:payment_method].present?
     results = results.org_link_status(params[:org_status]) if params[:org_status].present?
     results = results.account_status(params[:account_status]) if params[:account_status].present?
     results = results.scenario(params[:scenario]) if params[:scenario].present?
diff --git a/app/views/bulk_payments/_filters.html.erb b/app/views/bulk_payments/_filters.html.erb
new file mode 100644
index 0000000000..375c1c6f7a
--- /dev/null
+++ b/app/views/bulk_payments/_filters.html.erb
@@ -0,0 +1,48 @@
+<%# Shared filter bar for both bulk-payment indexes — the global cross-event
+    index and the per-event dashboard — so the two stay in sync. One search box
+    spans the payer's name/email, their organization, every submitted answer, and
+    the raw metadata. Auto-submits into the results frame on change.
+    Locals: url (form action + clear), frame (turbo frame id),
+            scoped_to_event (hide the Event picker on the per-event page). %>
+<%= form_with url: url, method: :get, autocomplete: "off",
+      data: { controller: "collection", turbo_frame: frame },
+      class: "border-primary/10 mb-6 rounded-2xl border bg-white p-4 shadow-sm" do %>
+  <div class="mb-3 flex items-center gap-2 text-gray-600">
+    <i class="fa-solid fa-filter text-xs" aria-hidden="true"></i>
+    <span class="text-xs font-semibold tracking-wide uppercase">Filters</span>
+  </div>
+  <div class="flex flex-wrap items-end gap-3">
+    <div class="min-w-56 flex-1">
+      <%= label_tag :search, "Search", class: search_label_class %>
+      <%= text_field_tag :search, params[:search], placeholder: "Name, email, organization, or details", class: search_field_class %>
+    </div>
+
+    <%= render "events/filter_select", param: :payment_method, label: "Payment method",
+          options: FormSubmission::PAYMENT_METHOD_FILTER_OPTIONS, selected: params[:payment_method],
+          blank: "Any payment method", field_class: search_field_class %>
+
+    <%= render "events/filter_select", param: :payment_status, label: "Payment status",
+          options: FormSubmission::PAYMENT_STATUS_FILTER_OPTIONS, selected: params[:payment_status],
+          blank: "Any status", field_class: search_field_class %>
+
+    <% unless scoped_to_event %>
+      <div class="w-56">
+        <%= label_tag :event_id, "Event", class: search_label_class %>
+        <%= select_tag :event_id,
+              options_for_select(Event.where(id: params[:event_id]).map { |event| [ event.name, event.id ] }, params[:event_id]),
+              include_blank: true,
+              prompt: "Search for an event",
+              class: search_field_class,
+              data: { controller: "remote-select", remote_select_model_value: "event" } %>
+      </div>
+    <% end %>
+
+    <%= render "events/filter_date", param: :start_date, label: "Submitted from", field_class: search_field_class, wrapper_class: "w-40" %>
+
+    <%= render "events/filter_date", param: :end_date, label: "Submitted to", field_class: search_field_class, wrapper_class: "w-40" %>
+
+    <div class="flex items-end">
+      <%= render "shared/search_clear", url: url %>
+    </div>
+  </div>
+<% end %>
diff --git a/app/views/bulk_payments/index.html.erb b/app/views/bulk_payments/index.html.erb
index 6bf85aad03..75b5cdc320 100644
--- a/app/views/bulk_payments/index.html.erb
+++ b/app/views/bulk_payments/index.html.erb
@@ -20,47 +20,8 @@
       </div>
     </div>
 
-    <%# Filters. Auto-submit into the results frame on change. %>
-    <%= form_with url: bulk_payments_path, method: :get, autocomplete: "off",
-          data: { controller: "collection", turbo_frame: "bulk_payments_results" },
-          class: "mb-6 rounded-xl border border-gray-200 bg-white p-4 shadow-sm" do %>
-      <div class="mb-3 flex items-center gap-2 text-gray-600">
-        <i class="fa-solid fa-filter text-xs" aria-hidden="true"></i>
-        <span class="text-xs font-semibold tracking-wide uppercase">Filters</span>
-      </div>
-      <div class="flex flex-wrap items-end gap-3">
-        <div class="min-w-48 flex-1">
-          <%= label_tag :search, "Search", class: search_label_class %>
-          <%= text_field_tag :search, params[:search], placeholder: "Name or email", class: search_field_class %>
-        </div>
-
-        <div class="w-56">
-          <%= label_tag :event_id, "Event", class: search_label_class %>
-          <%= select_tag :event_id,
-                options_for_select(Event.where(id: params[:event_id]).map { |event| [ event.name, event.id ] }, params[:event_id]),
-                include_blank: true,
-                prompt: "Search for an event",
-                class: search_field_class,
-                data: { controller: "remote-select", remote_select_model_value: "event" } %>
-        </div>
-
-        <div class="w-44">
-          <%= label_tag :payment_status, "Payment status", class: search_label_class %>
-          <%= select_tag :payment_status,
-                options_for_select(FormSubmission::PAYMENT_STATUS_FILTER_OPTIONS, params[:payment_status]),
-                include_blank: "Any status",
-                class: search_field_class(extra: "search-select-placeholder") %>
-        </div>
-
-        <%= render "events/filter_date", param: :start_date, label: "Submitted from", field_class: search_field_class, wrapper_class: "w-40" %>
-
-        <%= render "events/filter_date", param: :end_date, label: "Submitted to", field_class: search_field_class, wrapper_class: "w-40" %>
-
-        <div class="flex items-end">
-          <%= render "shared/search_clear", url: bulk_payments_path %>
-        </div>
-      </div>
-    <% end %>
+    <%= render "bulk_payments/filters", url: bulk_payments_path,
+          frame: "bulk_payments_results", scoped_to_event: false %>
 
     <% result_src = bulk_payments_path(request.query_parameters) %>
     <%= turbo_frame_tag :bulk_payments_results, src: result_src, data: { turbo: "temporary" } do %>
diff --git a/app/views/events/_bulk_payment_card.html.erb b/app/views/events/_bulk_payment_card.html.erb
index 165e19da51..1d1220a372 100644
--- a/app/views/events/_bulk_payment_card.html.erb
+++ b/app/views/events/_bulk_payment_card.html.erb
@@ -21,7 +21,15 @@
   event_cost_cents = @event.cost_cents.to_i
   linked_ids = submission.linked_registration_ids.to_set
   linked_regs = event_registrations.select { |r| linked_ids.include?(r.id) }
-  attendee_matches = submission.matched_attendees(event_registrations) %>
+  attendee_matches = submission.matched_attendees(event_registrations)
+
+  # At-a-glance status of who this payer covers: attendees not matched to any
+  # registration, and matched registrations not yet paid in full (allocated from
+  # the preloaded totals so this stays query-free).
+  unregistered_count = attendee_matches.count { |attendee| attendee[:matches].empty? }
+  unpaid_count = attendee_matches.count { |attendee|
+    attendee[:matches].present? && attendee[:matches].none? { |reg| allocated_by_registration.fetch(reg.id, 0) >= event_cost_cents }
+  } %>
 
 <div id="payment-card-<%= submission.id %>" data-controller="dropdown" class="bg-white border rounded-xl shadow-sm px-4 py-3 hover:shadow-md transition-shadow transition-colors duration-150 scroll-mt-4 <%= highlighted ? "border-yellow-500 bg-yellow-50 ring-2 ring-inset ring-yellow-500" : "border-gray-200" %>">
   <%#
@@ -34,7 +42,25 @@
     <span class="text-sm text-gray-500 min-w-0 break-all lg:break-normal lg:truncate"><%= submission.person.email %></span>
     <span class="text-sm text-gray-500 min-w-0 whitespace-nowrap lg:truncate"><%= payment_method.presence || "—" %></span>
     <span class="text-sm text-gray-500 whitespace-nowrap tabular-nums lg:text-right"><% amount_cents = payment&.amount_cents || submission.bulk_payment_amount_cents(@event) %><%= dollars_from_cents(amount_cents) %></span>
-    <span id="<%= dom_id(payment, :remaining) if payment %>" class="min-w-0"><%= render "events/payment_badge", payment: payment %></span>
+    <div class="flex min-w-0 flex-col gap-1">
+      <span id="<%= dom_id(payment, :remaining) if payment %>" class="min-w-0"><%= render "events/payment_badge", payment: payment %></span>
+      <% if unregistered_count.positive? || unpaid_count.positive? %>
+        <div class="flex flex-wrap gap-1">
+          <% if unregistered_count.positive? %>
+            <span class="inline-flex items-center gap-1 rounded-full border border-rose-200 bg-rose-50 px-2 py-0.5 text-xs font-medium text-rose-700">
+              <i class="fa-solid fa-user-slash"></i>
+              <%= pluralize(unregistered_count, "attendee") %> not registered
+            </span>
+          <% end %>
+          <% if unpaid_count.positive? %>
+            <span class="inline-flex items-center gap-1 rounded-full border border-amber-200 bg-amber-50 px-2 py-0.5 text-xs font-medium text-amber-700">
+              <i class="fa-solid fa-hand-holding-dollar"></i>
+              <%= pluralize(unpaid_count, "attendee") %> unpaid
+            </span>
+          <% end %>
+        </div>
+      <% end %>
+    </div>
     <span class="text-sm text-gray-500 whitespace-nowrap"><%= submission.created_at.strftime("%b %-d, %Y") %></span>
 
     <div class="flex items-center gap-2">
@@ -75,30 +101,6 @@
     </button>
   </div>
 
-  <%# At-a-glance status of who this payer covers: attendees not matched to any
-      registration, and matched registrations not yet paid in full (allocated from
-      the preloaded totals so this stays query-free). %>
-  <% unregistered_count = attendee_matches.count { |attendee| attendee[:matches].empty? }
-     unpaid_count = attendee_matches.count { |attendee|
-       attendee[:matches].present? && attendee[:matches].none? { |reg| allocated_by_registration.fetch(reg.id, 0) >= event_cost_cents }
-     } %>
-  <% if unregistered_count.positive? || unpaid_count.positive? %>
-    <div class="mt-2 flex flex-wrap gap-1.5">
-      <% if unregistered_count.positive? %>
-        <span class="inline-flex items-center gap-1 rounded-full border border-rose-200 bg-rose-50 px-2 py-0.5 text-xs font-medium text-rose-700">
-          <i class="fa-solid fa-user-slash"></i>
-          <%= pluralize(unregistered_count, "attendee") %> not registered
-        </span>
-      <% end %>
-      <% if unpaid_count.positive? %>
-        <span class="inline-flex items-center gap-1 rounded-full border border-amber-200 bg-amber-50 px-2 py-0.5 text-xs font-medium text-amber-700">
-          <i class="fa-solid fa-hand-holding-dollar"></i>
-          <%= pluralize(unpaid_count, "attendee") %> unpaid
-        </span>
-      <% end %>
-    </div>
-  <% end %>
-
   <div id="<%= content_id %>" class="hidden mt-3 pt-3 border-t border-gray-100 space-y-3" data-dropdown-target="content">
     <% if linked_regs.any? %>
       <div class="border-b border-gray-200 pt-2 space-y-1.5">
diff --git a/app/views/events/bulk_payments/index.html.erb b/app/views/events/bulk_payments/index.html.erb
index 99e0143fd6..cb67b1f5ea 100644
--- a/app/views/events/bulk_payments/index.html.erb
+++ b/app/views/events/bulk_payments/index.html.erb
@@ -19,28 +19,13 @@
     <% end %>
   </div>
 
-  <%# Filter by the payment method the payer chose. Auto-submits into the results
-      frame on change so only the list swaps. %>
-  <%= form_with url: bulk_payments_event_path(@event), method: :get, autocomplete: "off",
-        data: { controller: "collection", turbo_frame: "bulk_payments_results" },
-        class: "border-primary/10 mb-6 rounded-2xl border bg-white p-4 shadow-sm" do %>
-    <div class="mb-3 flex items-center gap-2 text-gray-600">
-      <i class="fa-solid fa-filter text-xs" aria-hidden="true"></i>
-      <span class="text-xs font-semibold tracking-wide uppercase">Filters</span>
-    </div>
-    <div class="flex flex-wrap items-end gap-3">
-      <%= render "events/filter_select", param: :payment_method, label: "Payment method",
-            options: FormSubmission::PAYMENT_METHOD_FILTER_OPTIONS, selected: @payment_method,
-            blank: "Any payment method", field_class: search_field_class %>
-      <div class="flex items-end">
-        <%= render "shared/search_clear", url: bulk_payments_event_path(@event) %>
-      </div>
-    </div>
-  <% end %>
+  <%= render "bulk_payments/filters", url: bulk_payments_event_path(@event),
+        frame: "bulk_payments_results", scoped_to_event: true %>
 
+  <% any_filter = request.query_parameters.slice("search", "payment_method", "payment_status", "start_date", "end_date").any? { |_, v| v.present? } %>
   <%= turbo_frame_tag :bulk_payments_results do %>
     <div class="mb-3 text-sm text-gray-500">
-      <%= pluralize(@submissions.size, "submission") %><%= " · #{@payment_method}" if @payment_method %>
+      <%= pluralize(@submissions.size, "submission") %>
     </div>
     <% if @submissions.any? %>
       <div class="grid grid-cols-1 gap-3">
@@ -53,7 +38,7 @@
     <% else %>
       <div class="border-primary/10 rounded-2xl border bg-white py-16 text-center">
         <i class="fa-regular fa-receipt mb-3 text-4xl text-gray-300"></i>
-        <p class="text-gray-500"><%= @payment_method ? "No bulk payments match this filter." : "No bulk payment submissions yet." %></p>
+        <p class="text-gray-500"><%= any_filter ? "No bulk payments match these filters." : "No bulk payment submissions yet." %></p>
       </div>
     <% end %>
   <% end %>
diff --git a/spec/requests/bulk_payments_spec.rb b/spec/requests/bulk_payments_spec.rb
index 3376f49576..04c2b6aacd 100644
--- a/spec/requests/bulk_payments_spec.rb
+++ b/spec/requests/bulk_payments_spec.rb
@@ -52,6 +52,26 @@
         expect(response.body).not_to include("form-submission-row-#{theirs.id}")
       end
 
+      it "finds an account-less payer by a submitted answer such as their organization" do
+        event = create(:event)
+        submission = create(:form_submission, role: "bulk_payment", event: event, person: nil)
+        field = create(:form_field, form: submission.form, field_identifier: "payer_organization", name: "Organization")
+        submission.form_answers.create!(form_field: field, submitted_answer: "Westside Shelter")
+
+        get bulk_payments_path(search: "Westside"), headers: frame_headers
+
+        expect(response.body).to include("form-submission-row-#{submission.id}")
+      end
+
+      it "matches on the submission metadata" do
+        event = create(:event)
+        submission = create(:form_submission, role: "bulk_payment", event: event, metadata: { "note" => "VIP donor" })
+
+        get bulk_payments_path(search: "VIP donor"), headers: frame_headers
+
+        expect(response.body).to include("form-submission-row-#{submission.id}")
+      end
+
       it "filters by payment status" do
         event = create(:event)
         unpaid = create(:form_submission, role: "bulk_payment", event: event)
diff --git a/spec/requests/events/bulk_payments_spec.rb b/spec/requests/events/bulk_payments_spec.rb
index 548a2cb485..e096f1d100 100644
--- a/spec/requests/events/bulk_payments_spec.rb
+++ b/spec/requests/events/bulk_payments_spec.rb
@@ -133,6 +133,20 @@
       end
     end
 
+    context "search" do
+      let(:priya) { create(:person, first_name: "Priya", last_name: "Patel") }
+      let(:sam) { create(:person, first_name: "Sam", last_name: "Jonesborough") }
+      let!(:priya_sub) { create(:form_submission, person: priya, form: form, event: event, role: "bulk_payment") }
+      let!(:sam_sub) { create(:form_submission, person: sam, form: form, event: event, role: "bulk_payment") }
+
+      it "narrows the list to matches on the shared search box" do
+        get bulk_payments_event_path(event, search: "Priya")
+
+        expect(response.body).to include("Priya")
+        expect(response.body).not_to include("Jonesborough")
+      end
+    end
+
     context "status chips" do
       let!(:attendees_field) do
         create(:form_field, form: form, field_identifier: "bulk_payment_attendees", name: "Attendees")

From 2f5fb74641b6b89af7be9b58c7b3b9cd6634cfcc Mon Sep 17 00:00:00 2001
From: Mae Beale <maebeale@gmail.com>
Date: Sun, 30 Aug 2026 17:30:08 -0400
Subject: [PATCH 3/4] Fit the bulk-payments filter bar on one desktop row; add
 Features entry
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The shared filter fields now shrink to fixed widths at sm+ so all six controls
sit on one row on desktop, and go full-width (stacked) below sm — flex-wrap
handles the in-between. Also documents the filter/search/chips work on the
Features & tips page.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 app/views/bulk_payments/_filters.html.erb | 12 ++++++------
 config/features.yml                       | 14 ++++++++++++++
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/app/views/bulk_payments/_filters.html.erb b/app/views/bulk_payments/_filters.html.erb
index 375c1c6f7a..6702290f4d 100644
--- a/app/views/bulk_payments/_filters.html.erb
+++ b/app/views/bulk_payments/_filters.html.erb
@@ -12,21 +12,21 @@
     <span class="text-xs font-semibold tracking-wide uppercase">Filters</span>
   </div>
   <div class="flex flex-wrap items-end gap-3">
-    <div class="min-w-56 flex-1">
+    <div class="min-w-44 flex-1">
       <%= label_tag :search, "Search", class: search_label_class %>
       <%= text_field_tag :search, params[:search], placeholder: "Name, email, organization, or details", class: search_field_class %>
     </div>
 
     <%= render "events/filter_select", param: :payment_method, label: "Payment method",
           options: FormSubmission::PAYMENT_METHOD_FILTER_OPTIONS, selected: params[:payment_method],
-          blank: "Any payment method", field_class: search_field_class %>
+          blank: "Any payment method", field_class: search_field_class, wrapper_class: "w-full sm:w-40" %>
 
     <%= render "events/filter_select", param: :payment_status, label: "Payment status",
           options: FormSubmission::PAYMENT_STATUS_FILTER_OPTIONS, selected: params[:payment_status],
-          blank: "Any status", field_class: search_field_class %>
+          blank: "Any status", field_class: search_field_class, wrapper_class: "w-full sm:w-40" %>
 
     <% unless scoped_to_event %>
-      <div class="w-56">
+      <div class="w-full sm:w-44">
         <%= label_tag :event_id, "Event", class: search_label_class %>
         <%= select_tag :event_id,
               options_for_select(Event.where(id: params[:event_id]).map { |event| [ event.name, event.id ] }, params[:event_id]),
@@ -37,9 +37,9 @@
       </div>
     <% end %>
 
-    <%= render "events/filter_date", param: :start_date, label: "Submitted from", field_class: search_field_class, wrapper_class: "w-40" %>
+    <%= render "events/filter_date", param: :start_date, label: "Submitted from", field_class: search_field_class, wrapper_class: "w-full sm:w-36" %>
 
-    <%= render "events/filter_date", param: :end_date, label: "Submitted to", field_class: search_field_class, wrapper_class: "w-40" %>
+    <%= render "events/filter_date", param: :end_date, label: "Submitted to", field_class: search_field_class, wrapper_class: "w-full sm:w-36" %>
 
     <div class="flex items-end">
       <%= render "shared/search_clear", url: url %>
diff --git a/config/features.yml b/config/features.yml
index b3c14eb2f7..36d4636aa7 100644
--- a/config/features.yml
+++ b/config/features.yml
@@ -2837,3 +2837,17 @@
   pro_tips:
     - "No chip means the affiliation is active right now — a chip only appears for a future start or a past end."
     - "The chips look and behave the same on the person editor, the organization editor, and the standalone affiliation edit page."
+
+- name: "Search and filter the bulk payments dashboards"
+  area: payments
+  display_status: user_facing
+  released_on: 2026-08-30
+  pr_number: 2006
+  summary: >-
+    Both bulk payment pages now share one filter bar — search across payer name,
+    email, organization, and submitted details, plus payment method and status
+    filters. Each payer row on an event's dashboard also shows chips for attendees
+    who aren't registered or aren't paid in full.
+  pro_tips:
+    - "The search box finds payers even when they have no Portal account — it looks at everything they typed on the form and the submission's saved details, not just a linked person."
+    - "The red \"not registered\" and amber \"unpaid\" chips sit next to the payment status, so you can spot who still needs follow-up before the money is settled."

From fadc169d37cd9a592355db5d35949ab44ea17e8a Mon Sep 17 00:00:00 2001
From: Mae Beale <maebeale@gmail.com>
Date: Sun, 30 Aug 2026 20:13:58 -0400
Subject: [PATCH 4/4] Mark the bulk-payments filter Feature as admin_facing
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bulk-payment reconciliation is back-office work — not something a public
visitor or facilitator manages — so the entry belongs to super-admins.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 config/features.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/features.yml b/config/features.yml
index 36d4636aa7..b8c2d6f289 100644
--- a/config/features.yml
+++ b/config/features.yml
@@ -2840,7 +2840,7 @@
 
 - name: "Search and filter the bulk payments dashboards"
   area: payments
-  display_status: user_facing
+  display_status: admin_facing
   released_on: 2026-08-30
   pr_number: 2006
   summary: >-