From 1b27999f91d43cddc32052d11a880c19a4bd92a3 Mon Sep 17 00:00:00 2001
From: Justin Miller <16829344+jmilljr24@users.noreply.github.com>
Date: Mon, 27 Jul 2026 16:46:50 -0400
Subject: [PATCH 01/22] refactor bulk payments with submission controller and
 bulk payment controller

---
 .../bulk_payment_submissions_controller.rb    | 184 ++++++++
 .../events/bulk_payments_controller.rb        | 266 ++++++-----
 app/controllers/events_controller.rb          | 114 +----
 app/decorators/form_submission_decorator.rb   |  26 ++
 app/models/form_submission.rb                 |  20 +
 app/views/events/_bulk_payment_card.html.erb  | 191 ++++----
 app/views/events/_bulk_payment_form.html.erb  |   2 +-
 .../new.html.erb                              |   0
 .../show.html.erb                             |   0
 .../ticket.html.erb                           |   0
 .../allocate.turbo_stream.erb}                |   0
 .../create.turbo_stream.erb}                  |   2 +-
 .../index.html.erb}                           |   2 +-
 .../bulk_payments/link.turbo_stream.erb       |  10 +
 .../bulk_payments/unlink.turbo_stream.erb     |  10 +
 config/routes.rb                              |  14 +-
 ...000000_add_metadata_to_form_submissions.rb |   5 +
 db/schema.rb                                  |   3 +-
 spec/models/form_submission_spec.rb           |  77 ++++
 .../events/bulk_payment_submissions_spec.rb   | 351 ++++++++++++++
 spec/requests/events/bulk_payments_spec.rb    | 429 +++++++++---------
 spec/requests/events_spec.rb                  | 229 ----------
 22 files changed, 1138 insertions(+), 797 deletions(-)
 create mode 100644 app/controllers/events/bulk_payment_submissions_controller.rb
 rename app/views/events/{bulk_payments => bulk_payment_submissions}/new.html.erb (100%)
 rename app/views/events/{bulk_payments => bulk_payment_submissions}/show.html.erb (100%)
 rename app/views/events/{bulk_payments => bulk_payment_submissions}/ticket.html.erb (100%)
 rename app/views/events/{allocate_bulk_payment.turbo_stream.erb => bulk_payments/allocate.turbo_stream.erb} (100%)
 rename app/views/events/{create_bulk_payment.turbo_stream.erb => bulk_payments/create.turbo_stream.erb} (83%)
 rename app/views/events/{bulk_payments.html.erb => bulk_payments/index.html.erb} (96%)
 create mode 100644 app/views/events/bulk_payments/link.turbo_stream.erb
 create mode 100644 app/views/events/bulk_payments/unlink.turbo_stream.erb
 create mode 100644 db/migrate/20260727000000_add_metadata_to_form_submissions.rb
 create mode 100644 spec/requests/events/bulk_payment_submissions_spec.rb

diff --git a/app/controllers/events/bulk_payment_submissions_controller.rb b/app/controllers/events/bulk_payment_submissions_controller.rb
new file mode 100644
index 0000000000..a296917bc3
--- /dev/null
+++ b/app/controllers/events/bulk_payment_submissions_controller.rb
@@ -0,0 +1,184 @@
+module Events
+  class BulkPaymentSubmissionsController < ApplicationController
+    skip_before_action :authenticate_user!, only: [ :new, :create, :show, :ticket, :resend_confirmation ]
+    before_action :set_event, only: [ :new, :create, :show ]
+    before_action :set_form, only: [ :new, :create ]
+
+    rescue_from ActionController::InvalidAuthenticityToken do
+      flash[:alert] = "Your session has expired. Please try submitting the form again."
+      redirect_to new_event_bulk_payment_path(@event)
+    end
+
+    def new
+      authorize! :bulk_payment, to: :new?
+
+      @form_fields = visible_form_fields
+      @event = @event.decorate
+
+      @attendee_field = @form.form_fields.find_by(field_identifier: "bulk_payment_attendees")
+    end
+
+    def create
+      authorize! :bulk_payment, to: :create?
+
+      @form_params = params.dig(:bulk_payment, :form_fields)&.to_unsafe_h || {}
+
+      @field_errors = validate_required_fields
+      if @field_errors.any?
+        @form_fields = visible_form_fields
+        @event = @event.decorate
+        @attendee_field = @form.form_fields.find_by(field_identifier: "bulk_payment_attendees")
+        render :new, status: :unprocessable_content
+        return
+      end
+
+      result = EventRegistrationServices::BulkPayment.call(
+        event: @event,
+        form: @form,
+        form_params: @form_params,
+        person: current_user&.person
+      )
+
+      if result.success?
+        if @event.cost_cents.to_i > 0 && credit_card_payment?(@form_params)
+          checkout_session = create_stripe_checkout_session(result.form_submission)
+          redirect_to checkout_session.url, allow_other_host: true, status: :see_other
+        else
+          redirect_to bulk_payment_ticket_path(result.form_submission.slug),
+                      notice: "Your payment information has been submitted."
+        end
+      else
+        @form_fields = visible_form_fields
+        @event = @event.decorate
+        @attendee_field = @form.form_fields.find_by(field_identifier: "bulk_payment_attendees")
+        flash.now[:alert] = result.errors.join(", ")
+        render :new, status: :unprocessable_content
+      end
+    end
+
+    # View of the submitted bulk payment form, rendering the same partial either
+    # way. Mirrors PublicRegistrations#show: the payer reaches it publicly by slug
+    # (?reg=), while admins (e.g. from the dashboard, including legacy submissions
+    # with no slug) reach it by id (?submission_id=).
+    def show
+      if params[:reg].present?
+        authorize! :bulk_payment, to: :show?
+        # where.not(slug: nil) keeps a blank reg from matching a slugless record.
+        @submission = FormSubmission.bulk_payment.where.not(slug: nil)
+                                    .find_by!(slug: params[:reg], event_id: @event.id)
+      else
+        @submission = FormSubmission.bulk_payment.find_by!(id: params[:submission_id], event_id: @event.id)
+        authorize! @submission, to: :show?
+      end
+
+      @event = @event.decorate
+    end
+
+    # Public, slug-based ticket for the payer. Shows the event details, the
+    # registrants they paid for, and the submitted form — but none of the
+    # per-person admin actions found on the bulk payments dashboard.
+    def ticket
+      authorize! :bulk_payment, to: :ticket?
+
+      @submission = FormSubmission.bulk_payment.find_by!(slug: params[:slug])
+      @payment = @submission.payment
+      @event = @submission.event.decorate
+    end
+
+    # Re-sends the payer their bulk payment confirmation email (the one carrying
+    # the ticket link). Reachable by the payer from the ticket.
+    def resend_confirmation
+      authorize! :bulk_payment, to: :show?
+
+      @submission = FormSubmission.bulk_payment.find_by!(slug: params[:slug])
+      payer_email = @submission.person.preferred_email.presence ||
+                    @submission.answers_by_identifier["payer_email"]&.strip
+
+      if payer_email.present?
+        NotificationServices::CreateNotification.call(
+          noticeable: @submission,
+          kind: :bulk_payment_confirmation,
+          recipient_role: :person,
+          recipient_email: payer_email,
+          notification_type: 0
+        )
+        redirect_to bulk_payment_ticket_path(@submission.slug), notice: "Confirmation email sent."
+      else
+        redirect_to bulk_payment_ticket_path(@submission.slug),
+                    alert: "No email address on file to send the confirmation to."
+      end
+    end
+
+    private
+
+    def visible_form_fields
+      scope = @form.form_fields.reorder(position: :asc)
+
+      if current_user
+        logged_out_only_ids = scope.where(visibility: :logged_out_only).ids
+        scope = scope.where.not(id: logged_out_only_ids) if logged_out_only_ids.any?
+      end
+
+      scope
+    end
+
+    def set_event
+      @event = Event.find(params[:event_id])
+    end
+
+    def set_form
+      @form = @event.bulk_payment_form
+      unless @form
+        redirect_to event_path(@event), alert: "#{Form::BULK_PAYMENT_PUBLIC_NAME} form is not available for this event."
+      end
+    end
+
+    def validate_required_fields
+      # The nested attendees field is validated separately, so exclude it here.
+      fields = visible_form_fields.reject { |field| field.field_identifier == "bulk_payment_attendees" }
+      FormAnswerValidator.call(fields, @form_params)
+    end
+
+    def credit_card_payment?(form_params)
+      payment_method_field = @form.form_fields.find_by(field_identifier: "payment_method")
+      return false unless payment_method_field
+
+      form_params[payment_method_field.id.to_s]&.downcase == FormBuilderService::PAYMENT_METHOD_PAY_NOW.downcase
+    end
+
+    def create_stripe_checkout_session(submission)
+      person = submission.person
+      unit_amount = @event.cost_cents
+
+      attendees_field = @form.form_fields.find_by(field_identifier: "number_of_attendees")
+      qty = attendees_field ? @form_params[attendees_field.id.to_s].to_i : 1
+      qty = 1 if qty < 1
+
+      metadata = { form_submission_id: submission.id, event_id: @event.id }
+
+      attendees_field = @form.form_fields.find_by(field_identifier: "bulk_payment_attendees")
+      if attendees_field
+        attendees_json = @form_params[attendees_field.id.to_s]
+        metadata[:attendees] = attendees_json if attendees_json.present?
+      end
+
+      person.set_payment_processor :stripe
+
+      person.payment_processor.checkout(
+        mode: "payment",
+        metadata: metadata,
+        payment_intent_data: { metadata: metadata, description: "Training Fee: #{@event.title}" },
+        line_items: [ {
+          price_data: {
+            currency: "usd",
+            product_data: { name: "#{Form::BULK_PAYMENT_PUBLIC_NAME} (#{qty} attendees): #{@event.title}" },
+            unit_amount: unit_amount
+          },
+          quantity: qty
+        } ],
+        success_url: bulk_payment_ticket_url(submission.slug, checkout: "success"),
+        cancel_url: bulk_payment_ticket_url(submission.slug, checkout: "cancelled")
+      )
+    end
+  end
+end
diff --git a/app/controllers/events/bulk_payments_controller.rb b/app/controllers/events/bulk_payments_controller.rb
index 7222f2fa5b..c2bcb6ab1b 100644
--- a/app/controllers/events/bulk_payments_controller.rb
+++ b/app/controllers/events/bulk_payments_controller.rb
@@ -1,184 +1,174 @@
 module Events
   class BulkPaymentsController < ApplicationController
-    skip_before_action :authenticate_user!, only: [ :new, :create, :show, :ticket, :resend_confirmation ]
-    before_action :set_event, only: [ :new, :create, :show ]
-    before_action :set_form, only: [ :new, :create ]
+    before_action :set_event
 
-    rescue_from ActionController::InvalidAuthenticityToken do
-      flash[:alert] = "Your session has expired. Please try submitting the form again."
-      redirect_to new_event_bulk_payment_path(@event)
-    end
-
-    def new
-      authorize! :bulk_payment, to: :new?
+    def index
+      authorize! @event
 
-      @form_fields = visible_form_fields
       @event = @event.decorate
-
-      @attendee_field = @form.form_fields.find_by(field_identifier: "bulk_payment_attendees")
+      @event_registrations = @event.event_registrations.active.includes(:registrant)
+      @submissions = @event.form_submissions
+                           .where(role: "bulk_payment")
+                           .includes(:person, form_answers: :form_field, payment: :allocations)
+                           .order(created_at: :desc)
+      @allocated_by_registration = allocated_cents_by_registration(@event_registrations)
     end
 
     def create
-      authorize! :bulk_payment, to: :create?
+      authorize! @event
+      @event = @event.decorate
+      @event_registrations = @event.event_registrations.active.includes(:registrant)
+      @allocated_by_registration = allocated_cents_by_registration(@event_registrations)
 
-      @form_params = params.dig(:bulk_payment, :form_fields)&.to_unsafe_h || {}
+      submission = @event.form_submissions.find(params[:submission_id])
+      payment_type = params[:payment_type]
 
-      @field_errors = validate_required_fields
-      if @field_errors.any?
-        @form_fields = visible_form_fields
-        @event = @event.decorate
-        @attendee_field = @form.form_fields.find_by(field_identifier: "bulk_payment_attendees")
-        render :new, status: :unprocessable_content
+      unless %w[CashPayment CheckPayment].include?(payment_type)
+        flash.now[:alert] = "Invalid payment type"
+        respond_to do |format|
+          format.turbo_stream
+          format.html { redirect_to bulk_payments_event_path(@event), alert: "Invalid payment type" }
+        end
         return
       end
 
-      result = EventRegistrationServices::BulkPayment.call(
-        event: @event,
-        form: @form,
-        form_params: @form_params,
-        person: current_user&.person
+      payment = submission.build_payment(
+        amount_cents: (params[:amount_dollars].to_d * 100).to_i,
+        currency: params[:currency].presence || "usd",
+        type: payment_type,
+        check_number: params[:check_number].presence,
+        memo: params[:memo].presence
       )
+      payment.payer_sgid = params[:payer_sgid]
+      payment.additional_designation_sgid = params[:additional_designation_sgid]
 
-      if result.success?
-        if @event.cost_cents.to_i > 0 && credit_card_payment?(@form_params)
-          checkout_session = create_stripe_checkout_session(result.form_submission)
-          redirect_to checkout_session.url, allow_other_host: true, status: :see_other
-        else
-          redirect_to bulk_payment_ticket_path(result.form_submission.slug),
-                      notice: "Your payment information has been submitted."
-        end
+      if payment.save
+        @payment = payment
+        @submission = submission.decorate
+        flash.now[:notice] = "Payment recorded"
       else
-        @form_fields = visible_form_fields
-        @event = @event.decorate
-        @attendee_field = @form.form_fields.find_by(field_identifier: "bulk_payment_attendees")
-        flash.now[:alert] = result.errors.join(", ")
-        render :new, status: :unprocessable_content
+        flash.now[:alert] = payment.errors.full_messages.to_sentence
       end
-    end
 
-    # View of the submitted bulk payment form, rendering the same partial either
-    # way. Mirrors PublicRegistrations#show: the payer reaches it publicly by slug
-    # (?reg=), while admins (e.g. from the dashboard, including legacy submissions
-    # with no slug) reach it by id (?submission_id=).
-    def show
-      if params[:reg].present?
-        authorize! :bulk_payment, to: :show?
-        # where.not(slug: nil) keeps a blank reg from matching a slugless record.
-        @submission = FormSubmission.bulk_payment.where.not(slug: nil)
-                                    .find_by!(slug: params[:reg], event_id: @event.id)
-      else
-        @submission = FormSubmission.bulk_payment.find_by!(id: params[:submission_id], event_id: @event.id)
-        authorize! @submission, to: :show?
+      respond_to do |format|
+        format.turbo_stream
+        format.html { redirect_to bulk_payments_event_path(@event), notice: flash.now[:alert] || "Payment recorded" }
       end
+    end
 
+    def allocate
+      authorize! @event
       @event = @event.decorate
-    end
+      payment = Payment.find(params[:payment_id])
+      event_registration = EventRegistration.find_by(id: params[:event_registration_id])
+      unless event_registration
+        flash.now[:alert] = "Please select a registrant"
+        assign_allocation_card_data(payment)
+        respond_to do |format|
+          format.turbo_stream
+          format.html { redirect_to bulk_payments_event_path(@event), alert: "Please select a registrant" }
+        end
+        return
+      end
+      amount_cents = (params[:amount_dollars].to_d * 100).to_i
 
-    # Public, slug-based ticket for the payer. Shows the event details, the
-    # registrants they paid for, and the submitted form — but none of the
-    # per-person admin actions found on the bulk payments dashboard.
-    def ticket
-      authorize! :bulk_payment, to: :ticket?
+      if amount_cents <= 0
+        flash.now[:alert] = "Amount must be greater than $0.00"
+      elsif amount_cents > (payment.amount_cents_remaining || 0)
+        flash.now[:alert] = "Amount exceeds remaining balance"
+      else
+        allocation = Allocation.new(source: payment, allocatable: event_registration, amount: amount_cents)
+        if allocation.save
+          flash.now[:notice] = "Allocation successful"
+        else
+          flash.now[:alert] = allocation.errors.full_messages.to_sentence
+        end
+      end
 
-      @submission = FormSubmission.bulk_payment.find_by!(slug: params[:slug])
-      @payment = @submission.payment
-      @event = @submission.event.decorate
-    end
+      assign_allocation_card_data(payment)
 
-    # Re-sends the payer their bulk payment confirmation email (the one carrying
-    # the ticket link). Reachable by the payer from the ticket.
-    def resend_confirmation
-      authorize! :bulk_payment, to: :show?
-
-      @submission = FormSubmission.bulk_payment.find_by!(slug: params[:slug])
-      payer_email = @submission.person.preferred_email.presence ||
-                    @submission.answers_by_identifier["payer_email"]&.strip
-
-      if payer_email.present?
-        NotificationServices::CreateNotification.call(
-          noticeable: @submission,
-          kind: :bulk_payment_confirmation,
-          recipient_role: :person,
-          recipient_email: payer_email,
-          notification_type: 0
-        )
-        redirect_to bulk_payment_ticket_path(@submission.slug), notice: "Confirmation email sent."
-      else
-        redirect_to bulk_payment_ticket_path(@submission.slug),
-                    alert: "No email address on file to send the confirmation to."
+      respond_to do |format|
+        format.turbo_stream
+        format.html { redirect_to bulk_payments_event_path(@event), notice: flash.now[:alert] || "Allocation successful" }
       end
     end
 
-    private
+    def link
+      authorize! @event
+      @event = @event.decorate
 
-    def visible_form_fields
-      scope = @form.form_fields.reorder(position: :asc)
+      submission = @event.form_submissions.find(params[:submission_id])
+      event_registration = EventRegistration.find_by(id: params[:event_registration_id])
 
-      if current_user
-        logged_out_only_ids = scope.where(visibility: :logged_out_only).ids
-        scope = scope.where.not(id: logged_out_only_ids) if logged_out_only_ids.any?
+      if event_registration
+        submission.link_registration!(event_registration.id)
+        flash.now[:notice] = "Linked #{event_registration.registrant.name}."
+      else
+        flash.now[:alert] = "Registration not found."
       end
 
-      scope
-    end
-
-    def set_event
-      @event = Event.find(params[:event_id])
-    end
+      assign_bulk_payment_card_data(submission)
 
-    def set_form
-      @form = @event.bulk_payment_form
-      unless @form
-        redirect_to event_path(@event), alert: "#{Form::BULK_PAYMENT_PUBLIC_NAME} form is not available for this event."
+      respond_to do |format|
+        format.turbo_stream
+        format.html { redirect_to bulk_payments_event_path(@event), notice: flash.now[:notice] || flash.now[:alert] }
       end
     end
 
-    def validate_required_fields
-      # The nested attendees field is validated separately, so exclude it here.
-      fields = visible_form_fields.reject { |field| field.field_identifier == "bulk_payment_attendees" }
-      FormAnswerValidator.call(fields, @form_params)
-    end
+    def unlink
+      authorize! @event
+      @event = @event.decorate
+
+      submission = @event.form_submissions.find(params[:submission_id])
+      event_registration = EventRegistration.find_by(id: params[:event_registration_id])
+
+      if event_registration
+        submission.unlink_registration!(event_registration.id)
+        flash.now[:notice] = "Unlinked #{event_registration.registrant.name}."
+      else
+        flash.now[:alert] = "Registration not found."
+      end
 
-    def credit_card_payment?(form_params)
-      payment_method_field = @form.form_fields.find_by(field_identifier: "payment_method")
-      return false unless payment_method_field
+      assign_bulk_payment_card_data(submission)
 
-      form_params[payment_method_field.id.to_s]&.downcase == FormBuilderService::PAYMENT_METHOD_PAY_NOW.downcase
+      respond_to do |format|
+        format.turbo_stream
+        format.html { redirect_to bulk_payments_event_path(@event), notice: flash.now[:notice] || flash.now[:alert] }
+      end
     end
 
-    def create_stripe_checkout_session(submission)
-      person = submission.person
-      unit_amount = @event.cost_cents
+    private
 
-      attendees_field = @form.form_fields.find_by(field_identifier: "number_of_attendees")
-      qty = attendees_field ? @form_params[attendees_field.id.to_s].to_i : 1
-      qty = 1 if qty < 1
+    def set_event
+      @event = Event.find(params[:id])
+    end
 
-      metadata = { form_submission_id: submission.id, event_id: @event.id }
+    # Reloads the payment and the data its bulk payment card needs, so the
+    # allocate turbo stream can re-render the whole card with fresh due/allocated
+    # totals and re-evaluate whether each registration is now paid in full.
+    def assign_allocation_card_data(payment)
+      @payment = payment.reload
+      @submission = @payment.form_submission
+      @event_registrations = @event.event_registrations.active.includes(:registrant)
+      @allocated_by_registration = allocated_cents_by_registration(@event_registrations)
+    end
 
-      attendees_field = @form.form_fields.find_by(field_identifier: "bulk_payment_attendees")
-      if attendees_field
-        attendees_json = @form_params[attendees_field.id.to_s]
-        metadata[:attendees] = attendees_json if attendees_json.present?
-      end
+    # Reloads the submission and the data its bulk payment card needs, so the
+    # link/unlink turbo stream can re-render the whole card with fresh linked
+    # registration data.
+    def assign_bulk_payment_card_data(submission)
+      @submission = submission.reload.decorate
+      @event_registrations = @event.event_registrations.active.includes(:registrant)
+      @allocated_by_registration = allocated_cents_by_registration(@event_registrations)
+    end
 
-      person.set_payment_processor :stripe
-
-      person.payment_processor.checkout(
-        mode: "payment",
-        metadata: metadata,
-        payment_intent_data: { metadata: metadata, description: "Training Fee: #{@event.title}" },
-        line_items: [ {
-          price_data: {
-            currency: "usd",
-            product_data: { name: "#{Form::BULK_PAYMENT_PUBLIC_NAME} (#{qty} attendees): #{@event.title}" },
-            unit_amount: unit_amount
-          },
-          quantity: qty
-        } ],
-        success_url: bulk_payment_ticket_url(submission.slug, checkout: "success"),
-        cancel_url: bulk_payment_ticket_url(submission.slug, checkout: "cancelled")
-      )
+    # Allocated cents per registration id, fetched in one grouped query so the
+    # bulk payment cards read totals from a hash instead of querying per row.
+    def allocated_cents_by_registration(registrations)
+      Allocation
+        .where(allocatable_type: "EventRegistration", allocatable_id: registrations.ids)
+        .group(:allocatable_id)
+        .sum(:amount)
     end
   end
 end
diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb
index c6db2a6fff..daa1c6052b 100644
--- a/app/controllers/events_controller.rb
+++ b/app/controllers/events_controller.rb
@@ -2,7 +2,7 @@ class EventsController < ApplicationController
   include AhoyTracking, TagAssignable
   skip_before_action :authenticate_user!, only: [ :index, :show, :staff ]
   skip_before_action :verify_authenticity_token, only: [ :preview ]
-  before_action :set_event, only: %i[ show edit update destroy preview dashboard sample_ticket background registrants onboarding staff edit_staff update_staff recipients bulk_payments preview_reminder confirm_reminder send_reminder copy_registration_form allocate_bulk_payment create_bulk_payment ]
+  before_action :set_event, only: %i[ show edit update destroy preview dashboard sample_ticket background registrants onboarding staff edit_staff update_staff recipients preview_reminder confirm_reminder send_reminder copy_registration_form ]
 
   def index
     authorize!
@@ -213,99 +213,6 @@ def recipients
     @dashboard = EventDashboard.new(@event)
   end
 
-  def bulk_payments
-    authorize! @event
-
-    @event = @event.decorate
-    # Shared across every card so attendee matching and allocated totals don't
-    # re-query per registration per card.
-    @event_registrations = @event.event_registrations.active.includes(:registrant)
-    @submissions = @event.form_submissions
-                         .where(role: "bulk_payment")
-                         .includes(:person, form_answers: :form_field, payment: :allocations)
-                         .order(created_at: :desc)
-    @allocated_by_registration = allocated_cents_by_registration(@event_registrations)
-  end
-
-  def allocate_bulk_payment
-    authorize! @event
-    @event = @event.decorate
-    payment = Payment.find(params[:payment_id])
-    event_registration = EventRegistration.find_by(id: params[:event_registration_id])
-    unless event_registration
-      flash.now[:alert] = "Please select a registrant"
-      assign_allocation_card_data(payment)
-      respond_to do |format|
-        format.turbo_stream
-        format.html { redirect_to bulk_payments_event_path(@event), alert: "Please select a registrant" }
-      end
-      return
-    end
-    amount_cents = (params[:amount_dollars].to_d * 100).to_i
-
-    if amount_cents <= 0
-      flash.now[:alert] = "Amount must be greater than $0.00"
-    elsif amount_cents > (payment.amount_cents_remaining || 0)
-      flash.now[:alert] = "Amount exceeds remaining balance"
-    else
-      allocation = Allocation.new(source: payment, allocatable: event_registration, amount: amount_cents)
-      if allocation.save
-        flash.now[:notice] = "Allocation successful"
-      else
-        flash.now[:alert] = allocation.errors.full_messages.to_sentence
-      end
-    end
-
-    assign_allocation_card_data(payment)
-
-    respond_to do |format|
-      format.turbo_stream
-      format.html { redirect_to bulk_payments_event_path(@event), notice: flash.now[:alert] || "Allocation successful" }
-    end
-  end
-
-  def create_bulk_payment
-    authorize! @event
-    @event = @event.decorate
-    @event_registrations = @event.event_registrations.active.includes(:registrant)
-    @allocated_by_registration = allocated_cents_by_registration(@event_registrations)
-
-    submission = @event.form_submissions.find(params[:submission_id])
-    payment_type = params[:payment_type]
-
-    unless %w[CashPayment CheckPayment].include?(payment_type)
-      flash.now[:alert] = "Invalid payment type"
-      respond_to do |format|
-        format.turbo_stream
-        format.html { redirect_to bulk_payments_event_path(@event), alert: "Invalid payment type" }
-      end
-      return
-    end
-
-    payment = submission.build_payment(
-      amount_cents: (params[:amount_dollars].to_d * 100).to_i,
-      currency: params[:currency].presence || "usd",
-      type: payment_type,
-      check_number: params[:check_number].presence,
-      memo: params[:memo].presence
-    )
-    payment.payer_sgid = params[:payer_sgid]
-    payment.additional_designation_sgid = params[:additional_designation_sgid]
-
-    if payment.save
-      @payment = payment
-      @submission = submission.decorate
-      flash.now[:notice] = "Payment recorded"
-    else
-      flash.now[:alert] = payment.errors.full_messages.to_sentence
-    end
-
-    respond_to do |format|
-      format.turbo_stream
-      format.html { redirect_to bulk_payments_event_path(@event), notice: flash.now[:alert] || "Payment recorded" }
-    end
-  end
-
   def preview_reminder
     authorize! @event
     @event = @event.decorate
@@ -516,25 +423,6 @@ def selected_reminder_registrations
       .select { |r| r.registrant.preferred_email.present? }
   end
 
-  # Reloads the payment and the data its bulk payment card needs, so the
-  # allocate turbo stream can re-render the whole card with fresh due/allocated
-  # totals and re-evaluate whether each registration is now paid in full.
-  def assign_allocation_card_data(payment)
-    @payment = payment.reload
-    @submission = @payment.form_submission
-    @event_registrations = @event.event_registrations.active.includes(:registrant)
-    @allocated_by_registration = allocated_cents_by_registration(@event_registrations)
-  end
-
-  # Allocated cents per registration id, fetched in one grouped query so the
-  # bulk payment cards read totals from a hash instead of querying per row.
-  def allocated_cents_by_registration(registrations)
-    Allocation
-      .where(allocatable_type: "EventRegistration", allocatable_id: registrations.ids)
-      .group(:allocatable_id)
-      .sum(:amount)
-  end
-
   # Maps registrant person_id => the organization name they typed on the
   # registration form (the `agency_name` answer), in one batch query. Drives both
   # the roster's Pending/None org chip and the readiness "Organization not linked"
diff --git a/app/decorators/form_submission_decorator.rb b/app/decorators/form_submission_decorator.rb
index 487ca067fb..01e50f40aa 100644
--- a/app/decorators/form_submission_decorator.rb
+++ b/app/decorators/form_submission_decorator.rb
@@ -28,4 +28,30 @@ def matched_attendees(event_registrations)
       { first_name: first, last_name: last, email: email, matches: matches }
     end
   end
+
+  # Single best match for one attendee. Prefers first+last name match,
+  # falls back to email match. Returns nil when no match is found.
+  def best_match_for(attendee, event_registrations)
+    first = attendee["first_name"]&.strip
+    last = attendee["last_name"]&.strip
+    email = attendee["email"]&.strip
+
+    first_variants = first.present? ? NicknameMap.variants_for(first).to_set : Set.new
+    normalized_last = last.present? ? NicknameMap.normalize(last) : nil
+
+    event_registrations.find do |reg|
+      person = reg.registrant
+      next false unless person
+
+      first_matches = first_variants.include?(NicknameMap.normalize(person.first_name))
+      last_matches = normalized_last.present? &&
+                     NicknameMap.normalize(person.last_name) == normalized_last
+      email_matches = email.present? && (
+        person.email&.downcase == email.downcase ||
+        person.email_2&.downcase == email.downcase
+      )
+
+      (first_matches && last_matches) || email_matches
+    end
+  end
 end
diff --git a/app/models/form_submission.rb b/app/models/form_submission.rb
index 6714a1d2bf..b174a7731a 100644
--- a/app/models/form_submission.rb
+++ b/app/models/form_submission.rb
@@ -67,6 +67,26 @@ def bulk_payment_amount_cents(event)
     event.cost_cents.to_i * bulk_payment_attendee_count
   end
 
+  # --- Linked registrations (bulk payment designations) ---
+
+  def linked_registration_ids
+    (metadata || {}).fetch("linked_registration_ids", [])
+  end
+
+  def link_registration!(event_registration_id)
+    ids = linked_registration_ids | [ event_registration_id.to_i ]
+    update!(metadata: (metadata || {}).merge("linked_registration_ids" => ids))
+  end
+
+  def unlink_registration!(event_registration_id)
+    ids = linked_registration_ids - [ event_registration_id.to_i ]
+    update!(metadata: (metadata || {}).merge("linked_registration_ids" => ids))
+  end
+
+  def linked_registrations
+    EventRegistration.where(id: linked_registration_ids)
+  end
+
   private
 
   def generate_slug
diff --git a/app/views/events/_bulk_payment_card.html.erb b/app/views/events/_bulk_payment_card.html.erb
index d5c026266f..b8f0b1f95c 100644
--- a/app/views/events/_bulk_payment_card.html.erb
+++ b/app/views/events/_bulk_payment_card.html.erb
@@ -16,6 +16,8 @@
   allocated_by_registration ||= {}
   event_cost_cents = @event.cost_cents.to_i
   attendee_matches = submission.matched_attendees(event_registrations)
+  linked_ids = submission.linked_registration_ids.to_set
+  linked_regs = event_registrations.select { |r| linked_ids.include?(r.id) }
 %>
 <div id="payment-card-<%= submission.id %>"
      data-controller="dropdown"
@@ -31,7 +33,7 @@
       <%= dollars_from_cents(amount_cents) %>
     </span>
     <span id="<%= dom_id(payment, :remaining) if payment %>" class="min-w-0">
-      <%= render "payment_badge", payment: payment %>
+      <%= render "events/payment_badge", payment: payment %>
     </span>
     <span class="text-sm text-gray-500 whitespace-nowrap"><%= submission.created_at.strftime("%b %-d, %Y") %></span>
     <div class="flex items-center gap-2">
@@ -62,111 +64,130 @@
   <div id="<%= content_id %>"
        class="hidden mt-3 pt-3 border-t border-gray-100 space-y-3"
        data-dropdown-target="content">
+
     <% if attendee_matches.present? %>
+      <div class="border-t border-gray-100 pt-2 space-y-1.5">
+        <h4 class="text-xs font-medium text-gray-400 uppercase tracking-wide">Submitted names</h4>
+        <div class="divide-y divide-gray-100">
+          <% attendee_matches.each do |am| %>
+            <div class="text-sm py-2 flex flex-wrap items-center gap-x-4 gap-y-1">
+              <span class="text-gray-900 font-medium"><%= am[:first_name] %></span>
+              <span class="text-gray-900"><%= am[:last_name] %></span>
+              <span class="text-gray-500 break-all"><%= am[:email] %></span>
+              <span class="text-gray-400">→</span>
+              <% best = am[:matches].first %>
+              <% if best %>
+                <span class="text-gray-600">
+                  <%= best.registrant.name %>
+                  <% remaining = [event_cost_cents - allocated_by_registration.fetch(best.id, 0), 0].max %>
+                  <span class="text-xs text-gray-400">(<%= remaining.zero? ? "Paid" : "#{dollars_from_cents(remaining)} remaining" %>)</span>
+                </span>
+                <% if linked_ids.include?(best.id) %>
+                  <%= form_tag unlink_bulk_payment_event_path(@event), method: :delete, class: "inline" do %>
+                    <%= hidden_field_tag :submission_id, submission.id %>
+                    <%= hidden_field_tag :event_registration_id, best.id %>
+                    <%= button_tag "Unlink", class: "text-xs text-red-600 hover:text-red-800 font-medium" %>
+                  <% end %>
+                <% else %>
+                  <%= form_tag link_bulk_payment_event_path(@event), class: "inline" do %>
+                    <%= hidden_field_tag :submission_id, submission.id %>
+                    <%= hidden_field_tag :event_registration_id, best.id %>
+                    <%= button_tag "Link", class: "text-xs text-blue-600 hover:text-blue-800 font-medium" %>
+                  <% end %>
+                <% end %>
+              <% else %>
+                <span class="text-gray-400 text-xs">No match</span>
+              <% end %>
+            </div>
+          <% end %>
+        </div>
+      </div>
+    <% end %>
+
+    <% if linked_regs.any? %>
       <div class="@container border-t border-gray-100 pt-2 space-y-1.5">
-        <h4 class="text-xs font-medium text-gray-400 uppercase tracking-wide">Submitted info</h4>
-        <%# Names/email stay fluid (fr) and shrink with the container; the
-            profile/amount/action columns get fixed widths so they align across
-            every row and the header (each row is its own grid, so shared fixed
-            tracks are what keeps the columns from going jagged).
-            Breakpoint is a CONTAINER query (@4xl), not a viewport one, so the
-            grid only turns on when this card is actually wide enough to hold
-            the fixed columns — otherwise (e.g. sidebar open) rows fall back to
-            the stacked/wrapping layout below instead of being crushed. %>
-        <% submitted_cols = "@4xl:grid-cols-[minmax(0,1fr)_minmax(0,1fr)_minmax(0,2fr)_3.5rem_8rem_8rem_13rem]" %>
-        <%# Header row — only shown once the grid is active. When narrower, each
-            attendee stacks into an identity row (name + email) and an actions
-            row below it, so the header columns would be meaningless. %>
-        <div class="hidden @4xl:grid <%= submitted_cols %> @4xl:gap-4 text-xs font-medium text-gray-500 uppercase tracking-wide border-b border-gray-200 pb-1">
-          <div>First name</div>
-          <div>Last name</div>
-          <div>Email</div>
+        <h4 class="text-xs font-medium text-gray-400 uppercase tracking-wide">Linked registrations</h4>
+        <% linked_cols = "@4xl:grid-cols-[minmax(0,1fr)_minmax(0,2fr)_3.5rem_8rem_8rem_13rem]" %>
+        <div class="hidden @4xl:grid <%= linked_cols %> @4xl:gap-4 text-xs font-medium text-gray-500 uppercase tracking-wide border-b border-gray-200 pb-1">
+          <div>Name</div>
           <div>Profile</div>
           <div>Registration</div>
           <div>Allocations</div>
           <div>Action</div>
         </div>
         <div class="divide-y divide-gray-100">
-          <% attendee_matches.each do |am| %>
-            <%# @4xl:contents flattens the identity/actions groups into the parent
-                grid so columns align across rows; when narrower they stack as
-                two wrapping rows (identity, then actions). %>
-            <div class="text-sm flex flex-col gap-3 py-3 @4xl:grid <%= submitted_cols %> @4xl:gap-4 @4xl:items-start @4xl:py-2 rounded-lg hover:bg-gray-50 transition-colors">
-              <div class="flex flex-wrap items-baseline gap-x-4 gap-y-1 @4xl:contents">
-                <div class="text-gray-900 font-medium"><%= am[:first_name] %></div>
-                <div class="text-gray-900"><%= am[:last_name] %></div>
-                <div class="text-gray-500 break-all"><%= am[:email] %></div>
-              </div>
+          <% linked_regs.each do |reg| %>
+            <% allocated_cents = allocated_by_registration.fetch(reg.id, 0) %>
+            <% remaining_cents = [event_cost_cents - allocated_cents, 0].max %>
+            <% reg_paid_in_full = allocated_cents >= event_cost_cents %>
+            <div class="text-sm flex flex-col gap-3 py-3 @4xl:grid <%= linked_cols %> @4xl:gap-4 @4xl:items-start @4xl:py-2 rounded-lg hover:bg-gray-50 transition-colors">
+              <div class="text-gray-900 font-medium"><%= reg.registrant.name %></div>
               <div class="flex flex-wrap items-start gap-3 @4xl:contents">
-                <% if am[:matches].any? %>
-                  <div class="flex flex-col gap-1.5">
-                    <% am[:matches].each do |reg| %>
-                      <div class="flex flex-col gap-1 items-start">
-                        <%= render "person_profile_button", person: reg.registrant, return_to: "bulk_payments", event: @event, expand: submission.id %>
-                      </div>
-                    <% end %>
-                  </div>
-                  <div class="flex flex-col gap-1.5">
-                    <% am[:matches].each do |reg| %>
-                      <% remaining_cents = [ event_cost_cents - allocated_by_registration.fetch(reg.id, 0), 0 ].max %>
-                      <div class="flex flex-col gap-1 items-start">
-                        <%= link_to edit_event_registration_path(reg, return_to: "bulk_payments", expand: submission.id),
-                                    title: "View #{reg.registrant.name}'s registration for #{@event.title}",
-                                    class: "inline-flex items-center gap-2 rounded-lg border border-gray-300 bg-white px-3 py-2 text-sm font-medium text-gray-600 shadow-sm hover:bg-gray-50 hover:text-gray-800 transition-colors" do %>
-                          <i class="fa-solid fa-clipboard-list text-gray-400"></i>
-                          <% if remaining_cents.zero? %>
-                            <span class="font-semibold text-gray-500 whitespace-nowrap">Paid</span>
-                          <% else %>
-                            <span class="font-semibold text-orange-600 tabular-nums whitespace-nowrap"><%= dollars_from_cents(remaining_cents) %></span>
-                          <% end %>
-                        <% end %>
-                      </div>
+                <%= render "events/person_profile_button", person: reg.registrant, return_to: "bulk_payments", event: @event, expand: submission.id %>
+                <div class="flex flex-col gap-1.5">
+                  <%= link_to edit_event_registration_path(reg, return_to: "bulk_payments", expand: submission.id),
+                              title: "View #{reg.registrant.name}'s registration for #{@event.title}",
+                              class: "inline-flex items-center gap-2 rounded-lg border border-gray-300 bg-white px-3 py-2 text-sm font-medium text-gray-600 shadow-sm hover:bg-gray-50 hover:text-gray-800 transition-colors" do %>
+                    <i class="fa-solid fa-clipboard-list text-gray-400"></i>
+                    <% if remaining_cents.zero? %>
+                      <span class="font-semibold text-gray-500 whitespace-nowrap">Paid</span>
+                    <% else %>
+                      <span class="font-semibold text-orange-600 tabular-nums whitespace-nowrap"><%= dollars_from_cents(remaining_cents) %></span>
                     <% end %>
-                  </div>
-                  <div class="flex flex-col gap-1.5">
-                    <% am[:matches].each do |reg| %>
-                      <% allocated_cents = allocated_by_registration.fetch(reg.id, 0) %>
-                      <div class="flex flex-col gap-1 items-start">
-                        <%= link_to allocations_path(allocatable_sgid: reg.to_sgid.to_s, return_to: "bulk_payments", expand: submission.id),
-                                    title: "View registration allocations",
-                                    class: "inline-flex items-center gap-2 rounded-lg border border-gray-300 bg-white px-3 py-2 text-sm font-medium text-gray-600 shadow-sm hover:bg-gray-50 hover:text-gray-800 transition-colors" do %>
-                          <i class="fa-solid fa-list-check text-gray-400"></i>
-                          <span class="font-semibold text-green-600 tabular-nums"><%= dollars_from_cents(allocated_cents) %></span>
-                        <% end %>
-                      </div>
+                  <% end %>
+                </div>
+                <div class="flex flex-col gap-1.5">
+                  <%= link_to allocations_path(allocatable_sgid: reg.to_sgid.to_s, return_to: "bulk_payments", expand: submission.id),
+                              title: "View registration allocations",
+                              class: "inline-flex items-center gap-2 rounded-lg border border-gray-300 bg-white px-3 py-2 text-sm font-medium text-gray-600 shadow-sm hover:bg-gray-50 hover:text-gray-800 transition-colors" do %>
+                    <i class="fa-solid fa-list-check text-gray-400"></i>
+                    <span class="font-semibold text-green-600 tabular-nums"><%= dollars_from_cents(allocated_cents) %></span>
+                  <% end %>
+                </div>
+                <div class="flex flex-col gap-1.5">
+                  <% if payment && payment.amount_cents_remaining > 0 && !reg_paid_in_full %>
+                    <%= form_tag allocate_bulk_payment_event_path(@event), class: "flex items-center gap-1.5" do %>
+                      <%= hidden_field_tag :payment_id, payment.id %>
+                      <%= hidden_field_tag :event_registration_id, reg.id %>
+                      <span class="text-sm text-gray-500">$</span>
+                      <%= number_field_tag :amount_dollars, nil, step: "0.01", min: "0.01", class: "w-20 rounded-lg border border-gray-300 px-2 py-1 text-sm shadow-sm focus:border-blue-500 focus:ring focus:ring-blue-200 focus:outline-none", placeholder: "0.00" %>
+                      <%= button_tag "Allocate", class: "btn btn-primary" %>
                     <% end %>
-                  </div>
-                  <div class="flex flex-col gap-1.5">
-                    <% am[:matches].each do |reg| %>
-                      <% allocated_cents = allocated_by_registration.fetch(reg.id, 0) %>
-                      <% reg_paid_in_full = allocated_cents >= event_cost_cents %>
-                      <div class="flex flex-col gap-1 items-start">
-                        <% if payment && payment.amount_cents_remaining > 0 && !reg_paid_in_full %>
-                          <%= form_tag allocate_bulk_payment_event_path(@event), class: "flex items-center gap-1.5" do %>
-                            <%= hidden_field_tag :payment_id, payment.id %>
-                            <%= hidden_field_tag :event_registration_id, reg.id %>
-                            <span class="text-sm text-gray-500">$</span>
-                            <%= number_field_tag :amount_dollars, nil, step: "0.01", min: "0.01", class: "w-20 rounded-lg border border-gray-300 px-2 py-1 text-sm shadow-sm focus:border-blue-500 focus:ring focus:ring-blue-200 focus:outline-none", placeholder: "0.00" %>
-                            <%= button_tag "Allocate", class: "btn btn-primary" %>
-                          <% end %>
-                        <% end %>
-                      </div>
-                    <% end %>
-                  </div>
-                <% else %>
-                  <div class="text-gray-400 @4xl:col-span-4">No match</div>
+                  <% end %>
+                </div>
+              </div>
+              <div class="flex items-start @4xl:justify-end">
+                <%= form_tag unlink_bulk_payment_event_path(@event), method: :delete, class: "inline" do %>
+                  <%= hidden_field_tag :submission_id, submission.id %>
+                  <%= hidden_field_tag :event_registration_id, reg.id %>
+                  <%= button_tag "Unlink", class: "text-xs text-red-600 hover:text-red-800 font-medium" %>
                 <% end %>
               </div>
             </div>
           <% end %>
         </div>
+        <div class="pt-2 border-t border-gray-100">
+          <h5 class="text-xs font-medium text-gray-400 uppercase tracking-wide mb-2">Link a registration</h5>
+          <%= form_tag link_bulk_payment_event_path(@event), class: "flex items-center gap-2" do %>
+            <%= hidden_field_tag :submission_id, submission.id %>
+            <% unlinked_regs = event_registrations.reject { |r| linked_ids.include?(r.id) } %>
+            <div class="w-64 shrink-0">
+              <%= select_tag :event_registration_id,
+                   options_from_collection_for_select(unlinked_regs, :id, ->(r) { "#{r.registrant.name} — #{r.registrant.email}" }),
+                   prompt: "Select registrant...",
+                   class: "w-full rounded-lg border border-gray-300 px-3 py-2 shadow-sm focus:outline-none focus:ring focus:ring-blue-200 focus:border-blue-500" %>
+            </div>
+            <%= button_tag "Link", class: "btn btn-primary" %>
+          <% end %>
+        </div>
       </div>
     <% end %>
+
     <% if payment %>
       <div class="border-t border-gray-100 pt-2 space-y-2">
         <h4 class="text-xs font-medium text-gray-400 uppercase tracking-wide">Payment allocations</h4>
         <div id="<%= dom_id(payment, :allocations) %>">
-          <%= render "payment_allocations", payment: payment, return_params: { return_to: "bulk_payments", expand: submission.id } %>
+          <%= render "events/payment_allocations", payment: payment, return_params: { return_to: "bulk_payments", expand: submission.id } %>
         </div>
         <% if payment.amount_cents_remaining > 0 %>
           <div class="pt-2 border-t border-gray-100">
@@ -192,7 +213,7 @@
         <% end %>
       </div>
     <% else %>
-      <%= render "bulk_payment_form", submission: submission %>
+      <%= render "events/bulk_payment_form", submission: submission %>
     <% end %>
   </div>
 </div>
diff --git a/app/views/events/_bulk_payment_form.html.erb b/app/views/events/_bulk_payment_form.html.erb
index 3435a065a2..5906283bb8 100644
--- a/app/views/events/_bulk_payment_form.html.erb
+++ b/app/views/events/_bulk_payment_form.html.erb
@@ -1,6 +1,6 @@
 <div class="bg-green-200 border-2 border-green-400 rounded-lg p-4" data-controller="conditional-fields">
   <h3 class="text-lg font-medium mb-4">Record Payment</h3>
-  <%= form_tag create_bulk_payment_event_path(@event) do %>
+  <%= form_tag bulk_payments_event_path(@event) do %>
     <%= hidden_field_tag :submission_id, submission.id %>
     <%= hidden_field_tag :currency, "usd" %>
 
diff --git a/app/views/events/bulk_payments/new.html.erb b/app/views/events/bulk_payment_submissions/new.html.erb
similarity index 100%
rename from app/views/events/bulk_payments/new.html.erb
rename to app/views/events/bulk_payment_submissions/new.html.erb
diff --git a/app/views/events/bulk_payments/show.html.erb b/app/views/events/bulk_payment_submissions/show.html.erb
similarity index 100%
rename from app/views/events/bulk_payments/show.html.erb
rename to app/views/events/bulk_payment_submissions/show.html.erb
diff --git a/app/views/events/bulk_payments/ticket.html.erb b/app/views/events/bulk_payment_submissions/ticket.html.erb
similarity index 100%
rename from app/views/events/bulk_payments/ticket.html.erb
rename to app/views/events/bulk_payment_submissions/ticket.html.erb
diff --git a/app/views/events/allocate_bulk_payment.turbo_stream.erb b/app/views/events/bulk_payments/allocate.turbo_stream.erb
similarity index 100%
rename from app/views/events/allocate_bulk_payment.turbo_stream.erb
rename to app/views/events/bulk_payments/allocate.turbo_stream.erb
diff --git a/app/views/events/create_bulk_payment.turbo_stream.erb b/app/views/events/bulk_payments/create.turbo_stream.erb
similarity index 83%
rename from app/views/events/create_bulk_payment.turbo_stream.erb
rename to app/views/events/bulk_payments/create.turbo_stream.erb
index bcc1602720..17873fadaf 100644
--- a/app/views/events/create_bulk_payment.turbo_stream.erb
+++ b/app/views/events/bulk_payments/create.turbo_stream.erb
@@ -2,7 +2,7 @@
 
 <% unless flash[:alert] %>
   <%= turbo_stream.replace "payment-card-#{@submission.id}" do %>
-    <%= render "bulk_payment_card", submission: @submission,
+    <%= render "events/bulk_payment_card", submission: @submission,
           event_registrations: @event_registrations,
           allocated_by_registration: @allocated_by_registration,
           expanded: true %>
diff --git a/app/views/events/bulk_payments.html.erb b/app/views/events/bulk_payments/index.html.erb
similarity index 96%
rename from app/views/events/bulk_payments.html.erb
rename to app/views/events/bulk_payments/index.html.erb
index c7d1ec4e47..9bff016b9b 100644
--- a/app/views/events/bulk_payments.html.erb
+++ b/app/views/events/bulk_payments/index.html.erb
@@ -21,7 +21,7 @@
   <% if @submissions.any? %>
     <div class="grid grid-cols-1 gap-3">
       <% @submissions.each do |submission| %>
-        <%= render "bulk_payment_card", submission: submission,
+        <%= render "events/bulk_payment_card", submission: submission,
               event_registrations: @event_registrations,
               allocated_by_registration: @allocated_by_registration %>
       <% end %>
diff --git a/app/views/events/bulk_payments/link.turbo_stream.erb b/app/views/events/bulk_payments/link.turbo_stream.erb
new file mode 100644
index 0000000000..7a9e1856de
--- /dev/null
+++ b/app/views/events/bulk_payments/link.turbo_stream.erb
@@ -0,0 +1,10 @@
+<%= turbo_stream.replace "flash_now", partial: "shared/flash_messages" %>
+
+<% if @submission %>
+  <%= turbo_stream.replace "payment-card-#{@submission.id}" do %>
+    <%= render "events/bulk_payment_card", submission: @submission,
+          event_registrations: @event_registrations,
+          allocated_by_registration: @allocated_by_registration,
+          expanded: true %>
+  <% end %>
+<% end %>
diff --git a/app/views/events/bulk_payments/unlink.turbo_stream.erb b/app/views/events/bulk_payments/unlink.turbo_stream.erb
new file mode 100644
index 0000000000..7a9e1856de
--- /dev/null
+++ b/app/views/events/bulk_payments/unlink.turbo_stream.erb
@@ -0,0 +1,10 @@
+<%= turbo_stream.replace "flash_now", partial: "shared/flash_messages" %>
+
+<% if @submission %>
+  <%= turbo_stream.replace "payment-card-#{@submission.id}" do %>
+    <%= render "events/bulk_payment_card", submission: @submission,
+          event_registrations: @event_registrations,
+          allocated_by_registration: @allocated_by_registration,
+          expanded: true %>
+  <% end %>
+<% end %>
diff --git a/config/routes.rb b/config/routes.rb
index f1641c215a..41429a4521 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -74,8 +74,8 @@
     end
   end
   resources :community_news
-  get "bulk_payment/:slug", to: "events/bulk_payments#ticket", as: :bulk_payment_ticket
-  post "bulk_payment/:slug/resend_confirmation", to: "events/bulk_payments#resend_confirmation", as: :bulk_payment_resend_confirmation
+  get "bulk_payment/:slug", to: "events/bulk_payment_submissions#ticket", as: :bulk_payment_ticket
+  post "bulk_payment/:slug/resend_confirmation", to: "events/bulk_payment_submissions#resend_confirmation", as: :bulk_payment_resend_confirmation
   get "registration/:slug", to: "events/registrations#show", as: :registration_ticket
   get "registration/:slug/invoice", to: "events/registrations#invoice", as: :registration_invoice
   get "registration/:slug/receipt", to: "events/registrations#receipt", as: :registration_receipt
@@ -150,19 +150,21 @@
       get "staff/edit", action: :edit_staff, as: :edit_staff
       patch "staff", action: :update_staff
       get :recipients
-      get :bulk_payments
+      get :bulk_payments, to: "events/bulk_payments#index"
       get :preview_reminder
       patch :preview
       post :copy_registration_form
       post :confirm_reminder
       post :send_reminder
-      post :allocate_bulk_payment
-      post :create_bulk_payment
+      post :allocate_bulk_payment, to: "events/bulk_payments#allocate"
+      post :bulk_payments, to: "events/bulk_payments#create"
+      post :link_bulk_payment, to: "events/bulk_payments#link"
+      delete :unlink_bulk_payment, to: "events/bulk_payments#unlink"
     end
     resources :registration_ticket_callouts, only: [ :show, :update ]
     resource :registrations, only: %i[ create ], module: :events, as: :registrant_registration
     resource :public_registration, only: [ :new, :create, :show ], module: :events
-    resource :bulk_payment, only: [ :new, :create, :show ], module: :events
+    resource :bulk_payment, only: [ :new, :create, :show ], controller: "events/bulk_payment_submissions"
     resource :invoice, only: [ :show ], module: :events
     get "form_submissions/:person_id", to: "events/form_submissions#show", as: :registrant_submissions
   end
diff --git a/db/migrate/20260727000000_add_metadata_to_form_submissions.rb b/db/migrate/20260727000000_add_metadata_to_form_submissions.rb
new file mode 100644
index 0000000000..985eec1cc3
--- /dev/null
+++ b/db/migrate/20260727000000_add_metadata_to_form_submissions.rb
@@ -0,0 +1,5 @@
+class AddMetadataToFormSubmissions < ActiveRecord::Migration[8.1]
+  def change
+    add_column :form_submissions, :metadata, :json
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 6831b4cc8e..d9654507cf 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[8.1].define(version: 2026_07_15_053137) do
+ActiveRecord::Schema[8.1].define(version: 2026_07_27_000000) do
   create_table "action_text_mentions", charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
     t.bigint "action_text_rich_text_id", null: false
     t.datetime "created_at", null: false
@@ -654,6 +654,7 @@
     t.datetime "created_at", null: false
     t.bigint "event_id"
     t.integer "form_id", null: false
+    t.json "metadata"
     t.bigint "person_id", null: false
     t.string "role"
     t.string "slug"
diff --git a/spec/models/form_submission_spec.rb b/spec/models/form_submission_spec.rb
index 6d416be252..998cd6698c 100644
--- a/spec/models/form_submission_spec.rb
+++ b/spec/models/form_submission_spec.rb
@@ -80,4 +80,81 @@
       expect(submission.bulk_payment_amount_cents(free_event)).to eq(0)
     end
   end
+
+  describe "linked registrations" do
+    let(:event) { create(:event) }
+    let(:form) { create(:form) }
+    let(:submission) { create(:form_submission, form: form, event: event) }
+    let!(:reg1) { create(:event_registration, event: event) }
+    let!(:reg2) { create(:event_registration, event: event) }
+
+    describe "#linked_registration_ids" do
+      it "returns an empty array when metadata is nil" do
+        expect(submission.linked_registration_ids).to eq([])
+      end
+
+      it "returns an empty array when metadata has no linked_registration_ids" do
+        submission.update!(metadata: { "other_key" => "value" })
+        expect(submission.linked_registration_ids).to eq([])
+      end
+
+      it "returns the stored ids" do
+        submission.update!(metadata: { "linked_registration_ids" => [reg1.id, reg2.id] })
+        expect(submission.linked_registration_ids).to contain_exactly(reg1.id, reg2.id)
+      end
+    end
+
+    describe "#link_registration!" do
+      it "adds a registration id to metadata" do
+        submission.link_registration!(reg1.id)
+
+        expect(submission.reload.linked_registration_ids).to eq([reg1.id])
+      end
+
+      it "does not duplicate an existing id" do
+        submission.link_registration!(reg1.id)
+        submission.link_registration!(reg1.id)
+
+        expect(submission.reload.linked_registration_ids).to eq([reg1.id])
+      end
+
+      it "preserves other metadata" do
+        submission.update!(metadata: { "other_key" => "value" })
+        submission.link_registration!(reg1.id)
+
+        expect(submission.reload.metadata["other_key"]).to eq("value")
+        expect(submission.linked_registration_ids).to eq([reg1.id])
+      end
+    end
+
+    describe "#unlink_registration!" do
+      it "removes a registration id from metadata" do
+        submission.link_registration!(reg1.id)
+        submission.link_registration!(reg2.id)
+        submission.unlink_registration!(reg1.id)
+
+        expect(submission.reload.linked_registration_ids).to eq([reg2.id])
+      end
+
+      it "is a no-op when the id is not linked" do
+        submission.link_registration!(reg1.id)
+        submission.unlink_registration!(reg2.id)
+
+        expect(submission.reload.linked_registration_ids).to eq([reg1.id])
+      end
+    end
+
+    describe "#linked_registrations" do
+      it "returns event registrations matching linked ids" do
+        submission.link_registration!(reg1.id)
+        submission.link_registration!(reg2.id)
+
+        expect(submission.linked_registrations).to contain_exactly(reg1, reg2)
+      end
+
+      it "returns empty relation when nothing is linked" do
+        expect(submission.linked_registrations).to be_empty
+      end
+    end
+  end
 end
diff --git a/spec/requests/events/bulk_payment_submissions_spec.rb b/spec/requests/events/bulk_payment_submissions_spec.rb
new file mode 100644
index 0000000000..1b3a645604
--- /dev/null
+++ b/spec/requests/events/bulk_payment_submissions_spec.rb
@@ -0,0 +1,351 @@
+require "rails_helper"
+
+RSpec.describe "Events::BulkPaymentSubmissions", type: :request do
+  let(:admin) { create(:user, :admin) }
+  let(:event) { create(:event, cost_cents: 0) }
+  let(:form) { create(:form) }
+  # The bulk payment view only renders a known set of "payer" fields, so the
+  # min-word rule is exercised through payer_organization (a free-form text field).
+  let!(:org_field) do
+    create(:form_field, form: form, answer_type: :free_form_input_one_line,
+           field_identifier: "payer_organization", name: "Organization",
+           required: true, min_words: 5)
+  end
+  let!(:payment_method_field) do
+    field = create(:form_field, form: form, answer_type: :single_select_radio,
+                   field_identifier: "payment_method", name: "Payment method",
+                   required: false)
+    FormBuilderService::PAYMENT_METHOD_OPTIONS.each do |option_name|
+      field.form_field_answer_options.create!(answer_option: AnswerOption.find_or_create_by!(name: option_name))
+    end
+    field
+  end
+  let!(:payer_first_name_field) do
+    create(:form_field, form: form, answer_type: :free_form_input_one_line,
+           field_identifier: "payer_first_name", name: "Payer first name",
+           required: false)
+  end
+  let!(:payer_last_name_field) do
+    create(:form_field, form: form, answer_type: :free_form_input_one_line,
+           field_identifier: "payer_last_name", name: "Payer last name",
+           required: false)
+  end
+  let!(:payer_email_field) do
+    create(:form_field, form: form, answer_type: :free_form_input_one_line,
+           field_identifier: "payer_email", name: "Payer email",
+           required: false)
+  end
+
+  before do
+    EventForm.create!(event: event, form: form, role: "bulk_payment")
+    sign_in admin
+  end
+
+  def post_bulk_payment(answer)
+    post event_bulk_payment_path(event),
+         params: { bulk_payment: { form_fields: { org_field.id.to_s => answer } } }
+  end
+
+  describe "POST create with a minimum word count" do
+    it "rejects an answer with too few words" do
+      post_bulk_payment("not quite enough")
+
+      expect(response).to have_http_status(:unprocessable_content)
+      expect(response.body).to include("must be at least 5 words")
+    end
+
+    it "does not flag an answer that meets the minimum" do
+      post_bulk_payment("this answer easily has plenty of words")
+
+      expect(response.body).not_to include("must be at least 5 words")
+    end
+  end
+
+  describe "GET new" do
+    it "shows the minimum word hint below the field" do
+      get new_event_bulk_payment_path(event)
+
+      expect(response.body).to include("Minimum of 5 words.")
+    end
+
+    it "renders the field at its configured width" do
+      org_field.update!(width: :half)
+
+      get new_event_bulk_payment_path(event)
+
+      expect(response.body).to include("md:col-span-6")
+    end
+  end
+
+  describe "POST create with credit card payment" do
+    let(:admin) { create(:user, :admin, :with_person) }
+    let(:event) { create(:event, cost_cents: 15_00) }
+    let(:fake_session) { double(url: "https://checkout.stripe.com/test") }
+
+    before do
+      fake_processor = double(checkout: fake_session)
+      allow_any_instance_of(Person).to receive(:set_payment_processor)
+      allow_any_instance_of(Person).to receive(:payment_processor).and_return(fake_processor)
+    end
+
+    def payer_params
+      {
+        payer_first_name_field.id.to_s => "Jane",
+        payer_last_name_field.id.to_s => "Doe",
+        payer_email_field.id.to_s => "jane@example.com"
+      }
+    end
+
+    it "redirects to Stripe Checkout when paying by credit card" do
+      post event_bulk_payment_path(event),
+           params: { bulk_payment: { form_fields: payer_params.merge(
+             org_field.id.to_s => "this answer has enough words for validation",
+             payment_method_field.id.to_s => "Credit card (now)"
+           ) } }
+
+      expect(response).to redirect_to("https://checkout.stripe.com/test")
+      expect(response.status).to eq(303)
+    end
+
+    it "does not redirect when payment method is not credit card" do
+      post event_bulk_payment_path(event),
+           params: { bulk_payment: { form_fields: payer_params.merge(
+             org_field.id.to_s => "this answer has enough words for validation",
+             payment_method_field.id.to_s => "Check"
+           ) } }
+
+      expect(response).to have_http_status(:redirect)
+      expect(response.location).to match(%r{/bulk_payment/})
+      expect(flash[:notice]).to eq("Your payment information has been submitted.")
+    end
+
+    it "does not redirect to Stripe when event is free" do
+      event.update!(cost_cents: 0)
+
+      post event_bulk_payment_path(event),
+           params: { bulk_payment: { form_fields: payer_params.merge(
+             org_field.id.to_s => "this answer has enough words for validation"
+           ) } }
+
+      expect(response).to have_http_status(:redirect)
+      expect(response.location).to match(%r{/bulk_payment/})
+    end
+  end
+
+  describe "GET new with the seeded bulk payment form" do
+    let(:seeded_form) do
+      FormBuilderService.new(name: "Bulk Payment", sections: %i[bulk_payment], role: "bulk_payment").call
+    end
+
+    before do
+      # Payer fields are logged_out_only, so test the public (signed-out) view.
+      sign_out admin
+      EventForm.where(event: event).destroy_all
+      EventForm.create!(event: event, form: seeded_form, role: "bulk_payment")
+    end
+
+    it "renders the optional payer phone field" do
+      get new_event_bulk_payment_path(event)
+
+      expect(response.body).to include("Phone")
+    end
+
+    it "labels the attendee fields with the 'Attendee' prefix" do
+      get new_event_bulk_payment_path(event)
+
+      expect(response.body).to include("Attendee first name", "Attendee last name", "Attendee email")
+    end
+  end
+
+  describe "GET show" do
+    # Public submitted-form view, reached by slug via ?reg= (mirrors public
+    # registration). Backs to the ticket by default.
+    let(:event) { create(:event, :publicly_visible, cost_cents: 1000) }
+    let(:payer) { create(:person) }
+    let!(:submission) { create(:form_submission, person: payer, form: form, event: event, role: "bulk_payment") }
+    let!(:org_answer) do
+      submission.form_answers.create!(form_field: org_field, submitted_answer: "Northside Shelter",
+                                      question_name_when_answered: org_field.name)
+    end
+
+    def get_show
+      get event_bulk_payment_path(event, reg: submission.slug)
+    end
+
+    context "as a signed-out viewer" do
+      before { sign_out admin }
+
+      it "renders the submitted form publicly via the slug" do
+        get_show
+
+        expect(response).to have_http_status(:ok)
+        expect(response.body).to include("Payment submission")
+        expect(response.body).to include("Northside Shelter")
+      end
+
+      it "backs to the ticket by default" do
+        get_show
+
+        expect(response.body).to include(bulk_payment_ticket_path(submission.slug))
+        expect(response.body).to include("Back to ticket")
+      end
+
+      it "404s for an unknown slug" do
+        get event_bulk_payment_path(event, reg: "nope")
+
+        expect(response).to have_http_status(:not_found)
+      end
+
+      it "404s for a blank reg, even when a slugless bulk payment exists" do
+        submission.update_columns(slug: nil)
+
+        get event_bulk_payment_path(event)
+
+        expect(response).to have_http_status(:not_found)
+      end
+
+      it "does not let a signed-out viewer reach a submission by id" do
+        get event_bulk_payment_path(event, submission_id: submission.id)
+
+        expect(response).to redirect_to(root_path)
+      end
+    end
+
+    context "as an admin viewing a slugless submission by id" do
+      before { submission.update_columns(slug: nil) }
+
+      it "renders the same submission partial without a ticket back link" do
+        get event_bulk_payment_path(event, submission_id: submission.id, return_to: "bulk_payments")
+
+        expect(response).to have_http_status(:ok)
+        expect(response.body).to include("Payment submission")
+        expect(response.body).to include("Northside Shelter")
+        expect(response.body).not_to include("Back to ticket")
+        expect(response.body).to include("Back to bulk payments")
+      end
+    end
+
+    context "as an admin arriving from the dashboard" do
+      it "shows a Back to ticket link plus a second Back to bulk payments link" do
+        get event_bulk_payment_path(event, reg: submission.slug, return_to: "bulk_payments")
+
+        expect(response.body).to include("Back to ticket")
+        expect(response.body).to include("Back to bulk payments")
+      end
+    end
+  end
+
+  describe "GET ticket" do
+    let(:event) { create(:event, :publicly_visible, cost_cents: 1000, title: "Spring Workshop") }
+    let(:payer) { create(:person) }
+    let(:attendees_json) do
+      [ { "first_name" => "Jordan", "last_name" => "Rivers", "email" => "jordan@example.com" } ].to_json
+    end
+    let!(:submission) { create(:form_submission, person: payer, form: form, event: event, role: "bulk_payment") }
+    let!(:attendees_field) do
+      create(:form_field, form: form, answer_type: :free_form_input_one_line,
+             field_identifier: "bulk_payment_attendees", name: "Attendees", required: false)
+    end
+
+    before do
+      submission.form_answers.create!(form_field: attendees_field, submitted_answer: attendees_json,
+                                      question_name_when_answered: "Attendees")
+      sign_out admin
+    end
+
+    def get_ticket
+      get bulk_payment_ticket_path(submission.slug)
+    end
+
+    it "renders the ticket for the public payer using the slug" do
+      get_ticket
+
+      expect(response).to have_http_status(:ok)
+      expect(response.body).to include("Payment ticket")
+      expect(response.body).to include("Spring Workshop")
+    end
+
+    it "lists the registrants" do
+      get_ticket
+
+      expect(response.body).to include("Jordan Rivers")
+      expect(response.body).to include("jordan@example.com")
+    end
+
+    it "shows the payer's name, organization, and registrants-covered count" do
+      submission.form_answers.create!(form_field: payer_first_name_field, submitted_answer: "Alex",
+                                      question_name_when_answered: "Payer first name")
+      submission.form_answers.create!(form_field: payer_last_name_field, submitted_answer: "Chen",
+                                      question_name_when_answered: "Payer last name")
+      submission.form_answers.create!(form_field: org_field, submitted_answer: "Bright Futures Academy",
+                                      question_name_when_answered: "Organization")
+
+      get_ticket
+
+      expect(response.body).to include("Payer")
+      expect(response.body).to include("Alex Chen")
+      expect(response.body).to include("Bright Futures Academy")
+      # One attendee is listed and no explicit count is set, so the covered count is 1.
+      expect(response.body).to include("Covering 1 registrant")
+    end
+
+    it "does not show per-person actions like cancelling a registration" do
+      get_ticket
+
+      expect(response.body).not_to include("Cancel registration")
+    end
+
+    it "links the invoice back to the ticket" do
+      get_ticket
+
+      expect(response.body).to include("return_to=bulk_payment_ticket")
+    end
+
+    it "links 'View your form responses' to the public submission page" do
+      get_ticket
+
+      expect(response.body).to include("View your form responses")
+      expect(response.body).to include(event_bulk_payment_path(event, reg: submission.slug))
+    end
+
+    it "returns 404 for an unknown slug" do
+      get bulk_payment_ticket_path("nope")
+
+      expect(response).to have_http_status(:not_found)
+    end
+
+    it "adds a Back to bulk payments eyebrow when arriving from the dashboard" do
+      get bulk_payment_ticket_path(submission.slug, return_to: "bulk_payments", expand: submission.id)
+
+      expect(response.body).to include("Back to event")
+      expect(response.body).to include("Back to bulk payments")
+    end
+
+    context "as an admin" do
+      before { sign_in admin }
+
+      it "shows the admin allocations section" do
+        get_ticket
+
+        expect(response.body).to include("Payment allocations")
+      end
+    end
+  end
+
+  describe "POST resend_confirmation" do
+    let(:event) { create(:event, :publicly_visible, cost_cents: 1000) }
+    let(:payer) { create(:person, email: "payer@example.com") }
+    let!(:submission) { create(:form_submission, person: payer, form: form, event: event, role: "bulk_payment") }
+
+    before { sign_out admin }
+
+    it "re-sends the payer confirmation and returns to the ticket" do
+      expect {
+        post bulk_payment_resend_confirmation_path(submission.slug)
+      }.to change(Notification, :count).by(1)
+
+      expect(response).to redirect_to(bulk_payment_ticket_path(submission.slug))
+      expect(flash[:notice]).to eq("Confirmation email sent.")
+    end
+  end
+end
diff --git a/spec/requests/events/bulk_payments_spec.rb b/spec/requests/events/bulk_payments_spec.rb
index 711a6c32a2..3872493863 100644
--- a/spec/requests/events/bulk_payments_spec.rb
+++ b/spec/requests/events/bulk_payments_spec.rb
@@ -4,8 +4,6 @@
   let(:admin) { create(:user, :admin) }
   let(:event) { create(:event, cost_cents: 0) }
   let(:form) { create(:form) }
-  # The bulk payment view only renders a known set of "payer" fields, so the
-  # min-word rule is exercised through payer_organization (a free-form text field).
   let!(:org_field) do
     create(:form_field, form: form, answer_type: :free_form_input_one_line,
            field_identifier: "payer_organization", name: "Organization",
@@ -41,311 +39,298 @@
     sign_in admin
   end
 
-  def post_bulk_payment(answer)
-    post event_bulk_payment_path(event),
-         params: { bulk_payment: { form_fields: { org_field.id.to_s => answer } } }
-  end
-
-  describe "POST create with a minimum word count" do
-    it "rejects an answer with too few words" do
-      post_bulk_payment("not quite enough")
-
-      expect(response).to have_http_status(:unprocessable_content)
-      expect(response.body).to include("must be at least 5 words")
-    end
-
-    it "does not flag an answer that meets the minimum" do
-      post_bulk_payment("this answer easily has plenty of words")
-
-      expect(response.body).not_to include("must be at least 5 words")
-    end
-  end
-
-  describe "GET new" do
-    it "shows the minimum word hint below the field" do
-      get new_event_bulk_payment_path(event)
-
-      expect(response.body).to include("Minimum of 5 words.")
+  describe "GET /events/:id/bulk_payments (admin dashboard)" do
+    let(:event) { create(:event, cost_cents: 2500) }
+    let(:payer) { create(:person) }
+    let!(:submission) { create(:form_submission, person: payer, form: form, event: event, role: "bulk_payment") }
+    let!(:attendees_field) do
+      create(:form_field, form: form, field_identifier: "number_of_attendees", name: "Attendees")
     end
 
-    it "renders the field at its configured width" do
-      org_field.update!(width: :half)
+    it "shows the submitted amount even when no payment has landed" do
+      submission.form_answers.create!(form_field: attendees_field, submitted_answer: "3")
 
-      get new_event_bulk_payment_path(event)
+      get bulk_payments_event_path(event)
 
-      expect(response.body).to include("md:col-span-6")
+      expect(response).to have_http_status(:ok)
+      expect(response.body).to include("$75")
     end
-  end
 
-  describe "POST create with credit card payment" do
-    let(:admin) { create(:user, :admin, :with_person) }
-    let(:event) { create(:event, cost_cents: 15_00) }
-    let(:fake_session) { double(url: "https://checkout.stripe.com/test") }
+    it "shows the recorded payment amount when a payment exists" do
+      submission.form_answers.create!(form_field: attendees_field, submitted_answer: "3")
+      create(:payment, person: payer, form_submission: submission,
+             amount_cents: 5000, amount_cents_remaining: 5000)
 
-    before do
-      fake_processor = double(checkout: fake_session)
-      allow_any_instance_of(Person).to receive(:set_payment_processor)
-      allow_any_instance_of(Person).to receive(:payment_processor).and_return(fake_processor)
-    end
+      get bulk_payments_event_path(event)
 
-    def payer_params
-      {
-        payer_first_name_field.id.to_s => "Jane",
-        payer_last_name_field.id.to_s => "Doe",
-        payer_email_field.id.to_s => "jane@example.com"
-      }
+      expect(response.body).to include("$50")
     end
 
-    it "redirects to Stripe Checkout when paying by credit card" do
-      post event_bulk_payment_path(event),
-           params: { bulk_payment: { form_fields: payer_params.merge(
-             org_field.id.to_s => "this answer has enough words for validation",
-             payment_method_field.id.to_s => "Credit card (now)"
-           ) } }
+    it "renders the targeted submission's row expanded when given an expand param" do
+      get bulk_payments_event_path(event, expand: submission.id)
 
-      expect(response).to redirect_to("https://checkout.stripe.com/test")
-      expect(response.status).to eq(303)
+      expect(response.body).to include("id=\"payment-card-#{submission.id}\"")
+      expect(response.body).to include("data-dropdown-target=\"expand\"")
     end
 
-    it "does not redirect when payment method is not credit card" do
-      post event_bulk_payment_path(event),
-           params: { bulk_payment: { form_fields: payer_params.merge(
-             org_field.id.to_s => "this answer has enough words for validation",
-             payment_method_field.id.to_s => "Check"
-           ) } }
+    it "renders rows collapsed without an expand param" do
+      get bulk_payments_event_path(event)
 
-      expect(response).to have_http_status(:redirect)
-      expect(response.location).to match(%r{/bulk_payment/})
-      expect(flash[:notice]).to eq("Your payment information has been submitted.")
+      expect(response.body).to match(/id="payment-details-#{submission.id}"\s+class="hidden/)
+      expect(response.body).not_to match(/id="payment-arrow-#{submission.id}"[^>]*rotate-180/)
     end
 
-    it "does not redirect to Stripe when event is free" do
-      event.update!(cost_cents: 0)
+    it "renders a Profile column with a circle-only profile button for matched attendees" do
+      attendee = create(:person, first_name: "Match", last_name: "Attendee", email: "match.attendee@example.com")
+      reg = create(:event_registration, event: event, registrant: attendee, status: "registered")
+      create(:form_field, form: form, field_identifier: "bulk_payment_attendees", name: "Attendees list")
+      submission.form_answers.create!(
+        form_field: form.form_fields.find_by(field_identifier: "bulk_payment_attendees"),
+        submitted_answer: [ { first_name: "Match", last_name: "Attendee", email: "match.attendee@example.com" } ].to_json
+      )
+      submission.link_registration!(reg.id)
 
-      post event_bulk_payment_path(event),
-           params: { bulk_payment: { form_fields: payer_params.merge(
-             org_field.id.to_s => "this answer has enough words for validation"
-           ) } }
+      get bulk_payments_event_path(event)
 
-      expect(response).to have_http_status(:redirect)
-      expect(response.location).to match(%r{/bulk_payment/})
-    end
-  end
-
-  describe "GET new with the seeded bulk payment form" do
-    let(:seeded_form) do
-      FormBuilderService.new(name: "Bulk Payment", sections: %i[bulk_payment], role: "bulk_payment").call
+      expect(response).to have_http_status(:ok)
+      expect(response.body).to include(person_path(attendee))
+      expect(response.body).to include("bg-sky-100")
+      expect(response.body).to include("h-5 w-5")
     end
 
-    before do
-      # Payer fields are logged_out_only, so test the public (signed-out) view.
-      sign_out admin
-      EventForm.where(event: event).destroy_all
-      EventForm.create!(event: event, form: seeded_form, role: "bulk_payment")
-    end
+    it "shows a grey \"Paid\" instead of an orange balance when the registration is fully covered" do
+      attendee = create(:person, first_name: "Paid", last_name: "Infull", email: "paid.infull@example.com")
+      registration = create(:event_registration, event: event, registrant: attendee, status: "registered")
+      create(:form_field, form: form, field_identifier: "bulk_payment_attendees", name: "Attendees list")
+      submission.form_answers.create!(
+        form_field: form.form_fields.find_by(field_identifier: "bulk_payment_attendees"),
+        submitted_answer: [ { first_name: "Paid", last_name: "Infull", email: "paid.infull@example.com" } ].to_json
+      )
+      create(:allocation, source: create(:payment, amount_cents: 2500, amount_cents_remaining: 2500),
+             allocatable: registration, amount: 2500)
+      submission.link_registration!(registration.id)
 
-    it "renders the optional payer phone field" do
-      get new_event_bulk_payment_path(event)
+      get bulk_payments_event_path(event)
 
-      expect(response.body).to include("Phone")
+      expect(response).to have_http_status(:ok)
+      expect(response.body).to include("text-gray-500 whitespace-nowrap\">Paid<")
+      expect(response.body).not_to include("$0.00")
     end
 
-    it "labels the attendee fields with the 'Attendee' prefix" do
-      get new_event_bulk_payment_path(event)
+    it "lists only registrants who are not yet fully paid in the new-allocation dropdown" do
+      create(:payment, person: payer, form_submission: submission,
+             amount_cents: 5000, amount_cents_remaining: 5000)
+      unpaid = create(:person, first_name: "Owes", last_name: "Money", email: "owes.money@example.com")
+      create(:event_registration, event: event, registrant: unpaid, status: "registered")
+      paid = create(:person, first_name: "All", last_name: "Square", email: "all.square@example.com")
+      paid_registration = create(:event_registration, event: event, registrant: paid, status: "registered")
+      create(:allocation, source: create(:payment, amount_cents: 2500, amount_cents_remaining: 2500),
+             allocatable: paid_registration, amount: 2500)
+
+      get bulk_payments_event_path(event)
 
-      expect(response.body).to include("Attendee first name", "Attendee last name", "Attendee email")
+      expect(response).to have_http_status(:ok)
+      expect(response.body).to include("Owes Money — owes.money@example.com")
+      expect(response.body).not_to include("All Square — all.square@example.com")
     end
   end
 
-  describe "GET show" do
-    # Public submitted-form view, reached by slug via ?reg= (mirrors public
-    # registration). Backs to the ticket by default.
-    let(:event) { create(:event, :publicly_visible, cost_cents: 1000) }
+  describe "POST /events/:id/allocate_bulk_payment" do
+    let(:event) { create(:event) }
     let(:payer) { create(:person) }
     let!(:submission) { create(:form_submission, person: payer, form: form, event: event, role: "bulk_payment") }
-    let!(:org_answer) do
-      submission.form_answers.create!(form_field: org_field, submitted_answer: "Northside Shelter",
-                                      question_name_when_answered: org_field.name)
-    end
+    let!(:payment) { create(:payment, person: payer, form_submission: submission,
+                            amount_cents: 1000, amount_cents_remaining: 1000) }
+    let(:registrant) { create(:person) }
+    let!(:event_registration) { create(:event_registration, event: event, registrant: registrant) }
 
-    def get_show
-      get event_bulk_payment_path(event, reg: submission.slug)
+    let(:valid_params) do
+      { payment_id: payment.id, event_registration_id: event_registration.id, amount_dollars: "5.00" }
     end
 
-    context "as a signed-out viewer" do
-      before { sign_out admin }
+    it "rejects unauthenticated request" do
+      sign_out admin
+      post allocate_bulk_payment_event_path(event), params: valid_params
+      expect(response).to redirect_to(new_user_session_path)
+    end
 
-      it "renders the submitted form publicly via the slug" do
-        get_show
+    it "rejects non-admin request" do
+      sign_out admin
+      sign_in create(:user)
+      post allocate_bulk_payment_event_path(event), params: valid_params
+      expect(response).to redirect_to(root_path)
+    end
 
-        expect(response).to have_http_status(:ok)
-        expect(response.body).to include("Payment submission")
-        expect(response.body).to include("Northside Shelter")
-      end
+    it "creates an allocation and returns turbo_stream" do
+      expect {
+        post allocate_bulk_payment_event_path(event), params: valid_params, as: :turbo_stream
+      }.to change(Allocation, :count).by(1)
 
-      it "backs to the ticket by default" do
-        get_show
+      expect(payment.reload.amount_cents_remaining).to eq(500)
+      expect(response.media_type).to eq(Mime[:turbo_stream])
+      expect(response.body).to include("Allocation successful")
+    end
 
-        expect(response.body).to include(bulk_payment_ticket_path(submission.slug))
-        expect(response.body).to include("Back to ticket")
+    context "when the allocation pays a matched registration in full" do
+      let(:event) { create(:event, cost_cents: 500) }
+      let(:registrant) { create(:person, email: "match@example.com") }
+      let!(:attendees_field) do
+        create(:form_field, form: form, field_identifier: "bulk_payment_attendees", name: "Attendees")
       end
 
-      it "404s for an unknown slug" do
-        get event_bulk_payment_path(event, reg: "nope")
-
-        expect(response).to have_http_status(:not_found)
+      before do
+        submission.form_answers.create!(
+          form_field: attendees_field,
+          submitted_answer: [ { first_name: registrant.first_name, last_name: registrant.last_name, email: "match@example.com" } ].to_json
+        )
+        submission.link_registration!(event_registration.id)
       end
 
-      it "404s for a blank reg, even when a slugless bulk payment exists" do
-        submission.update_columns(slug: nil)
-
-        get event_bulk_payment_path(event)
+      it "re-renders the card with refreshed totals and hides the inline allocate box for that registration" do
+        post allocate_bulk_payment_event_path(event),
+             params: { payment_id: payment.id, event_registration_id: event_registration.id, amount_dollars: "5.00" },
+             as: :turbo_stream
 
-        expect(response).to have_http_status(:not_found)
+        expect(response.body).to include("payment-card-#{submission.id}")
+        expect(response.body).to include("rotate-180")
+        expect(response.body).to include(">Paid</span>")
+        expect(response.body.scan(">Allocate</button>").size).to eq(1)
       end
+    end
 
-      it "does not let a signed-out viewer reach a submission by id" do
-        get event_bulk_payment_path(event, submission_id: submission.id)
+    it "shows alert when event_registration_id is blank" do
+      params = valid_params.merge(event_registration_id: "")
+      expect {
+        post allocate_bulk_payment_event_path(event), params: params, as: :turbo_stream
+      }.not_to change(Allocation, :count)
 
-        expect(response).to redirect_to(root_path)
-      end
+      expect(response.body).to include("Please select a registrant")
     end
 
-    context "as an admin viewing a slugless submission by id" do
-      before { submission.update_columns(slug: nil) }
-
-      it "renders the same submission partial without a ticket back link" do
-        get event_bulk_payment_path(event, submission_id: submission.id, return_to: "bulk_payments")
+    it "shows alert when event_registration_id is invalid" do
+      params = valid_params.merge(event_registration_id: 999999)
+      expect {
+        post allocate_bulk_payment_event_path(event), params: params, as: :turbo_stream
+      }.not_to change(Allocation, :count)
 
-        expect(response).to have_http_status(:ok)
-        expect(response.body).to include("Payment submission")
-        expect(response.body).to include("Northside Shelter")
-        expect(response.body).not_to include("Back to ticket")
-        expect(response.body).to include("Back to bulk payments")
-      end
+      expect(response.body).to include("Please select a registrant")
     end
 
-    context "as an admin arriving from the dashboard" do
-      it "shows a Back to ticket link plus a second Back to bulk payments link" do
-        get event_bulk_payment_path(event, reg: submission.slug, return_to: "bulk_payments")
+    it "shows alert when amount is zero" do
+      params = valid_params.merge(amount_dollars: "0.00")
+      expect {
+        post allocate_bulk_payment_event_path(event), params: params, as: :turbo_stream
+      }.not_to change(Allocation, :count)
 
-        expect(response.body).to include("Back to ticket")
-        expect(response.body).to include("Back to bulk payments")
-      end
+      expect(response.body).to include("Amount must be greater than $0.00")
     end
-  end
 
-  describe "GET ticket" do
-    let(:event) { create(:event, :publicly_visible, cost_cents: 1000, title: "Spring Workshop") }
-    let(:payer) { create(:person) }
-    let(:attendees_json) do
-      [ { "first_name" => "Jordan", "last_name" => "Rivers", "email" => "jordan@example.com" } ].to_json
-    end
-    let!(:submission) { create(:form_submission, person: payer, form: form, event: event, role: "bulk_payment") }
-    let!(:attendees_field) do
-      create(:form_field, form: form, answer_type: :free_form_input_one_line,
-             field_identifier: "bulk_payment_attendees", name: "Attendees", required: false)
-    end
+    it "shows alert when amount exceeds remaining balance" do
+      params = valid_params.merge(amount_dollars: "20.00")
+      expect {
+        post allocate_bulk_payment_event_path(event), params: params, as: :turbo_stream
+      }.not_to change(Allocation, :count)
 
-    before do
-      submission.form_answers.create!(form_field: attendees_field, submitted_answer: attendees_json,
-                                      question_name_when_answered: "Attendees")
-      sign_out admin
+      expect(response.body).to include("Amount exceeds remaining balance")
     end
 
-    def get_ticket
-      get bulk_payment_ticket_path(submission.slug)
-    end
+    it "shows alert when event registration is already fully paid" do
+      large_payment = create(:payment, person: payer, form_submission: submission,
+                             amount_cents: 2000, amount_cents_remaining: 2000)
+      create(:allocation, source: large_payment, allocatable: event_registration, amount: 1099)
 
-    it "renders the ticket for the public payer using the slug" do
-      get_ticket
+      params = { payment_id: large_payment.id, event_registration_id: event_registration.id, amount_dollars: "5.00" }
+      expect {
+        post allocate_bulk_payment_event_path(event), params: params, as: :turbo_stream
+      }.not_to change(Allocation, :count)
 
-      expect(response).to have_http_status(:ok)
-      expect(response.body).to include("Payment ticket")
-      expect(response.body).to include("Spring Workshop")
+      expect(response.body).to include("already fully paid")
     end
+  end
 
-    it "lists the registrants" do
-      get_ticket
+  describe "POST /events/:id/link_bulk_payment" do
+    let(:event) { create(:event) }
+    let(:payer) { create(:person) }
+    let!(:submission) { create(:form_submission, person: payer, form: form, event: event, role: "bulk_payment") }
+    let(:registrant) { create(:person) }
+    let!(:event_registration) { create(:event_registration, event: event, registrant: registrant) }
 
-      expect(response.body).to include("Jordan Rivers")
-      expect(response.body).to include("jordan@example.com")
-    end
+    it "adds the registration id to the submission metadata" do
+      post link_bulk_payment_event_path(event),
+           params: { submission_id: submission.id, event_registration_id: event_registration.id },
+           as: :turbo_stream
 
-    it "shows the payer's name, organization, and registrants-covered count" do
-      submission.form_answers.create!(form_field: payer_first_name_field, submitted_answer: "Alex",
-                                      question_name_when_answered: "Payer first name")
-      submission.form_answers.create!(form_field: payer_last_name_field, submitted_answer: "Chen",
-                                      question_name_when_answered: "Payer last name")
-      submission.form_answers.create!(form_field: org_field, submitted_answer: "Bright Futures Academy",
-                                      question_name_when_answered: "Organization")
-
-      get_ticket
-
-      expect(response.body).to include("Payer")
-      expect(response.body).to include("Alex Chen")
-      expect(response.body).to include("Bright Futures Academy")
-      # One attendee is listed and no explicit count is set, so the covered count is 1.
-      expect(response.body).to include("Covering 1 registrant")
+      expect(submission.reload.linked_registration_ids).to eq([event_registration.id])
+      expect(response).to have_http_status(:ok)
     end
 
-    it "does not show per-person actions like cancelling a registration" do
-      get_ticket
+    it "does not duplicate an existing link" do
+      submission.link_registration!(event_registration.id)
 
-      expect(response.body).not_to include("Cancel registration")
+      expect {
+        post link_bulk_payment_event_path(event),
+             params: { submission_id: submission.id, event_registration_id: event_registration.id },
+             as: :turbo_stream
+      }.not_to change { submission.reload.linked_registration_ids }
     end
 
-    it "links the invoice back to the ticket" do
-      get_ticket
+    it "re-renders the card expanded" do
+      post link_bulk_payment_event_path(event),
+           params: { submission_id: submission.id, event_registration_id: event_registration.id },
+           as: :turbo_stream
 
-      expect(response.body).to include("return_to=bulk_payment_ticket")
+      expect(response.body).to include("payment-card-#{submission.id}")
     end
 
-    it "links 'View your form responses' to the public submission page" do
-      get_ticket
+    it "redirects to bulk_payments with HTML format" do
+      post link_bulk_payment_event_path(event),
+           params: { submission_id: submission.id, event_registration_id: event_registration.id }
 
-      expect(response.body).to include("View your form responses")
-      expect(response.body).to include(event_bulk_payment_path(event, reg: submission.slug))
+      expect(response).to redirect_to(bulk_payments_event_path(event))
     end
 
-    it "returns 404 for an unknown slug" do
-      get bulk_payment_ticket_path("nope")
+    it "shows an alert for a missing registration" do
+      post link_bulk_payment_event_path(event),
+           params: { submission_id: submission.id, event_registration_id: 0 },
+           as: :turbo_stream
 
-      expect(response).to have_http_status(:not_found)
+      expect(response.body).to include("Registration not found")
     end
+  end
 
-    it "adds a Back to bulk payments eyebrow when arriving from the dashboard" do
-      get bulk_payment_ticket_path(submission.slug, return_to: "bulk_payments", expand: submission.id)
+  describe "DELETE /events/:id/unlink_bulk_payment" do
+    let(:event) { create(:event) }
+    let(:payer) { create(:person) }
+    let!(:submission) { create(:form_submission, person: payer, form: form, event: event, role: "bulk_payment") }
+    let(:registrant) { create(:person) }
+    let!(:event_registration) { create(:event_registration, event: event, registrant: registrant) }
 
-      expect(response.body).to include("Back to event")
-      expect(response.body).to include("Back to bulk payments")
+    before do
+      submission.link_registration!(event_registration.id)
     end
 
-    context "as an admin" do
-      before { sign_in admin }
-
-      it "shows the admin allocations section" do
-        get_ticket
+    it "removes the registration id from the submission metadata" do
+      delete unlink_bulk_payment_event_path(event),
+             params: { submission_id: submission.id, event_registration_id: event_registration.id },
+             as: :turbo_stream
 
-        expect(response.body).to include("Payment allocations")
-      end
+      expect(submission.reload.linked_registration_ids).to be_empty
+      expect(response).to have_http_status(:ok)
     end
-  end
 
-  describe "POST resend_confirmation" do
-    let(:event) { create(:event, :publicly_visible, cost_cents: 1000) }
-    let(:payer) { create(:person, email: "payer@example.com") }
-    let!(:submission) { create(:form_submission, person: payer, form: form, event: event, role: "bulk_payment") }
+    it "re-renders the card expanded" do
+      delete unlink_bulk_payment_event_path(event),
+             params: { submission_id: submission.id, event_registration_id: event_registration.id },
+             as: :turbo_stream
 
-    before { sign_out admin }
+      expect(response.body).to include("payment-card-#{submission.id}")
+    end
 
-    it "re-sends the payer confirmation and returns to the ticket" do
-      expect {
-        post bulk_payment_resend_confirmation_path(submission.slug)
-      }.to change(Notification, :count).by(1)
+    it "redirects to bulk_payments with HTML format" do
+      delete unlink_bulk_payment_event_path(event),
+             params: { submission_id: submission.id, event_registration_id: event_registration.id }
 
-      expect(response).to redirect_to(bulk_payment_ticket_path(submission.slug))
-      expect(flash[:notice]).to eq("Confirmation email sent.")
+      expect(response).to redirect_to(bulk_payments_event_path(event))
     end
   end
 end
diff --git a/spec/requests/events_spec.rb b/spec/requests/events_spec.rb
index e2854544a6..c8fda9a931 100644
--- a/spec/requests/events_spec.rb
+++ b/spec/requests/events_spec.rb
@@ -2279,235 +2279,6 @@ def ce_chip_text
     end
   end
 
-  describe "GET /events/:id/bulk_payments" do
-    let(:admin) { create(:user, :admin) }
-    let(:event) { create(:event, cost_cents: 2500) }
-    let(:bulk_form) { create(:form) }
-    let!(:event_form) { create(:event_form, event: event, form: bulk_form, role: "bulk_payment") }
-    let(:payer) { create(:person) }
-    let!(:submission) { create(:form_submission, person: payer, form: bulk_form, event: event, role: "bulk_payment") }
-    let!(:attendees_field) do
-      create(:form_field, form: bulk_form, field_identifier: "number_of_attendees", name: "Attendees")
-    end
-
-    before { sign_in admin }
-
-    it "shows the submitted amount even when no payment has landed" do
-      submission.form_answers.create!(form_field: attendees_field, submitted_answer: "3")
-
-      get bulk_payments_event_path(event)
-
-      expect(response).to have_http_status(:ok)
-      expect(response.body).to include("$75")
-    end
-
-    it "shows the recorded payment amount when a payment exists" do
-      submission.form_answers.create!(form_field: attendees_field, submitted_answer: "3")
-      create(:payment, person: payer, form_submission: submission,
-             amount_cents: 5000, amount_cents_remaining: 5000)
-
-      get bulk_payments_event_path(event)
-
-      expect(response.body).to include("$50")
-    end
-
-    it "renders the targeted submission's row expanded when given an expand param" do
-      get bulk_payments_event_path(event, expand: submission.id)
-
-      expect(response.body).to include("id=\"payment-card-#{submission.id}\"")
-      # Expanded server-side: the toggle button gets data-dropdown-target="expand"
-      # so the dropdown controller clicks it on connect to open the card.
-      expect(response.body).to include("data-dropdown-target=\"expand\"")
-    end
-
-    it "renders rows collapsed without an expand param" do
-      get bulk_payments_event_path(event)
-
-      # Collapsed: the details panel keeps the `hidden` class and this card's chevron is not rotated.
-      expect(response.body).to match(/id="payment-details-#{submission.id}"\s+class="hidden/)
-      expect(response.body).not_to match(/id="payment-arrow-#{submission.id}"[^>]*rotate-180/)
-    end
-
-    it "renders a Profile column with a circle-only profile button for matched attendees" do
-      attendee = create(:person, first_name: "Match", last_name: "Attendee", email: "match.attendee@example.com")
-      create(:event_registration, event: event, registrant: attendee, status: "registered")
-      create(:form_field, form: bulk_form, field_identifier: "bulk_payment_attendees", name: "Attendees list")
-      submission.form_answers.create!(
-        form_field: bulk_form.form_fields.find_by(field_identifier: "bulk_payment_attendees"),
-        submitted_answer: [ { first_name: "Match", last_name: "Attendee", email: "match.attendee@example.com" } ].to_json
-      )
-
-      get bulk_payments_event_path(event)
-
-      expect(response).to have_http_status(:ok)
-      expect(response.body).to include(">Profile<")
-      # Circle-only profile button: a boxed (sky) link to the person holding just
-      # the compact h-5 avatar circle.
-      expect(response.body).to include(person_path(attendee))
-      expect(response.body).to include("bg-sky-100")
-      expect(response.body).to include("h-5 w-5")
-    end
-
-    it "shows a grey \"Paid\" instead of an orange balance when the registration is fully covered" do
-      attendee = create(:person, first_name: "Paid", last_name: "Infull", email: "paid.infull@example.com")
-      registration = create(:event_registration, event: event, registrant: attendee, status: "registered")
-      create(:form_field, form: bulk_form, field_identifier: "bulk_payment_attendees", name: "Attendees list")
-      submission.form_answers.create!(
-        form_field: bulk_form.form_fields.find_by(field_identifier: "bulk_payment_attendees"),
-        submitted_answer: [ { first_name: "Paid", last_name: "Infull", email: "paid.infull@example.com" } ].to_json
-      )
-      # Fully cover the $25 registration fee so nothing is owed.
-      create(:allocation, source: create(:payment, amount_cents: 2500, amount_cents_remaining: 2500),
-             allocatable: registration, amount: 2500)
-
-      get bulk_payments_event_path(event)
-
-      expect(response).to have_http_status(:ok)
-      expect(response.body).to include("text-gray-500 whitespace-nowrap\">Paid<")
-      expect(response.body).not_to include("$0.00")
-    end
-
-    it "lists only registrants who are not yet fully paid in the new-allocation dropdown" do
-      # The dropdown only renders when the payment still has an unallocated balance.
-      create(:payment, person: payer, form_submission: submission,
-             amount_cents: 5000, amount_cents_remaining: 5000)
-      unpaid = create(:person, first_name: "Owes", last_name: "Money", email: "owes.money@example.com")
-      create(:event_registration, event: event, registrant: unpaid, status: "registered")
-      paid = create(:person, first_name: "All", last_name: "Square", email: "all.square@example.com")
-      paid_registration = create(:event_registration, event: event, registrant: paid, status: "registered")
-      # Fully cover the $25 registration fee so this registrant drops off the list.
-      create(:allocation, source: create(:payment, amount_cents: 2500, amount_cents_remaining: 2500),
-             allocatable: paid_registration, amount: 2500)
-
-      get bulk_payments_event_path(event)
-
-      expect(response).to have_http_status(:ok)
-      expect(response.body).to include("Owes Money — owes.money@example.com")
-      expect(response.body).not_to include("All Square — all.square@example.com")
-    end
-  end
-
-  describe "POST /events/:id/allocate_bulk_payment" do
-    let(:admin) { create(:user, :admin) }
-    let(:event) { create(:event) }
-    let(:bulk_form) { create(:form) }
-    let!(:event_form) { create(:event_form, event: event, form: bulk_form, role: "bulk_payment") }
-    let(:payer) { create(:person) }
-    let!(:submission) { create(:form_submission, person: payer, form: bulk_form, event: event, role: "bulk_payment") }
-    let!(:payment) { create(:payment, person: payer, form_submission: submission,
-                            amount_cents: 1000, amount_cents_remaining: 1000) }
-    let(:registrant) { create(:person) }
-    let!(:event_registration) { create(:event_registration, event: event, registrant: registrant) }
-
-    let(:valid_params) do
-      { payment_id: payment.id, event_registration_id: event_registration.id, amount_dollars: "5.00" }
-    end
-
-    before { sign_in admin }
-
-    it "rejects unauthenticated request" do
-      sign_out admin
-      post allocate_bulk_payment_event_path(event), params: valid_params
-      expect(response).to redirect_to(new_user_session_path)
-    end
-
-    it "rejects non-admin request" do
-      sign_out admin
-      sign_in create(:user)
-      post allocate_bulk_payment_event_path(event), params: valid_params
-      expect(response).to redirect_to(root_path)
-    end
-
-    it "creates an allocation and returns turbo_stream" do
-      expect {
-        post allocate_bulk_payment_event_path(event), params: valid_params, as: :turbo_stream
-      }.to change(Allocation, :count).by(1)
-
-      expect(payment.reload.amount_cents_remaining).to eq(500)
-      expect(response.media_type).to eq(Mime[:turbo_stream])
-      expect(response.body).to include("Allocation successful")
-    end
-
-    context "when the allocation pays a matched registration in full" do
-      let(:event) { create(:event, cost_cents: 500) }
-      let(:registrant) { create(:person, email: "match@example.com") }
-      let!(:attendees_field) do
-        create(:form_field, form: bulk_form, field_identifier: "bulk_payment_attendees", name: "Attendees")
-      end
-
-      before do
-        submission.form_answers.create!(
-          form_field: attendees_field,
-          submitted_answer: [ { first_name: registrant.first_name, last_name: registrant.last_name, email: "match@example.com" } ].to_json
-        )
-      end
-
-      it "re-renders the card with refreshed totals and hides the inline allocate box for that registration" do
-        post allocate_bulk_payment_event_path(event),
-             params: { payment_id: payment.id, event_registration_id: event_registration.id, amount_dollars: "5.00" },
-             as: :turbo_stream
-
-        # The whole card is re-rendered (kept expanded) with the new totals: the
-        # registration is now fully paid, so its due button reads "Paid".
-        expect(response.body).to include("payment-card-#{submission.id}")
-        expect(response.body).to include("rotate-180")
-        expect(response.body).to include(">Paid</span>")
-        # Payment still has $5 left, so only the bottom "New allocation" form
-        # remains — the inline per-row box for the now-paid registration is gone.
-        expect(response.body.scan(">Allocate</button>").size).to eq(1)
-      end
-    end
-
-    it "shows alert when event_registration_id is blank" do
-      params = valid_params.merge(event_registration_id: "")
-      expect {
-        post allocate_bulk_payment_event_path(event), params: params, as: :turbo_stream
-      }.not_to change(Allocation, :count)
-
-      expect(response.body).to include("Please select a registrant")
-    end
-
-    it "shows alert when event_registration_id is invalid" do
-      params = valid_params.merge(event_registration_id: 999999)
-      expect {
-        post allocate_bulk_payment_event_path(event), params: params, as: :turbo_stream
-      }.not_to change(Allocation, :count)
-
-      expect(response.body).to include("Please select a registrant")
-    end
-
-    it "shows alert when amount is zero" do
-      params = valid_params.merge(amount_dollars: "0.00")
-      expect {
-        post allocate_bulk_payment_event_path(event), params: params, as: :turbo_stream
-      }.not_to change(Allocation, :count)
-
-      expect(response.body).to include("Amount must be greater than $0.00")
-    end
-
-    it "shows alert when amount exceeds remaining balance" do
-      params = valid_params.merge(amount_dollars: "20.00")
-      expect {
-        post allocate_bulk_payment_event_path(event), params: params, as: :turbo_stream
-      }.not_to change(Allocation, :count)
-
-      expect(response.body).to include("Amount exceeds remaining balance")
-    end
-
-    it "shows alert when event registration is already fully paid" do
-      large_payment = create(:payment, person: payer, form_submission: submission,
-                             amount_cents: 2000, amount_cents_remaining: 2000)
-      create(:allocation, source: large_payment, allocatable: event_registration, amount: 1099)
-
-      params = { payment_id: large_payment.id, event_registration_id: event_registration.id, amount_dollars: "5.00" }
-      expect {
-        post allocate_bulk_payment_event_path(event), params: params, as: :turbo_stream
-      }.not_to change(Allocation, :count)
-
-      expect(response.body).to include("already fully paid")
-    end
-  end
-
   describe "POST /send_reminder" do
     let!(:registration_one) { create(:event_registration, event: event) }
     let!(:registration_two) { create(:event_registration, event: event) }

From 4caf12ecefc6edec1f51655a230a9c2a96bc8ce4 Mon Sep 17 00:00:00 2001
From: Justin Miller <16829344+jmilljr24@users.noreply.github.com>
Date: Mon, 27 Jul 2026 20:19:30 -0400
Subject: [PATCH 02/22] format card

---
 app/views/events/_bulk_payment_card.html.erb | 126 +++++++++----------
 1 file changed, 56 insertions(+), 70 deletions(-)

diff --git a/app/views/events/_bulk_payment_card.html.erb b/app/views/events/_bulk_payment_card.html.erb
index b8f0b1f95c..84a5b21270 100644
--- a/app/views/events/_bulk_payment_card.html.erb
+++ b/app/views/events/_bulk_payment_card.html.erb
@@ -67,37 +67,38 @@
 
     <% if attendee_matches.present? %>
       <div class="border-t border-gray-100 pt-2 space-y-1.5">
-        <h4 class="text-xs font-medium text-gray-400 uppercase tracking-wide">Submitted names</h4>
+        <div class="flex items-center gap-x-4 text-xs font-medium text-gray-400 uppercase tracking-wide">
+          <span class="flex-1 min-w-0">Submitted name</span>
+          <span class="flex-1 min-w-0">Potential match</span>
+        </div>
         <div class="divide-y divide-gray-100">
           <% attendee_matches.each do |am| %>
-            <div class="text-sm py-2 flex flex-wrap items-center gap-x-4 gap-y-1">
-              <span class="text-gray-900 font-medium"><%= am[:first_name] %></span>
-              <span class="text-gray-900"><%= am[:last_name] %></span>
-              <span class="text-gray-500 break-all"><%= am[:email] %></span>
-              <span class="text-gray-400">→</span>
-              <% best = am[:matches].first %>
-              <% if best %>
-                <span class="text-gray-600">
-                  <%= best.registrant.name %>
-                  <% remaining = [event_cost_cents - allocated_by_registration.fetch(best.id, 0), 0].max %>
-                  <span class="text-xs text-gray-400">(<%= remaining.zero? ? "Paid" : "#{dollars_from_cents(remaining)} remaining" %>)</span>
-                </span>
-                <% if linked_ids.include?(best.id) %>
-                  <%= form_tag unlink_bulk_payment_event_path(@event), method: :delete, class: "inline" do %>
-                    <%= hidden_field_tag :submission_id, submission.id %>
-                    <%= hidden_field_tag :event_registration_id, best.id %>
-                    <%= button_tag "Unlink", class: "text-xs text-red-600 hover:text-red-800 font-medium" %>
+            <div class="flex items-center gap-x-4 py-2">
+              <div class="flex-1 min-w-0 text-sm">
+                <span class="text-gray-900 font-medium"><%= am[:first_name] %> <%= am[:last_name] %></span>
+                <span class="text-gray-500 break-all"><%= am[:email] %></span>
+              </div>
+              <div class="flex items-center gap-x-2">
+                <% best = am[:matches].first %>
+                <% if best %>
+                  <%= person_profile_button(best.registrant, compact: true, width_class: "w-auto") %>
+                  <% if linked_ids.include?(best.id) %>
+                    <%= form_tag unlink_bulk_payment_event_path(@event), method: :delete, class: "inline" do %>
+                      <%= hidden_field_tag :submission_id, submission.id %>
+                      <%= hidden_field_tag :event_registration_id, best.id %>
+                      <%= button_tag "Unlink", class: "text-xs text-red-600 hover:text-red-800 font-medium" %>
+                    <% end %>
+                  <% else %>
+                    <%= form_tag link_bulk_payment_event_path(@event), class: "inline" do %>
+                      <%= hidden_field_tag :submission_id, submission.id %>
+                      <%= hidden_field_tag :event_registration_id, best.id %>
+                      <%= button_tag "Link", class: "text-xs text-blue-600 hover:text-blue-800 font-medium" %>
+                    <% end %>
                   <% end %>
                 <% else %>
-                  <%= form_tag link_bulk_payment_event_path(@event), class: "inline" do %>
-                    <%= hidden_field_tag :submission_id, submission.id %>
-                    <%= hidden_field_tag :event_registration_id, best.id %>
-                    <%= button_tag "Link", class: "text-xs text-blue-600 hover:text-blue-800 font-medium" %>
-                  <% end %>
+                  <span class="text-gray-400 text-xs">No match</span>
                 <% end %>
-              <% else %>
-                <span class="text-gray-400 text-xs">No match</span>
-              <% end %>
+              </div>
             </div>
           <% end %>
         </div>
@@ -105,58 +106,43 @@
     <% end %>
 
     <% if linked_regs.any? %>
-      <div class="@container border-t border-gray-100 pt-2 space-y-1.5">
+      <div class="border-t border-gray-100 pt-2 space-y-1.5">
         <h4 class="text-xs font-medium text-gray-400 uppercase tracking-wide">Linked registrations</h4>
-        <% linked_cols = "@4xl:grid-cols-[minmax(0,1fr)_minmax(0,2fr)_3.5rem_8rem_8rem_13rem]" %>
-        <div class="hidden @4xl:grid <%= linked_cols %> @4xl:gap-4 text-xs font-medium text-gray-500 uppercase tracking-wide border-b border-gray-200 pb-1">
-          <div>Name</div>
-          <div>Profile</div>
-          <div>Registration</div>
-          <div>Allocations</div>
-          <div>Action</div>
-        </div>
         <div class="divide-y divide-gray-100">
           <% linked_regs.each do |reg| %>
             <% allocated_cents = allocated_by_registration.fetch(reg.id, 0) %>
             <% remaining_cents = [event_cost_cents - allocated_cents, 0].max %>
             <% reg_paid_in_full = allocated_cents >= event_cost_cents %>
-            <div class="text-sm flex flex-col gap-3 py-3 @4xl:grid <%= linked_cols %> @4xl:gap-4 @4xl:items-start @4xl:py-2 rounded-lg hover:bg-gray-50 transition-colors">
-              <div class="text-gray-900 font-medium"><%= reg.registrant.name %></div>
-              <div class="flex flex-wrap items-start gap-3 @4xl:contents">
-                <%= render "events/person_profile_button", person: reg.registrant, return_to: "bulk_payments", event: @event, expand: submission.id %>
-                <div class="flex flex-col gap-1.5">
-                  <%= link_to edit_event_registration_path(reg, return_to: "bulk_payments", expand: submission.id),
-                              title: "View #{reg.registrant.name}'s registration for #{@event.title}",
-                              class: "inline-flex items-center gap-2 rounded-lg border border-gray-300 bg-white px-3 py-2 text-sm font-medium text-gray-600 shadow-sm hover:bg-gray-50 hover:text-gray-800 transition-colors" do %>
-                    <i class="fa-solid fa-clipboard-list text-gray-400"></i>
-                    <% if remaining_cents.zero? %>
-                      <span class="font-semibold text-gray-500 whitespace-nowrap">Paid</span>
-                    <% else %>
-                      <span class="font-semibold text-orange-600 tabular-nums whitespace-nowrap"><%= dollars_from_cents(remaining_cents) %></span>
-                    <% end %>
-                  <% end %>
-                </div>
-                <div class="flex flex-col gap-1.5">
-                  <%= link_to allocations_path(allocatable_sgid: reg.to_sgid.to_s, return_to: "bulk_payments", expand: submission.id),
-                              title: "View registration allocations",
-                              class: "inline-flex items-center gap-2 rounded-lg border border-gray-300 bg-white px-3 py-2 text-sm font-medium text-gray-600 shadow-sm hover:bg-gray-50 hover:text-gray-800 transition-colors" do %>
-                    <i class="fa-solid fa-list-check text-gray-400"></i>
-                    <span class="font-semibold text-green-600 tabular-nums"><%= dollars_from_cents(allocated_cents) %></span>
+            <div class="flex flex-wrap items-center gap-x-3 gap-y-2 py-2">
+              <div class="flex-1 min-w-0">
+                <%= render "events/person_profile_button", person: reg.registrant, show_name: true, return_to: "bulk_payments", event: @event, expand: submission.id %>
+              </div>
+              <div class="flex items-center gap-x-2">
+                <%= link_to edit_event_registration_path(reg, return_to: "bulk_payments", expand: submission.id),
+                            title: "View #{reg.registrant.name}'s registration for #{@event.title}",
+                            class: "inline-flex items-center gap-1.5 rounded-lg border border-gray-300 bg-white px-2.5 py-1 text-xs font-medium text-gray-600 shadow-sm hover:bg-gray-50 hover:text-gray-800 transition-colors" do %>
+                  <i class="fa-solid fa-clipboard-list text-gray-400"></i>
+                  <% if remaining_cents.zero? %>
+                    <span class="text-gray-500 whitespace-nowrap">Paid</span>
+                  <% else %>
+                    <span class="text-orange-600 tabular-nums whitespace-nowrap"><%= dollars_from_cents(remaining_cents) %> left</span>
                   <% end %>
-                </div>
-                <div class="flex flex-col gap-1.5">
-                  <% if payment && payment.amount_cents_remaining > 0 && !reg_paid_in_full %>
-                    <%= form_tag allocate_bulk_payment_event_path(@event), class: "flex items-center gap-1.5" do %>
-                      <%= hidden_field_tag :payment_id, payment.id %>
-                      <%= hidden_field_tag :event_registration_id, reg.id %>
-                      <span class="text-sm text-gray-500">$</span>
-                      <%= number_field_tag :amount_dollars, nil, step: "0.01", min: "0.01", class: "w-20 rounded-lg border border-gray-300 px-2 py-1 text-sm shadow-sm focus:border-blue-500 focus:ring focus:ring-blue-200 focus:outline-none", placeholder: "0.00" %>
-                      <%= button_tag "Allocate", class: "btn btn-primary" %>
-                    <% end %>
+                <% end %>
+                <%= link_to allocations_path(allocatable_sgid: reg.to_sgid.to_s, return_to: "bulk_payments", expand: submission.id),
+                            title: "View registration allocations",
+                            class: "inline-flex items-center gap-1.5 rounded-lg border border-gray-300 bg-white px-2.5 py-1 text-xs font-medium text-gray-600 shadow-sm hover:bg-gray-50 hover:text-gray-800 transition-colors" do %>
+                  <i class="fa-solid fa-list-check text-gray-400"></i>
+                  <span class="text-green-600 tabular-nums"><%= dollars_from_cents(allocated_cents) %></span>
+                <% end %>
+                <% if payment && payment.amount_cents_remaining > 0 && !reg_paid_in_full %>
+                  <%= form_tag allocate_bulk_payment_event_path(@event), class: "inline-flex items-center gap-1" do %>
+                    <%= hidden_field_tag :payment_id, payment.id %>
+                    <%= hidden_field_tag :event_registration_id, reg.id %>
+                    <span class="text-xs text-gray-500">$</span>
+                    <%= number_field_tag :amount_dollars, nil, step: "0.01", min: "0.01", class: "w-20 rounded-lg border border-gray-300 px-2 py-1 text-xs shadow-sm focus:border-blue-500 focus:ring focus:ring-blue-200 focus:outline-none", placeholder: "0.00" %>
+                    <%= button_tag "Allocate", class: "btn btn-primary btn-xs" %>
                   <% end %>
-                </div>
-              </div>
-              <div class="flex items-start @4xl:justify-end">
+                <% end %>
                 <%= form_tag unlink_bulk_payment_event_path(@event), method: :delete, class: "inline" do %>
                   <%= hidden_field_tag :submission_id, submission.id %>
                   <%= hidden_field_tag :event_registration_id, reg.id %>

From a6a553750887b27ce06964b1d4bff9f37a8a87b5 Mon Sep 17 00:00:00 2001
From: Justin Miller <16829344+jmilljr24@users.noreply.github.com>
Date: Mon, 27 Jul 2026 20:34:43 -0400
Subject: [PATCH 03/22] clean up

---
 app/views/events/_bulk_payment_card.html.erb | 22 --------------------
 spec/requests/events/bulk_payments_spec.rb   | 16 +++-----------
 2 files changed, 3 insertions(+), 35 deletions(-)

diff --git a/app/views/events/_bulk_payment_card.html.erb b/app/views/events/_bulk_payment_card.html.erb
index 84a5b21270..cac025689e 100644
--- a/app/views/events/_bulk_payment_card.html.erb
+++ b/app/views/events/_bulk_payment_card.html.erb
@@ -175,28 +175,6 @@
         <div id="<%= dom_id(payment, :allocations) %>">
           <%= render "events/payment_allocations", payment: payment, return_params: { return_to: "bulk_payments", expand: submission.id } %>
         </div>
-        <% if payment.amount_cents_remaining > 0 %>
-          <div class="pt-2 border-t border-gray-100">
-            <h5 class="text-xs font-medium text-gray-400 uppercase tracking-wide mb-2">New allocation</h5>
-            <%= form_tag allocate_bulk_payment_event_path(@event),
-                         class: "flex items-center gap-2" do %>
-              <%= hidden_field_tag :payment_id, payment.id %>
-              <% unpaid_registrations = event_registrations.reject { |r| allocated_by_registration.fetch(r.id, 0) >= event_cost_cents } %>
-              <div class="w-64 shrink-0">
-                <%= select_tag :event_registration_id,
-                     options_from_collection_for_select(unpaid_registrations, :id, ->(r) { "#{r.registrant.name} — #{r.registrant.email}" }),
-                     prompt: "Select registrant...",
-                     class: "w-full rounded-lg border border-gray-300 px-3 py-2 shadow-sm focus:outline-none focus:ring focus:ring-blue-200 focus:border-blue-500" %>
-              </div>
-              <span class="text-sm text-gray-500">$</span>
-              <%= number_field_tag :amount_dollars, nil,
-                                   step: "0.01", min: "0.01",
-                                   class: "w-24 rounded-lg border border-gray-300 px-3 py-2 text-sm shadow-sm focus:border-blue-500 focus:ring focus:ring-blue-200 focus:outline-none",
-                                   placeholder: "0.00" %>
-              <%= button_tag "Allocate", class: "btn btn-primary" %>
-            <% end %>
-          </div>
-        <% end %>
       </div>
     <% else %>
       <%= render "events/bulk_payment_form", submission: submission %>
diff --git a/spec/requests/events/bulk_payments_spec.rb b/spec/requests/events/bulk_payments_spec.rb
index 3872493863..87d9c0d7c9 100644
--- a/spec/requests/events/bulk_payments_spec.rb
+++ b/spec/requests/events/bulk_payments_spec.rb
@@ -117,21 +117,11 @@
       expect(response.body).not_to include("$0.00")
     end
 
-    it "lists only registrants who are not yet fully paid in the new-allocation dropdown" do
-      create(:payment, person: payer, form_submission: submission,
-             amount_cents: 5000, amount_cents_remaining: 5000)
-      unpaid = create(:person, first_name: "Owes", last_name: "Money", email: "owes.money@example.com")
-      create(:event_registration, event: event, registrant: unpaid, status: "registered")
-      paid = create(:person, first_name: "All", last_name: "Square", email: "all.square@example.com")
-      paid_registration = create(:event_registration, event: event, registrant: paid, status: "registered")
-      create(:allocation, source: create(:payment, amount_cents: 2500, amount_cents_remaining: 2500),
-             allocatable: paid_registration, amount: 2500)
-
+    it "does not show the removed new-allocation dropdown" do
       get bulk_payments_event_path(event)
 
       expect(response).to have_http_status(:ok)
-      expect(response.body).to include("Owes Money — owes.money@example.com")
-      expect(response.body).not_to include("All Square — all.square@example.com")
+      expect(response.body).not_to include("Select registrant...")
     end
   end
 
@@ -194,7 +184,7 @@
         expect(response.body).to include("payment-card-#{submission.id}")
         expect(response.body).to include("rotate-180")
         expect(response.body).to include(">Paid</span>")
-        expect(response.body.scan(">Allocate</button>").size).to eq(1)
+        expect(response.body.scan(">Allocate</button>").size).to eq(0)
       end
     end
 

From 24dbf6e16f4ad672fbaba716733ab7ec23f0fc25 Mon Sep 17 00:00:00 2001
From: Justin Miller <16829344+jmilljr24@users.noreply.github.com>
Date: Tue, 28 Jul 2026 07:21:54 -0400
Subject: [PATCH 04/22] move submitted names below linked

---
 app/views/events/_bulk_payment_card.html.erb | 177 ++++++++++---------
 1 file changed, 90 insertions(+), 87 deletions(-)

diff --git a/app/views/events/_bulk_payment_card.html.erb b/app/views/events/_bulk_payment_card.html.erb
index cac025689e..fcf28428a1 100644
--- a/app/views/events/_bulk_payment_card.html.erb
+++ b/app/views/events/_bulk_payment_card.html.erb
@@ -1,5 +1,4 @@
-<%
-  submission = submission.decorate
+<% submission = submission.decorate
   payment = submission.payment
   payment_method = submission.answers_by_identifier["payment_method"]
   content_id = "payment-details-#{submission.id}"
@@ -17,132 +16,103 @@
   event_cost_cents = @event.cost_cents.to_i
   attendee_matches = submission.matched_attendees(event_registrations)
   linked_ids = submission.linked_registration_ids.to_set
-  linked_regs = event_registrations.select { |r| linked_ids.include?(r.id) }
-%>
-<div id="payment-card-<%= submission.id %>"
-     data-controller="dropdown"
-      class="bg-white border border-gray-200 rounded-xl shadow-sm px-4 py-3 hover:shadow-md transition-shadow scroll-mt-4">
-  <%# Fixed column template (shared by every card so columns align row-to-row):
-      name | email | method | amount | badge | date | submission | chevron. %>
+  linked_regs = event_registrations.select { |r| linked_ids.include?(r.id) } %>
+
+<div id="payment-card-<%= submission.id %>" data-controller="dropdown" class="bg-white border border-gray-200 rounded-xl shadow-sm px-4 py-3 hover:shadow-md transition-shadow scroll-mt-4">
+  <%#
+    Fixed column template (shared by every card so columns align row-to-row):
+    name | email | method | amount | badge | date | submission | chevron.
+  %>
+
   <div class="flex flex-wrap items-center gap-x-3 gap-y-1.5 lg:grid lg:grid-cols-[minmax(0,1fr)_minmax(0,1.4fr)_8rem_6rem_13rem_7rem_auto_1.5rem]">
     <span class="text-sm font-medium text-gray-900 min-w-0 lg:truncate"><%= submission.person.name %></span>
     <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>
+    <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>
     <span class="text-sm text-gray-500 whitespace-nowrap"><%= submission.created_at.strftime("%b %-d, %Y") %></span>
+
     <div class="flex items-center gap-2">
-      <%# Payer slug when present; otherwise the admin-only id fallback so legacy
-          slugless submissions are still viewable from the dashboard. %>
+      <%#
+        Payer slug when present; otherwise the admin-only id fallback so legacy
+        slugless submissions are still viewable from the dashboard.
+      %>
       <% submission_show_params = submission.slug.present? ? { reg: submission.slug } : { submission_id: submission.id } %>
+
       <%= link_to event_bulk_payment_path(@event, **submission_show_params, return_to: "bulk_payments", expand: submission.id),
                   title: "View form submission",
                   class: "inline-flex items-center gap-1.5 rounded-lg border border-gray-300 bg-white px-2.5 py-1 text-xs font-medium text-gray-600 shadow-sm hover:bg-gray-50 hover:text-gray-800 transition-colors whitespace-nowrap" do %>
-        <i class="fa-solid fa-file-lines text-xs"></i> Submission - ID: <%= submission.id %>
+        <i class="fa-solid fa-file-lines text-xs"></i>
+        Submission - ID: <%= submission.id %>
       <% end %>
+
       <%= link_to event_invoice_path(@event, submission_id: submission.id, return_to: "bulk_payments"),
                   title: "View invoice",
                   class: "inline-flex items-center gap-1.5 rounded-lg border border-gray-300 bg-white px-2.5 py-1 text-xs font-medium text-gray-600 shadow-sm hover:bg-gray-50 hover:text-gray-800 transition-colors whitespace-nowrap" do %>
-        <i class="fa-solid fa-file-invoice-dollar text-xs"></i> Invoice
+        <i class="fa-solid fa-file-invoice-dollar text-xs"></i>
+        Invoice
       <% end %>
     </div>
 
-    <button type="button"
-            data-action="dropdown#toggle"
-            <% if expanded %>data-dropdown-target="expand"<% end %>
-            data-dropdown-payload-param='[{"<%= content_id %>":"hidden"}, {"<%= arrow_id %>":"rotate-180"}]'
-            class="text-gray-400 hover:text-gray-600 p-1 justify-self-end"
-            title="More info">
+    <button
+      type="button"
+      data-action="dropdown#toggle"
+      <% if expanded %>
+        data-dropdown-target="expand"
+      <% end %>
+      data-dropdown-payload-param='[{"<%= content_id %>":"hidden"}, {"<%= arrow_id %>":"rotate-180"}]'
+      class="text-gray-400 hover:text-gray-600 p-1 justify-self-end"
+      title="More info"
+    >
       <i id="<%= arrow_id %>" class="fa-solid fa-chevron-down transition-transform duration-200"></i>
     </button>
   </div>
-  <div id="<%= content_id %>"
-       class="hidden mt-3 pt-3 border-t border-gray-100 space-y-3"
-       data-dropdown-target="content">
-
-    <% if attendee_matches.present? %>
-      <div class="border-t border-gray-100 pt-2 space-y-1.5">
-        <div class="flex items-center gap-x-4 text-xs font-medium text-gray-400 uppercase tracking-wide">
-          <span class="flex-1 min-w-0">Submitted name</span>
-          <span class="flex-1 min-w-0">Potential match</span>
-        </div>
-        <div class="divide-y divide-gray-100">
-          <% attendee_matches.each do |am| %>
-            <div class="flex items-center gap-x-4 py-2">
-              <div class="flex-1 min-w-0 text-sm">
-                <span class="text-gray-900 font-medium"><%= am[:first_name] %> <%= am[:last_name] %></span>
-                <span class="text-gray-500 break-all"><%= am[:email] %></span>
-              </div>
-              <div class="flex items-center gap-x-2">
-                <% best = am[:matches].first %>
-                <% if best %>
-                  <%= person_profile_button(best.registrant, compact: true, width_class: "w-auto") %>
-                  <% if linked_ids.include?(best.id) %>
-                    <%= form_tag unlink_bulk_payment_event_path(@event), method: :delete, class: "inline" do %>
-                      <%= hidden_field_tag :submission_id, submission.id %>
-                      <%= hidden_field_tag :event_registration_id, best.id %>
-                      <%= button_tag "Unlink", class: "text-xs text-red-600 hover:text-red-800 font-medium" %>
-                    <% end %>
-                  <% else %>
-                    <%= form_tag link_bulk_payment_event_path(@event), class: "inline" do %>
-                      <%= hidden_field_tag :submission_id, submission.id %>
-                      <%= hidden_field_tag :event_registration_id, best.id %>
-                      <%= button_tag "Link", class: "text-xs text-blue-600 hover:text-blue-800 font-medium" %>
-                    <% end %>
-                  <% end %>
-                <% else %>
-                  <span class="text-gray-400 text-xs">No match</span>
-                <% end %>
-              </div>
-            </div>
-          <% end %>
-        </div>
-      </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-t border-gray-100 pt-2 space-y-1.5">
         <h4 class="text-xs font-medium text-gray-400 uppercase tracking-wide">Linked registrations</h4>
+
         <div class="divide-y divide-gray-100">
           <% linked_regs.each do |reg| %>
             <% allocated_cents = allocated_by_registration.fetch(reg.id, 0) %>
             <% remaining_cents = [event_cost_cents - allocated_cents, 0].max %>
             <% reg_paid_in_full = allocated_cents >= event_cost_cents %>
+
             <div class="flex flex-wrap items-center gap-x-3 gap-y-2 py-2">
-              <div class="flex-1 min-w-0">
-                <%= render "events/person_profile_button", person: reg.registrant, show_name: true, return_to: "bulk_payments", event: @event, expand: submission.id %>
-              </div>
+              <div class="flex-1 min-w-0"><%= render "events/person_profile_button", person: reg.registrant, show_name: true, return_to: "bulk_payments", event: @event, expand: submission.id %></div>
+
               <div class="flex items-center gap-x-2">
                 <%= link_to edit_event_registration_path(reg, return_to: "bulk_payments", expand: submission.id),
                             title: "View #{reg.registrant.name}'s registration for #{@event.title}",
                             class: "inline-flex items-center gap-1.5 rounded-lg border border-gray-300 bg-white px-2.5 py-1 text-xs font-medium text-gray-600 shadow-sm hover:bg-gray-50 hover:text-gray-800 transition-colors" do %>
                   <i class="fa-solid fa-clipboard-list text-gray-400"></i>
+
                   <% if remaining_cents.zero? %>
                     <span class="text-gray-500 whitespace-nowrap">Paid</span>
                   <% else %>
                     <span class="text-orange-600 tabular-nums whitespace-nowrap"><%= dollars_from_cents(remaining_cents) %> left</span>
                   <% end %>
                 <% end %>
+
                 <%= link_to allocations_path(allocatable_sgid: reg.to_sgid.to_s, return_to: "bulk_payments", expand: submission.id),
                             title: "View registration allocations",
                             class: "inline-flex items-center gap-1.5 rounded-lg border border-gray-300 bg-white px-2.5 py-1 text-xs font-medium text-gray-600 shadow-sm hover:bg-gray-50 hover:text-gray-800 transition-colors" do %>
                   <i class="fa-solid fa-list-check text-gray-400"></i>
                   <span class="text-green-600 tabular-nums"><%= dollars_from_cents(allocated_cents) %></span>
                 <% end %>
+
                 <% if payment && payment.amount_cents_remaining > 0 && !reg_paid_in_full %>
                   <%= form_tag allocate_bulk_payment_event_path(@event), class: "inline-flex items-center gap-1" do %>
                     <%= hidden_field_tag :payment_id, payment.id %>
                     <%= hidden_field_tag :event_registration_id, reg.id %>
+
                     <span class="text-xs text-gray-500">$</span>
                     <%= number_field_tag :amount_dollars, nil, step: "0.01", min: "0.01", class: "w-20 rounded-lg border border-gray-300 px-2 py-1 text-xs shadow-sm focus:border-blue-500 focus:ring focus:ring-blue-200 focus:outline-none", placeholder: "0.00" %>
                     <%= button_tag "Allocate", class: "btn btn-primary btn-xs" %>
                   <% end %>
                 <% end %>
+
                 <%= form_tag unlink_bulk_payment_event_path(@event), method: :delete, class: "inline" do %>
                   <%= hidden_field_tag :submission_id, submission.id %>
                   <%= hidden_field_tag :event_registration_id, reg.id %>
@@ -152,29 +122,62 @@
             </div>
           <% end %>
         </div>
-        <div class="pt-2 border-t border-gray-100">
-          <h5 class="text-xs font-medium text-gray-400 uppercase tracking-wide mb-2">Link a registration</h5>
-          <%= form_tag link_bulk_payment_event_path(@event), class: "flex items-center gap-2" do %>
-            <%= hidden_field_tag :submission_id, submission.id %>
-            <% unlinked_regs = event_registrations.reject { |r| linked_ids.include?(r.id) } %>
-            <div class="w-64 shrink-0">
-              <%= select_tag :event_registration_id,
-                   options_from_collection_for_select(unlinked_regs, :id, ->(r) { "#{r.registrant.name} — #{r.registrant.email}" }),
-                   prompt: "Select registrant...",
-                   class: "w-full rounded-lg border border-gray-300 px-3 py-2 shadow-sm focus:outline-none focus:ring focus:ring-blue-200 focus:border-blue-500" %>
+      </div>
+    <% end %>
+
+    <div class="bg-gray-100 rounded-lg p-3 space-y-1.5">
+      <div class="flex items-center gap-x-4 text-xs font-medium text-gray-400 uppercase tracking-wide"><span class="flex-1 min-w-0">Submitted names</span><span class="flex-1 min-w-0">Potential match</span></div>
+
+      <% if attendee_matches.present? %>
+        <div class="divide-y divide-gray-100">
+          <% attendee_matches.each do |am| %>
+            <div class="flex items-center gap-x-4 py-2">
+              <div class="flex-1 min-w-0 text-sm"><span class="text-gray-900 font-medium"><%= am[:first_name] %> <%= am[:last_name] %></span><span class="text-gray-500 break-all"><%= am[:email] %></span></div>
+
+              <div class="flex items-center gap-x-2">
+                <% best = am[:matches].first %>
+
+                <% if best %>
+                  <%= person_profile_button(best.registrant, compact: true, width_class: "w-auto") %>
+                  <% unless linked_ids.include?(best.id) %>
+                    <%= form_tag link_bulk_payment_event_path(@event), class: "inline" do %>
+                      <%= hidden_field_tag :submission_id, submission.id %>
+                      <%= hidden_field_tag :event_registration_id, best.id %>
+                      <%= button_tag "Link", class: "text-xs text-blue-600 hover:text-blue-800 font-medium" %>
+                    <% end %>
+                  <% end %>
+                <% else %>
+                  <span class="text-gray-400 text-xs">No match</span>
+                <% end %>
+              </div>
             </div>
-            <%= button_tag "Link", class: "btn btn-primary" %>
           <% end %>
         </div>
+      <% end %>
+
+      <div class="pt-2 border-t border-gray-100">
+        <h5 class="text-xs font-medium text-gray-400 uppercase tracking-wide mb-2">Manually link a registration</h5>
+
+        <%= form_tag link_bulk_payment_event_path(@event), class: "flex items-center gap-2" do %>
+          <%= hidden_field_tag :submission_id, submission.id %>
+          <% unlinked_regs = event_registrations.reject { |r| linked_ids.include?(r.id) } %>
+
+          <div class="w-64 shrink-0">
+            <%= select_tag :event_registration_id,
+                   options_from_collection_for_select(unlinked_regs, :id, ->(r) { "#{r.registrant.name} — #{r.registrant.email}" }),
+                   prompt: "Select registrant...",
+                   class: "w-full rounded-lg border border-gray-300 px-3 py-2 shadow-sm focus:outline-none focus:ring focus:ring-blue-200 focus:border-blue-500" %>
+          </div>
+
+          <%= button_tag "Link", class: "btn btn-primary" %>
+        <% end %>
       </div>
-    <% end %>
+    </div>
 
     <% if payment %>
       <div class="border-t border-gray-100 pt-2 space-y-2">
         <h4 class="text-xs font-medium text-gray-400 uppercase tracking-wide">Payment allocations</h4>
-        <div id="<%= dom_id(payment, :allocations) %>">
-          <%= render "events/payment_allocations", payment: payment, return_params: { return_to: "bulk_payments", expand: submission.id } %>
-        </div>
+        <div id="<%= dom_id(payment, :allocations) %>"><%= render "events/payment_allocations", payment: payment, return_params: { return_to: "bulk_payments", expand: submission.id } %></div>
       </div>
     <% else %>
       <%= render "events/bulk_payment_form", submission: submission %>

From a7513f7c1a76fcf3e111c57f7e000db964f60038 Mon Sep 17 00:00:00 2001
From: Justin Miller <16829344+jmilljr24@users.noreply.github.com>
Date: Tue, 28 Jul 2026 07:41:05 -0400
Subject: [PATCH 05/22] fix columns

---
 app/views/events/_bulk_payment_card.html.erb | 31 +++++++++++---------
 spec/requests/events/bulk_payments_spec.rb   |  2 +-
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/app/views/events/_bulk_payment_card.html.erb b/app/views/events/_bulk_payment_card.html.erb
index fcf28428a1..9ba31c76d3 100644
--- a/app/views/events/_bulk_payment_card.html.erb
+++ b/app/views/events/_bulk_payment_card.html.erb
@@ -126,32 +126,35 @@
     <% end %>
 
     <div class="bg-gray-100 rounded-lg p-3 space-y-1.5">
-      <div class="flex items-center gap-x-4 text-xs font-medium text-gray-400 uppercase tracking-wide"><span class="flex-1 min-w-0">Submitted names</span><span class="flex-1 min-w-0">Potential match</span></div>
+      <div class="grid grid-cols-5 gap-x-4 text-xs font-medium text-gray-400 uppercase tracking-wide"><span class="col-span-2">Submitted names</span><span class="col-span-2">Potential match</span><span></span></div>
 
       <% if attendee_matches.present? %>
         <div class="divide-y divide-gray-100">
-          <% attendee_matches.each do |am| %>
-            <div class="flex items-center gap-x-4 py-2">
-              <div class="flex-1 min-w-0 text-sm"><span class="text-gray-900 font-medium"><%= am[:first_name] %> <%= am[:last_name] %></span><span class="text-gray-500 break-all"><%= am[:email] %></span></div>
+          <div class="grid grid-cols-5 gap-4 items-center py-2">
+            <% attendee_matches.each do |am| %>
+              <div class="col-span-2 min-w-0 text-sm"><span class="text-gray-900 font-medium"><%= am[:first_name] %> <%= am[:last_name] %></span><span class="text-gray-500 break-all"><%= am[:email] %></span></div>
 
-              <div class="flex items-center gap-x-2">
+              <div class="col-span-2 min-w-0">
                 <% best = am[:matches].first %>
 
                 <% if best %>
                   <%= person_profile_button(best.registrant, compact: true, width_class: "w-auto") %>
-                  <% unless linked_ids.include?(best.id) %>
-                    <%= form_tag link_bulk_payment_event_path(@event), class: "inline" do %>
-                      <%= hidden_field_tag :submission_id, submission.id %>
-                      <%= hidden_field_tag :event_registration_id, best.id %>
-                      <%= button_tag "Link", class: "text-xs text-blue-600 hover:text-blue-800 font-medium" %>
-                    <% end %>
-                  <% end %>
                 <% else %>
                   <span class="text-gray-400 text-xs">No match</span>
                 <% end %>
               </div>
-            </div>
-          <% end %>
+
+              <div>
+                <% if best && !linked_ids.include?(best.id) %>
+                  <%= form_tag link_bulk_payment_event_path(@event), class: "inline" do %>
+                    <%= hidden_field_tag :submission_id, submission.id %>
+                    <%= hidden_field_tag :event_registration_id, best.id %>
+                    <%= button_tag "Link", class: "text-xs text-blue-600 hover:text-blue-800 font-medium" %>
+                  <% end %>
+                <% end %>
+              </div>
+            <% end %>
+          </div>
         </div>
       <% end %>
 
diff --git a/spec/requests/events/bulk_payments_spec.rb b/spec/requests/events/bulk_payments_spec.rb
index 87d9c0d7c9..ab171c3a77 100644
--- a/spec/requests/events/bulk_payments_spec.rb
+++ b/spec/requests/events/bulk_payments_spec.rb
@@ -121,7 +121,7 @@
       get bulk_payments_event_path(event)
 
       expect(response).to have_http_status(:ok)
-      expect(response.body).not_to include("Select registrant...")
+      expect(response.body).not_to include("New allocation")
     end
   end
 

From e89724ea9c39fb255ae861164a48df09e1d36865 Mon Sep 17 00:00:00 2001
From: Justin Miller <16829344+jmilljr24@users.noreply.github.com>
Date: Tue, 28 Jul 2026 07:50:53 -0400
Subject: [PATCH 06/22] use standard profile card

---
 app/views/events/_bulk_payment_card.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/events/_bulk_payment_card.html.erb b/app/views/events/_bulk_payment_card.html.erb
index 9ba31c76d3..16fb0ebaba 100644
--- a/app/views/events/_bulk_payment_card.html.erb
+++ b/app/views/events/_bulk_payment_card.html.erb
@@ -80,7 +80,7 @@
             <% reg_paid_in_full = allocated_cents >= event_cost_cents %>
 
             <div class="flex flex-wrap items-center gap-x-3 gap-y-2 py-2">
-              <div class="flex-1 min-w-0"><%= render "events/person_profile_button", person: reg.registrant, show_name: true, return_to: "bulk_payments", event: @event, expand: submission.id %></div>
+              <div class="flex-1 min-w-0"><%= person_profile_button(reg.registrant, subtitle: reg.registrant.preferred_email, path_params: { return_to: "bulk_payments", event_id: @event.id, expand: submission.id }) %></div>
 
               <div class="flex items-center gap-x-2">
                 <%= link_to edit_event_registration_path(reg, return_to: "bulk_payments", expand: submission.id),
@@ -132,7 +132,7 @@
         <div class="divide-y divide-gray-100">
           <div class="grid grid-cols-5 gap-4 items-center py-2">
             <% attendee_matches.each do |am| %>
-              <div class="col-span-2 min-w-0 text-sm"><span class="text-gray-900 font-medium"><%= am[:first_name] %> <%= am[:last_name] %></span><span class="text-gray-500 break-all"><%= am[:email] %></span></div>
+              <div class="col-span-2 min-w-0 text-sm"><span class="text-gray-900 font-medium"><%= am[:first_name] %> <%= am[:last_name] %></span> <span class="text-gray-500 break-all"><%= am[:email] %></span></div>
 
               <div class="col-span-2 min-w-0">
                 <% best = am[:matches].first %>

From 5f8360ad516d31895ee337eb88bff4f08fd98435 Mon Sep 17 00:00:00 2001
From: Justin Miller <16829344+jmilljr24@users.noreply.github.com>
Date: Tue, 28 Jul 2026 07:53:10 -0400
Subject: [PATCH 07/22] grid spacing

---
 app/views/events/_bulk_payment_card.html.erb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/events/_bulk_payment_card.html.erb b/app/views/events/_bulk_payment_card.html.erb
index 16fb0ebaba..db1e87a921 100644
--- a/app/views/events/_bulk_payment_card.html.erb
+++ b/app/views/events/_bulk_payment_card.html.erb
@@ -126,15 +126,15 @@
     <% end %>
 
     <div class="bg-gray-100 rounded-lg p-3 space-y-1.5">
-      <div class="grid grid-cols-5 gap-x-4 text-xs font-medium text-gray-400 uppercase tracking-wide"><span class="col-span-2">Submitted names</span><span class="col-span-2">Potential match</span><span></span></div>
+      <div class="grid grid-cols-7 gap-x-4 text-xs font-medium text-gray-400 uppercase tracking-wide"><span class="col-span-3">Submitted names</span><span class="col-span-3">Potential match</span><span></span></div>
 
       <% if attendee_matches.present? %>
         <div class="divide-y divide-gray-100">
-          <div class="grid grid-cols-5 gap-4 items-center py-2">
+          <div class="grid grid-cols-7 gap-4 items-center py-2">
             <% attendee_matches.each do |am| %>
-              <div class="col-span-2 min-w-0 text-sm"><span class="text-gray-900 font-medium"><%= am[:first_name] %> <%= am[:last_name] %></span> <span class="text-gray-500 break-all"><%= am[:email] %></span></div>
+              <div class="col-span-3 text-sm"><span class="text-gray-900 font-medium"><%= am[:first_name] %> <%= am[:last_name] %></span> <span class="text-gray-500 break-all"><%= am[:email] %></span></div>
 
-              <div class="col-span-2 min-w-0">
+              <div class="col-span-3">
                 <% best = am[:matches].first %>
 
                 <% if best %>

From 7ec9c2399ac2b5eb132d9a50908a9e56a5969dbb Mon Sep 17 00:00:00 2001
From: Justin Miller <16829344+jmilljr24@users.noreply.github.com>
Date: Tue, 28 Jul 2026 08:28:06 -0400
Subject: [PATCH 08/22] styling

---
 app/views/events/_bulk_payment_card.html.erb | 26 ++++++++++----------
 spec/requests/events/bulk_payments_spec.rb   | 17 -------------
 2 files changed, 13 insertions(+), 30 deletions(-)

diff --git a/app/views/events/_bulk_payment_card.html.erb b/app/views/events/_bulk_payment_card.html.erb
index db1e87a921..acf8455171 100644
--- a/app/views/events/_bulk_payment_card.html.erb
+++ b/app/views/events/_bulk_payment_card.html.erb
@@ -70,7 +70,7 @@
 
   <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-t border-gray-100 pt-2 space-y-1.5">
+      <div class="border-b border-gray-200 pt-2 space-y-1.5">
         <h4 class="text-xs font-medium text-gray-400 uppercase tracking-wide">Linked registrations</h4>
 
         <div class="divide-y divide-gray-100">
@@ -79,13 +79,13 @@
             <% remaining_cents = [event_cost_cents - allocated_cents, 0].max %>
             <% reg_paid_in_full = allocated_cents >= event_cost_cents %>
 
-            <div class="flex flex-wrap items-center gap-x-3 gap-y-2 py-2">
-              <div class="flex-1 min-w-0"><%= person_profile_button(reg.registrant, subtitle: reg.registrant.preferred_email, path_params: { return_to: "bulk_payments", event_id: @event.id, expand: submission.id }) %></div>
+            <div class="grid grid-cols-2 gap-x-4 items-center py-2">
+              <div class="min-w-0"><%= person_profile_button(reg.registrant, subtitle: reg.registrant.preferred_email, path_params: { return_to: "bulk_payments", event_id: @event.id, expand: submission.id }) %></div>
 
-              <div class="flex items-center gap-x-2">
+              <div class="flex flex-wrap items-center justify-center gap-4">
                 <%= link_to edit_event_registration_path(reg, return_to: "bulk_payments", expand: submission.id),
                             title: "View #{reg.registrant.name}'s registration for #{@event.title}",
-                            class: "inline-flex items-center gap-1.5 rounded-lg border border-gray-300 bg-white px-2.5 py-1 text-xs font-medium text-gray-600 shadow-sm hover:bg-gray-50 hover:text-gray-800 transition-colors" do %>
+                            class: "inline-flex items-center w-24 gap-1.5 rounded-lg border border-gray-300 bg-white px-2.5 py-1 text-xs font-medium text-gray-600 shadow-sm hover:bg-gray-50 hover:text-gray-800 transition-colors" do %>
                   <i class="fa-solid fa-clipboard-list text-gray-400"></i>
 
                   <% if remaining_cents.zero? %>
@@ -97,26 +97,26 @@
 
                 <%= link_to allocations_path(allocatable_sgid: reg.to_sgid.to_s, return_to: "bulk_payments", expand: submission.id),
                             title: "View registration allocations",
-                            class: "inline-flex items-center gap-1.5 rounded-lg border border-gray-300 bg-white px-2.5 py-1 text-xs font-medium text-gray-600 shadow-sm hover:bg-gray-50 hover:text-gray-800 transition-colors" do %>
+                            class: "inline-flex items-center w-24 gap-1.5 rounded-lg border border-gray-300 bg-white px-2.5 py-1 text-xs font-medium text-gray-600 shadow-sm hover:bg-gray-50 hover:text-gray-800 transition-colors" do %>
                   <i class="fa-solid fa-list-check text-gray-400"></i>
                   <span class="text-green-600 tabular-nums"><%= dollars_from_cents(allocated_cents) %></span>
                 <% end %>
 
                 <% if payment && payment.amount_cents_remaining > 0 && !reg_paid_in_full %>
-                  <%= form_tag allocate_bulk_payment_event_path(@event), class: "inline-flex items-center gap-1" do %>
+                  <%= form_tag allocate_bulk_payment_event_path(@event), class: "flex items-center gap-1" do %>
                     <%= hidden_field_tag :payment_id, payment.id %>
                     <%= hidden_field_tag :event_registration_id, reg.id %>
 
                     <span class="text-xs text-gray-500">$</span>
                     <%= number_field_tag :amount_dollars, nil, step: "0.01", min: "0.01", class: "w-20 rounded-lg border border-gray-300 px-2 py-1 text-xs shadow-sm focus:border-blue-500 focus:ring focus:ring-blue-200 focus:outline-none", placeholder: "0.00" %>
-                    <%= button_tag "Allocate", class: "btn btn-primary btn-xs" %>
+                    <%= button_tag "Allocate", class: "btn btn-primary btn-xs cursor-pointer" %>
                   <% end %>
                 <% end %>
 
                 <%= form_tag unlink_bulk_payment_event_path(@event), method: :delete, class: "inline" do %>
                   <%= hidden_field_tag :submission_id, submission.id %>
                   <%= hidden_field_tag :event_registration_id, reg.id %>
-                  <%= button_tag "Unlink", class: "text-xs text-red-600 hover:text-red-800 font-medium" %>
+                  <%= button_tag "Unlink", class: "text-xs text-red-600 hover:text-red-800 font-medium cursor-pointer" %>
                 <% end %>
               </div>
             </div>
@@ -158,14 +158,14 @@
         </div>
       <% end %>
 
-      <div class="pt-2 border-t border-gray-100">
+      <div class="pt-2">
         <h5 class="text-xs font-medium text-gray-400 uppercase tracking-wide mb-2">Manually link a registration</h5>
 
-        <%= form_tag link_bulk_payment_event_path(@event), class: "flex items-center gap-2" do %>
+        <%= form_tag link_bulk_payment_event_path(@event), class: "flex flex-wrap items-center gap-2" do %>
           <%= hidden_field_tag :submission_id, submission.id %>
           <% unlinked_regs = event_registrations.reject { |r| linked_ids.include?(r.id) } %>
 
-          <div class="w-64 shrink-0">
+          <div class="w-64">
             <%= select_tag :event_registration_id,
                    options_from_collection_for_select(unlinked_regs, :id, ->(r) { "#{r.registrant.name} — #{r.registrant.email}" }),
                    prompt: "Select registrant...",
@@ -178,7 +178,7 @@
     </div>
 
     <% if payment %>
-      <div class="border-t border-gray-100 pt-2 space-y-2">
+      <div class="border-t border-gray-200 pt-2 space-y-2">
         <h4 class="text-xs font-medium text-gray-400 uppercase tracking-wide">Payment allocations</h4>
         <div id="<%= dom_id(payment, :allocations) %>"><%= render "events/payment_allocations", payment: payment, return_params: { return_to: "bulk_payments", expand: submission.id } %></div>
       </div>
diff --git a/spec/requests/events/bulk_payments_spec.rb b/spec/requests/events/bulk_payments_spec.rb
index ab171c3a77..bd4cc651cd 100644
--- a/spec/requests/events/bulk_payments_spec.rb
+++ b/spec/requests/events/bulk_payments_spec.rb
@@ -80,23 +80,6 @@
       expect(response.body).not_to match(/id="payment-arrow-#{submission.id}"[^>]*rotate-180/)
     end
 
-    it "renders a Profile column with a circle-only profile button for matched attendees" do
-      attendee = create(:person, first_name: "Match", last_name: "Attendee", email: "match.attendee@example.com")
-      reg = create(:event_registration, event: event, registrant: attendee, status: "registered")
-      create(:form_field, form: form, field_identifier: "bulk_payment_attendees", name: "Attendees list")
-      submission.form_answers.create!(
-        form_field: form.form_fields.find_by(field_identifier: "bulk_payment_attendees"),
-        submitted_answer: [ { first_name: "Match", last_name: "Attendee", email: "match.attendee@example.com" } ].to_json
-      )
-      submission.link_registration!(reg.id)
-
-      get bulk_payments_event_path(event)
-
-      expect(response).to have_http_status(:ok)
-      expect(response.body).to include(person_path(attendee))
-      expect(response.body).to include("bg-sky-100")
-      expect(response.body).to include("h-5 w-5")
-    end
 
     it "shows a grey \"Paid\" instead of an orange balance when the registration is fully covered" do
       attendee = create(:person, first_name: "Paid", last_name: "Infull", email: "paid.infull@example.com")

From 1f8126467682bcccf0d175abd17e0ff9381e2428 Mon Sep 17 00:00:00 2001
From: Justin Miller <16829344+jmilljr24@users.noreply.github.com>
Date: Tue, 28 Jul 2026 08:31:32 -0400
Subject: [PATCH 09/22] justify

---
 app/views/events/_bulk_payment_card.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/events/_bulk_payment_card.html.erb b/app/views/events/_bulk_payment_card.html.erb
index acf8455171..1f11e7b0f9 100644
--- a/app/views/events/_bulk_payment_card.html.erb
+++ b/app/views/events/_bulk_payment_card.html.erb
@@ -82,7 +82,7 @@
             <div class="grid grid-cols-2 gap-x-4 items-center py-2">
               <div class="min-w-0"><%= person_profile_button(reg.registrant, subtitle: reg.registrant.preferred_email, path_params: { return_to: "bulk_payments", event_id: @event.id, expand: submission.id }) %></div>
 
-              <div class="flex flex-wrap items-center justify-center gap-4">
+              <div class="flex flex-wrap items-center gap-4">
                 <%= link_to edit_event_registration_path(reg, return_to: "bulk_payments", expand: submission.id),
                             title: "View #{reg.registrant.name}'s registration for #{@event.title}",
                             class: "inline-flex items-center w-24 gap-1.5 rounded-lg border border-gray-300 bg-white px-2.5 py-1 text-xs font-medium text-gray-600 shadow-sm hover:bg-gray-50 hover:text-gray-800 transition-colors" do %>

From 092c18d9282c226ea3270a97bef3f8278d107a0b Mon Sep 17 00:00:00 2001
From: Justin Miller <16829344+jmilljr24@users.noreply.github.com>
Date: Tue, 28 Jul 2026 08:43:48 -0400
Subject: [PATCH 10/22] spec

---
 spec/views/page_bg_class_alignment_spec.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/spec/views/page_bg_class_alignment_spec.rb b/spec/views/page_bg_class_alignment_spec.rb
index 06e77ddf6a..b53047371f 100644
--- a/spec/views/page_bg_class_alignment_spec.rb
+++ b/spec/views/page_bg_class_alignment_spec.rb
@@ -107,7 +107,7 @@
     "app/views/category_types/index.html.erb"          => "admin-only bg-blue-100",
     "app/views/events/dashboard.html.erb"              => "admin-only bg-blue-100",
     "app/views/events/sample_ticket.html.erb"          => "admin-only bg-blue-100",
-    "app/views/events/bulk_payments.html.erb"          => "admin-only bg-blue-100",
+    "app/views/events/bulk_payments/index.html.erb"      => "admin-only bg-blue-100",
     "app/views/events/background.html.erb"             => "admin-only bg-blue-100",
     "app/views/events/edit_staff.html.erb"             => "admin-only bg-white",
     "app/views/events/recipients.html.erb"             => "admin-only bg-white",
@@ -213,9 +213,9 @@
     "app/views/registration_ticket_callouts/show.html.erb" => "public",
 
     # ─── bulk payment views ───
-    "app/views/events/bulk_payments/new.html.erb"        => "public",
-    "app/views/events/bulk_payments/show.html.erb"       => "public",
-    "app/views/events/bulk_payments/ticket.html.erb"     => "public",
+    "app/views/events/bulk_payment_submissions/new.html.erb"  => "public",
+    "app/views/events/bulk_payment_submissions/show.html.erb" => "public",
+    "app/views/events/bulk_payment_submissions/ticket.html.erb" => "public",
 
     # ─── event invoice (slug/submission-reachable; blank template gated in controller) ───
     "app/views/events/invoices/show.html.erb"            => "public",

From 41974fae58951c12b91676a8356426a61396734d Mon Sep 17 00:00:00 2001
From: Justin Miller <16829344+jmilljr24@users.noreply.github.com>
Date: Tue, 28 Jul 2026 09:00:36 -0400
Subject: [PATCH 11/22] spec

---
 spec/models/form_submission_spec.rb        | 12 ++++++------
 spec/requests/events/bulk_payments_spec.rb |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/spec/models/form_submission_spec.rb b/spec/models/form_submission_spec.rb
index 998cd6698c..5bf4101b67 100644
--- a/spec/models/form_submission_spec.rb
+++ b/spec/models/form_submission_spec.rb
@@ -99,7 +99,7 @@
       end
 
       it "returns the stored ids" do
-        submission.update!(metadata: { "linked_registration_ids" => [reg1.id, reg2.id] })
+        submission.update!(metadata: { "linked_registration_ids" => [ reg1.id, reg2.id ] })
         expect(submission.linked_registration_ids).to contain_exactly(reg1.id, reg2.id)
       end
     end
@@ -108,14 +108,14 @@
       it "adds a registration id to metadata" do
         submission.link_registration!(reg1.id)
 
-        expect(submission.reload.linked_registration_ids).to eq([reg1.id])
+        expect(submission.reload.linked_registration_ids).to eq([ reg1.id ])
       end
 
       it "does not duplicate an existing id" do
         submission.link_registration!(reg1.id)
         submission.link_registration!(reg1.id)
 
-        expect(submission.reload.linked_registration_ids).to eq([reg1.id])
+        expect(submission.reload.linked_registration_ids).to eq([ reg1.id ])
       end
 
       it "preserves other metadata" do
@@ -123,7 +123,7 @@
         submission.link_registration!(reg1.id)
 
         expect(submission.reload.metadata["other_key"]).to eq("value")
-        expect(submission.linked_registration_ids).to eq([reg1.id])
+        expect(submission.linked_registration_ids).to eq([ reg1.id ])
       end
     end
 
@@ -133,14 +133,14 @@
         submission.link_registration!(reg2.id)
         submission.unlink_registration!(reg1.id)
 
-        expect(submission.reload.linked_registration_ids).to eq([reg2.id])
+        expect(submission.reload.linked_registration_ids).to eq([ reg2.id ])
       end
 
       it "is a no-op when the id is not linked" do
         submission.link_registration!(reg1.id)
         submission.unlink_registration!(reg2.id)
 
-        expect(submission.reload.linked_registration_ids).to eq([reg1.id])
+        expect(submission.reload.linked_registration_ids).to eq([ reg1.id ])
       end
     end
 
diff --git a/spec/requests/events/bulk_payments_spec.rb b/spec/requests/events/bulk_payments_spec.rb
index bd4cc651cd..0dcd009553 100644
--- a/spec/requests/events/bulk_payments_spec.rb
+++ b/spec/requests/events/bulk_payments_spec.rb
@@ -233,7 +233,7 @@
            params: { submission_id: submission.id, event_registration_id: event_registration.id },
            as: :turbo_stream
 
-      expect(submission.reload.linked_registration_ids).to eq([event_registration.id])
+      expect(submission.reload.linked_registration_ids).to eq([ event_registration.id ])
       expect(response).to have_http_status(:ok)
     end
 

From 75e0cd55118f502c0c81af272dc6b051680a4787 Mon Sep 17 00:00:00 2001
From: Justin Miller <16829344+jmilljr24@users.noreply.github.com>
Date: Tue, 28 Jul 2026 09:03:23 -0400
Subject: [PATCH 12/22] policy

---
 .../events/bulk_payment_submissions_controller.rb         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controllers/events/bulk_payment_submissions_controller.rb b/app/controllers/events/bulk_payment_submissions_controller.rb
index a296917bc3..2fc410ef1a 100644
--- a/app/controllers/events/bulk_payment_submissions_controller.rb
+++ b/app/controllers/events/bulk_payment_submissions_controller.rb
@@ -10,7 +10,7 @@ class BulkPaymentSubmissionsController < ApplicationController
     end
 
     def new
-      authorize! :bulk_payment, to: :new?
+      authorize! :bulk_payment
 
       @form_fields = visible_form_fields
       @event = @event.decorate
@@ -19,7 +19,7 @@ def new
     end
 
     def create
-      authorize! :bulk_payment, to: :create?
+      authorize! :bulk_payment
 
       @form_params = params.dig(:bulk_payment, :form_fields)&.to_unsafe_h || {}
 
@@ -62,7 +62,7 @@ def create
     # with no slug) reach it by id (?submission_id=).
     def show
       if params[:reg].present?
-        authorize! :bulk_payment, to: :show?
+        authorize! :bulk_payment
         # where.not(slug: nil) keeps a blank reg from matching a slugless record.
         @submission = FormSubmission.bulk_payment.where.not(slug: nil)
                                     .find_by!(slug: params[:reg], event_id: @event.id)
@@ -78,7 +78,7 @@ def show
     # registrants they paid for, and the submitted form — but none of the
     # per-person admin actions found on the bulk payments dashboard.
     def ticket
-      authorize! :bulk_payment, to: :ticket?
+      authorize! :bulk_payment
 
       @submission = FormSubmission.bulk_payment.find_by!(slug: params[:slug])
       @payment = @submission.payment

From 884519c53efcbfcd5549ea86d120a95a6a713208 Mon Sep 17 00:00:00 2001
From: Justin Miller <16829344+jmilljr24@users.noreply.github.com>
Date: Tue, 28 Jul 2026 09:07:34 -0400
Subject: [PATCH 13/22] clean up

---
 app/controllers/events/bulk_payment_submissions_controller.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/controllers/events/bulk_payment_submissions_controller.rb b/app/controllers/events/bulk_payment_submissions_controller.rb
index 2fc410ef1a..1c73d93ca7 100644
--- a/app/controllers/events/bulk_payment_submissions_controller.rb
+++ b/app/controllers/events/bulk_payment_submissions_controller.rb
@@ -63,8 +63,7 @@ def create
     def show
       if params[:reg].present?
         authorize! :bulk_payment
-        # where.not(slug: nil) keeps a blank reg from matching a slugless record.
-        @submission = FormSubmission.bulk_payment.where.not(slug: nil)
+        @submission = FormSubmission.bulk_payment
                                     .find_by!(slug: params[:reg], event_id: @event.id)
       else
         @submission = FormSubmission.bulk_payment.find_by!(id: params[:submission_id], event_id: @event.id)

From 709f664e1c1279394cb92bf130787cdf60fd1830 Mon Sep 17 00:00:00 2001
From: Justin Miller <16829344+jmilljr24@users.noreply.github.com>
Date: Tue, 28 Jul 2026 09:58:34 -0400
Subject: [PATCH 14/22] use policy based on model

---
 .../bulk_payment_submissions_controller.rb    | 29 +++++++------------
 .../events/bulk_payments_controller.rb        | 13 ++-------
 app/policies/events/bulk_payment_policy.rb    | 17 -----------
 app/policies/form_submission_policy.rb        | 16 +++++++++-
 4 files changed, 28 insertions(+), 47 deletions(-)
 delete mode 100644 app/policies/events/bulk_payment_policy.rb

diff --git a/app/controllers/events/bulk_payment_submissions_controller.rb b/app/controllers/events/bulk_payment_submissions_controller.rb
index 1c73d93ca7..aaf220edf3 100644
--- a/app/controllers/events/bulk_payment_submissions_controller.rb
+++ b/app/controllers/events/bulk_payment_submissions_controller.rb
@@ -10,7 +10,7 @@ class BulkPaymentSubmissionsController < ApplicationController
     end
 
     def new
-      authorize! :bulk_payment
+      authorize! :form_submission
 
       @form_fields = visible_form_fields
       @event = @event.decorate
@@ -19,7 +19,7 @@ def new
     end
 
     def create
-      authorize! :bulk_payment
+      authorize! :form_submission
 
       @form_params = params.dig(:bulk_payment, :form_fields)&.to_unsafe_h || {}
 
@@ -56,40 +56,31 @@ def create
       end
     end
 
-    # View of the submitted bulk payment form, rendering the same partial either
-    # way. Mirrors PublicRegistrations#show: the payer reaches it publicly by slug
-    # (?reg=), while admins (e.g. from the dashboard, including legacy submissions
-    # with no slug) reach it by id (?submission_id=).
     def show
-      if params[:reg].present?
-        authorize! :bulk_payment
+      slug = params[:reg]
+      if slug.present?
         @submission = FormSubmission.bulk_payment
-                                    .find_by!(slug: params[:reg], event_id: @event.id)
+                                    .find_by!(slug: slug, event_id: @event.id)
       else
         @submission = FormSubmission.bulk_payment.find_by!(id: params[:submission_id], event_id: @event.id)
-        authorize! @submission, to: :show?
       end
+      authorize! @submission, context: { slug: slug }
 
       @event = @event.decorate
     end
 
-    # Public, slug-based ticket for the payer. Shows the event details, the
-    # registrants they paid for, and the submitted form — but none of the
-    # per-person admin actions found on the bulk payments dashboard.
     def ticket
-      authorize! :bulk_payment
-
       @submission = FormSubmission.bulk_payment.find_by!(slug: params[:slug])
+      authorize! @submission, context: { slug: params[:slug] }
+
       @payment = @submission.payment
       @event = @submission.event.decorate
     end
 
-    # Re-sends the payer their bulk payment confirmation email (the one carrying
-    # the ticket link). Reachable by the payer from the ticket.
     def resend_confirmation
-      authorize! :bulk_payment, to: :show?
-
       @submission = FormSubmission.bulk_payment.find_by!(slug: params[:slug])
+      authorize! @submission, to: :show?, context: { slug: params[:slug] }
+
       payer_email = @submission.person.preferred_email.presence ||
                     @submission.answers_by_identifier["payer_email"]&.strip
 
diff --git a/app/controllers/events/bulk_payments_controller.rb b/app/controllers/events/bulk_payments_controller.rb
index c2bcb6ab1b..0e44535457 100644
--- a/app/controllers/events/bulk_payments_controller.rb
+++ b/app/controllers/events/bulk_payments_controller.rb
@@ -5,24 +5,25 @@ class BulkPaymentsController < ApplicationController
     def index
       authorize! @event
 
-      @event = @event.decorate
       @event_registrations = @event.event_registrations.active.includes(:registrant)
       @submissions = @event.form_submissions
                            .where(role: "bulk_payment")
                            .includes(:person, form_answers: :form_field, payment: :allocations)
                            .order(created_at: :desc)
       @allocated_by_registration = allocated_cents_by_registration(@event_registrations)
+      @event = @event.decorate
     end
 
     def create
       authorize! @event
-      @event = @event.decorate
       @event_registrations = @event.event_registrations.active.includes(:registrant)
       @allocated_by_registration = allocated_cents_by_registration(@event_registrations)
 
       submission = @event.form_submissions.find(params[:submission_id])
       payment_type = params[:payment_type]
 
+      @event = @event.decorate
+
       unless %w[CashPayment CheckPayment].include?(payment_type)
         flash.now[:alert] = "Invalid payment type"
         respond_to do |format|
@@ -143,9 +144,6 @@ def set_event
       @event = Event.find(params[:id])
     end
 
-    # Reloads the payment and the data its bulk payment card needs, so the
-    # allocate turbo stream can re-render the whole card with fresh due/allocated
-    # totals and re-evaluate whether each registration is now paid in full.
     def assign_allocation_card_data(payment)
       @payment = payment.reload
       @submission = @payment.form_submission
@@ -153,17 +151,12 @@ def assign_allocation_card_data(payment)
       @allocated_by_registration = allocated_cents_by_registration(@event_registrations)
     end
 
-    # Reloads the submission and the data its bulk payment card needs, so the
-    # link/unlink turbo stream can re-render the whole card with fresh linked
-    # registration data.
     def assign_bulk_payment_card_data(submission)
       @submission = submission.reload.decorate
       @event_registrations = @event.event_registrations.active.includes(:registrant)
       @allocated_by_registration = allocated_cents_by_registration(@event_registrations)
     end
 
-    # Allocated cents per registration id, fetched in one grouped query so the
-    # bulk payment cards read totals from a hash instead of querying per row.
     def allocated_cents_by_registration(registrations)
       Allocation
         .where(allocatable_type: "EventRegistration", allocatable_id: registrations.ids)
diff --git a/app/policies/events/bulk_payment_policy.rb b/app/policies/events/bulk_payment_policy.rb
deleted file mode 100644
index af94e1d6aa..0000000000
--- a/app/policies/events/bulk_payment_policy.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-class Events::BulkPaymentPolicy < ApplicationPolicy
-  def new?
-    true
-  end
-
-  def create?
-    true
-  end
-
-  def show?
-    true
-  end
-
-  def ticket?
-    true
-  end
-end
diff --git a/app/policies/form_submission_policy.rb b/app/policies/form_submission_policy.rb
index 7dccbbcba0..a60bf7ca65 100644
--- a/app/policies/form_submission_policy.rb
+++ b/app/policies/form_submission_policy.rb
@@ -1,11 +1,25 @@
 class FormSubmissionPolicy < ApplicationPolicy
   # See https://actionpolicy.evilmartians.io/#/writing_policies
+  authorize :slug, optional: true, allow_nil: true
+
   def index?
     admin?
   end
 
   def show?
-    admin?
+    admin? || record.slug == slug
+  end
+
+  def ticket?
+    admin? || record.slug == slug
+  end
+
+  def new?
+    true
+  end
+
+  def create?
+    true
   end
 
   # Bulk-payment payers have no account but are emailed a link to their public

From dc53fda33960851a42e4db89977359f0cf115c62 Mon Sep 17 00:00:00 2001
From: Justin Miller <16829344+jmilljr24@users.noreply.github.com>
Date: Tue, 28 Jul 2026 10:41:40 -0400
Subject: [PATCH 15/22] use consistent param name for slug

---
 .../events/bulk_payment_submissions_controller.rb    |  2 +-
 app/views/events/_bulk_payment_card.html.erb         |  2 +-
 .../events/bulk_payment_submissions/ticket.html.erb  |  2 +-
 .../bulk_payment_confirmation_fyi.html.erb           |  2 +-
 .../bulk_payment_confirmation_fyi.text.erb           |  2 +-
 .../requests/events/bulk_payment_submissions_spec.rb | 12 ++++++------
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/controllers/events/bulk_payment_submissions_controller.rb b/app/controllers/events/bulk_payment_submissions_controller.rb
index aaf220edf3..3105c1fd08 100644
--- a/app/controllers/events/bulk_payment_submissions_controller.rb
+++ b/app/controllers/events/bulk_payment_submissions_controller.rb
@@ -57,7 +57,7 @@ def create
     end
 
     def show
-      slug = params[:reg]
+      slug = params[:slug]
       if slug.present?
         @submission = FormSubmission.bulk_payment
                                     .find_by!(slug: slug, event_id: @event.id)
diff --git a/app/views/events/_bulk_payment_card.html.erb b/app/views/events/_bulk_payment_card.html.erb
index 1f11e7b0f9..314cf9c948 100644
--- a/app/views/events/_bulk_payment_card.html.erb
+++ b/app/views/events/_bulk_payment_card.html.erb
@@ -37,7 +37,7 @@
         Payer slug when present; otherwise the admin-only id fallback so legacy
         slugless submissions are still viewable from the dashboard.
       %>
-      <% submission_show_params = submission.slug.present? ? { reg: submission.slug } : { submission_id: submission.id } %>
+      <% submission_show_params = submission.slug.present? ? { slug: submission.slug } : { submission_id: submission.id } %>
 
       <%= link_to event_bulk_payment_path(@event, **submission_show_params, return_to: "bulk_payments", expand: submission.id),
                   title: "View form submission",
diff --git a/app/views/events/bulk_payment_submissions/ticket.html.erb b/app/views/events/bulk_payment_submissions/ticket.html.erb
index d3df32527f..1baa9e1e50 100644
--- a/app/views/events/bulk_payment_submissions/ticket.html.erb
+++ b/app/views/events/bulk_payment_submissions/ticket.html.erb
@@ -168,7 +168,7 @@
       <!-- Secondary text actions: form responses + resend confirmation -->
       <div class="flex flex-col items-center gap-1.5">
         <%= link_to "View your form responses",
-                      event_bulk_payment_path(@event, reg: @submission.slug),
+                      event_bulk_payment_path(@event, slug: @submission.slug),
                       class: "text-sm text-gray-500 hover:text-blue-600 underline" %>
         <%= button_to "Resend confirmation email",
                       bulk_payment_resend_confirmation_path(@submission.slug),
diff --git a/app/views/notification_mailer/bulk_payment_confirmation_fyi.html.erb b/app/views/notification_mailer/bulk_payment_confirmation_fyi.html.erb
index d4efa9b825..b2cc058cc4 100644
--- a/app/views/notification_mailer/bulk_payment_confirmation_fyi.html.erb
+++ b/app/views/notification_mailer/bulk_payment_confirmation_fyi.html.erb
@@ -89,7 +89,7 @@
 
 <p>
   <% if @event %>
-    <a href="<%= event_bulk_payment_url(@event, reg: @submission.slug) %>"
+    <a href="<%= event_bulk_payment_url(@event, slug: @submission.slug) %>"
        style="display:inline-block;padding:10px 16px;background:#2563eb;color:#ffffff;text-decoration:none;border-radius:6px;font-weight:bold;">
       View submission
     </a>
diff --git a/app/views/notification_mailer/bulk_payment_confirmation_fyi.text.erb b/app/views/notification_mailer/bulk_payment_confirmation_fyi.text.erb
index ab802f28f1..0932be7327 100644
--- a/app/views/notification_mailer/bulk_payment_confirmation_fyi.text.erb
+++ b/app/views/notification_mailer/bulk_payment_confirmation_fyi.text.erb
@@ -32,7 +32,7 @@ Cost
 ------------------------------------------------------------
 <% if @event %>
 View submission:
-<%= event_bulk_payment_url(@event, reg: @submission.slug) %>
+<%= event_bulk_payment_url(@event, slug: @submission.slug) %>
 <% end %>
 View profile:
 <%= profile_url %>
diff --git a/spec/requests/events/bulk_payment_submissions_spec.rb b/spec/requests/events/bulk_payment_submissions_spec.rb
index 1b3a645604..ef948fb666 100644
--- a/spec/requests/events/bulk_payment_submissions_spec.rb
+++ b/spec/requests/events/bulk_payment_submissions_spec.rb
@@ -158,7 +158,7 @@ def payer_params
   end
 
   describe "GET show" do
-    # Public submitted-form view, reached by slug via ?reg= (mirrors public
+    # Public submitted-form view, reached by slug via ?slug= (mirrors public
     # registration). Backs to the ticket by default.
     let(:event) { create(:event, :publicly_visible, cost_cents: 1000) }
     let(:payer) { create(:person) }
@@ -169,7 +169,7 @@ def payer_params
     end
 
     def get_show
-      get event_bulk_payment_path(event, reg: submission.slug)
+      get event_bulk_payment_path(event, slug: submission.slug)
     end
 
     context "as a signed-out viewer" do
@@ -191,12 +191,12 @@ def get_show
       end
 
       it "404s for an unknown slug" do
-        get event_bulk_payment_path(event, reg: "nope")
+        get event_bulk_payment_path(event, slug: "nope")
 
         expect(response).to have_http_status(:not_found)
       end
 
-      it "404s for a blank reg, even when a slugless bulk payment exists" do
+      it "404s for a blank slug, even when a slugless bulk payment exists" do
         submission.update_columns(slug: nil)
 
         get event_bulk_payment_path(event)
@@ -227,7 +227,7 @@ def get_show
 
     context "as an admin arriving from the dashboard" do
       it "shows a Back to ticket link plus a second Back to bulk payments link" do
-        get event_bulk_payment_path(event, reg: submission.slug, return_to: "bulk_payments")
+        get event_bulk_payment_path(event, slug: submission.slug, return_to: "bulk_payments")
 
         expect(response.body).to include("Back to ticket")
         expect(response.body).to include("Back to bulk payments")
@@ -305,7 +305,7 @@ def get_ticket
       get_ticket
 
       expect(response.body).to include("View your form responses")
-      expect(response.body).to include(event_bulk_payment_path(event, reg: submission.slug))
+      expect(response.body).to include(event_bulk_payment_path(event, slug: submission.slug))
     end
 
     it "returns 404 for an unknown slug" do

From dc73e04bf37b482cc26397baad2f8625131da152 Mon Sep 17 00:00:00 2001
From: Justin Miller <16829344+jmilljr24@users.noreply.github.com>
Date: Tue, 28 Jul 2026 11:02:41 -0400
Subject: [PATCH 16/22] guard nil slug

---
 app/policies/form_submission_policy.rb       |  4 +-
 spec/policies/form_submission_policy_spec.rb | 68 ++++++++++++++++++++
 2 files changed, 70 insertions(+), 2 deletions(-)

diff --git a/app/policies/form_submission_policy.rb b/app/policies/form_submission_policy.rb
index a60bf7ca65..c0b3c0ec72 100644
--- a/app/policies/form_submission_policy.rb
+++ b/app/policies/form_submission_policy.rb
@@ -7,11 +7,11 @@ def index?
   end
 
   def show?
-    admin? || record.slug == slug
+    admin? || (slug.present? && record.slug == slug)
   end
 
   def ticket?
-    admin? || record.slug == slug
+    admin? || (slug.present? && record.slug == slug)
   end
 
   def new?
diff --git a/spec/policies/form_submission_policy_spec.rb b/spec/policies/form_submission_policy_spec.rb
index 4b1edb9bb3..161b02f7f8 100644
--- a/spec/policies/form_submission_policy_spec.rb
+++ b/spec/policies/form_submission_policy_spec.rb
@@ -22,10 +22,78 @@ def policy_for(user:, record: submission)
       it { is_expected.not_to be_allowed_to(:show?) }
     end
 
+    context "with regular user and matching slug" do
+      let(:submission) { build_stubbed(:form_submission).tap { |s| s.slug = "abc123" } }
+      subject { described_class.new(submission, user: regular_user, slug: "abc123") }
+
+      it { is_expected.to be_allowed_to(:show?) }
+    end
+
+    context "with regular user and non-matching slug" do
+      let(:submission) { build_stubbed(:form_submission).tap { |s| s.slug = "abc123" } }
+      subject { described_class.new(submission, user: regular_user, slug: "wrong") }
+
+      it { is_expected.not_to be_allowed_to(:show?) }
+    end
+
+    context "with regular user and no slug context" do
+      subject { policy_for(user: regular_user) }
+
+      it { is_expected.not_to be_allowed_to(:show?) }
+    end
+
+    context "with no user and matching slug" do
+      let(:submission) { build_stubbed(:form_submission).tap { |s| s.slug = "abc123" } }
+      subject { described_class.new(submission, user: nil, slug: "abc123") }
+
+      it { is_expected.to be_allowed_to(:show?) }
+    end
+
     context "with no user" do
       subject { policy_for(user: nil) }
 
       it { is_expected.not_to be_allowed_to(:show?) }
     end
   end
+
+  describe "#ticket?" do
+    context "with admin user" do
+      subject { policy_for(user: admin_user) }
+
+      it { is_expected.to be_allowed_to(:ticket?) }
+    end
+
+    context "with regular user and matching slug" do
+      let(:submission) { build_stubbed(:form_submission).tap { |s| s.slug = "abc123" } }
+      subject { described_class.new(submission, user: regular_user, slug: "abc123") }
+
+      it { is_expected.to be_allowed_to(:ticket?) }
+    end
+
+    context "with regular user and non-matching slug" do
+      let(:submission) { build_stubbed(:form_submission).tap { |s| s.slug = "abc123" } }
+      subject { described_class.new(submission, user: regular_user, slug: "wrong") }
+
+      it { is_expected.not_to be_allowed_to(:ticket?) }
+    end
+
+    context "with regular user and no slug context" do
+      subject { policy_for(user: regular_user) }
+
+      it { is_expected.not_to be_allowed_to(:ticket?) }
+    end
+
+    context "with no user and matching slug" do
+      let(:submission) { build_stubbed(:form_submission).tap { |s| s.slug = "abc123" } }
+      subject { described_class.new(submission, user: nil, slug: "abc123") }
+
+      it { is_expected.to be_allowed_to(:ticket?) }
+    end
+
+    context "with no user" do
+      subject { policy_for(user: nil) }
+
+      it { is_expected.not_to be_allowed_to(:ticket?) }
+    end
+  end
 end

From 43ae403dbf7209a383966adf7bb8fb31cfc214f9 Mon Sep 17 00:00:00 2001
From: Justin Miller <16829344+jmilljr24@users.noreply.github.com>
Date: Tue, 28 Jul 2026 13:27:07 -0400
Subject: [PATCH 17/22] clean up

---
 app/decorators/form_submission_decorator.rb  | 28 --------------------
 app/views/events/_bulk_payment_card.html.erb | 15 +++++------
 2 files changed, 7 insertions(+), 36 deletions(-)

diff --git a/app/decorators/form_submission_decorator.rb b/app/decorators/form_submission_decorator.rb
index 01e50f40aa..9528e6bcda 100644
--- a/app/decorators/form_submission_decorator.rb
+++ b/app/decorators/form_submission_decorator.rb
@@ -1,34 +1,6 @@
 class FormSubmissionDecorator < ApplicationDecorator
   delegate_all
 
-  def matched_attendees(event_registrations)
-    object.bulk_payment_attendees.map do |attendee|
-      first = attendee["first_name"]&.strip
-      last = attendee["last_name"]&.strip
-      email = attendee["email"]&.strip
-
-      first_variants = first.present? ? NicknameMap.variants_for(first).to_set : Set.new
-      normalized_last = last.present? ? NicknameMap.normalize(last) : nil
-
-      matches = event_registrations.select do |reg|
-        person = reg.registrant
-        next false unless person
-
-        first_matches = first_variants.include?(NicknameMap.normalize(person.first_name))
-        last_matches = normalized_last.present? &&
-                       NicknameMap.normalize(person.last_name) == normalized_last
-        email_matches = email.present? && (
-          person.email&.downcase == email.downcase ||
-          person.email_2&.downcase == email.downcase
-        )
-
-        (first_matches && last_matches) || email_matches
-      end
-
-      { first_name: first, last_name: last, email: email, matches: matches }
-    end
-  end
-
   # Single best match for one attendee. Prefers first+last name match,
   # falls back to email match. Returns nil when no match is found.
   def best_match_for(attendee, event_registrations)
diff --git a/app/views/events/_bulk_payment_card.html.erb b/app/views/events/_bulk_payment_card.html.erb
index 314cf9c948..2a11e91483 100644
--- a/app/views/events/_bulk_payment_card.html.erb
+++ b/app/views/events/_bulk_payment_card.html.erb
@@ -14,7 +14,6 @@
   event_registrations ||= @event_registrations || @event.event_registrations.active.includes(:registrant)
   allocated_by_registration ||= {}
   event_cost_cents = @event.cost_cents.to_i
-  attendee_matches = submission.matched_attendees(event_registrations)
   linked_ids = submission.linked_registration_ids.to_set
   linked_regs = event_registrations.select { |r| linked_ids.include?(r.id) } %>
 
@@ -61,7 +60,7 @@
         data-dropdown-target="expand"
       <% end %>
       data-dropdown-payload-param='[{"<%= content_id %>":"hidden"}, {"<%= arrow_id %>":"rotate-180"}]'
-      class="text-gray-400 hover:text-gray-600 p-1 justify-self-end"
+      class="cursor-pointer text-gray-400 hover:text-gray-600 p-1 justify-self-end"
       title="More info"
     >
       <i id="<%= arrow_id %>" class="fa-solid fa-chevron-down transition-transform duration-200"></i>
@@ -128,15 +127,15 @@
     <div class="bg-gray-100 rounded-lg p-3 space-y-1.5">
       <div class="grid grid-cols-7 gap-x-4 text-xs font-medium text-gray-400 uppercase tracking-wide"><span class="col-span-3">Submitted names</span><span class="col-span-3">Potential match</span><span></span></div>
 
-      <% if attendee_matches.present? %>
+      <% if submission.bulk_payment_attendees.present? %>
         <div class="divide-y divide-gray-100">
           <div class="grid grid-cols-7 gap-4 items-center py-2">
-            <% attendee_matches.each do |am| %>
-              <div class="col-span-3 text-sm"><span class="text-gray-900 font-medium"><%= am[:first_name] %> <%= am[:last_name] %></span> <span class="text-gray-500 break-all"><%= am[:email] %></span></div>
+            <% submission.bulk_payment_attendees.each do |attendee| %>
+              <% best = submission.best_match_for(attendee, event_registrations) %>
 
-              <div class="col-span-3">
-                <% best = am[:matches].first %>
+              <div class="col-span-3 text-sm"><span class="text-gray-900 font-medium"><%= attendee["first_name"] %> <%= attendee["last_name"] %></span> <span class="text-gray-500 break-all"><%= attendee["email"] %></span></div>
 
+              <div class="col-span-3">
                 <% if best %>
                   <%= person_profile_button(best.registrant, compact: true, width_class: "w-auto") %>
                 <% else %>
@@ -149,7 +148,7 @@
                   <%= form_tag link_bulk_payment_event_path(@event), class: "inline" do %>
                     <%= hidden_field_tag :submission_id, submission.id %>
                     <%= hidden_field_tag :event_registration_id, best.id %>
-                    <%= button_tag "Link", class: "text-xs text-blue-600 hover:text-blue-800 font-medium" %>
+                    <%= button_tag "Link", class: "cursor-pointer text-xs text-blue-600 hover:text-blue-800 font-medium" %>
                   <% end %>
                 <% end %>
               </div>

From 4707274707009c9bf13c2a6445fe86b3db5ee611 Mon Sep 17 00:00:00 2001
From: Justin Miller <16829344+jmilljr24@users.noreply.github.com>
Date: Tue, 28 Jul 2026 13:34:41 -0400
Subject: [PATCH 18/22] styling

---
 app/views/events/_bulk_payment_card.html.erb | 32 +++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/app/views/events/_bulk_payment_card.html.erb b/app/views/events/_bulk_payment_card.html.erb
index 2a11e91483..74715e1c21 100644
--- a/app/views/events/_bulk_payment_card.html.erb
+++ b/app/views/events/_bulk_payment_card.html.erb
@@ -124,28 +124,30 @@
       </div>
     <% end %>
 
-    <div class="bg-gray-100 rounded-lg p-3 space-y-1.5">
-      <div class="grid grid-cols-7 gap-x-4 text-xs font-medium text-gray-400 uppercase tracking-wide"><span class="col-span-3">Submitted names</span><span class="col-span-3">Potential match</span><span></span></div>
+    <h4 class="text-xs font-medium text-gray-400 uppercase tracking-wide">Submitted names</h4>
+
+    <div class="border border-gray-200 rounded-lg overflow-hidden">
+      <div class="grid grid-cols-2 gap-x-4 text-xs font-medium text-gray-400 uppercase tracking-wide bg-gray-100 px-3 py-2"><span>First Last Email</span><span>Potential match</span></div>
 
       <% if submission.bulk_payment_attendees.present? %>
-        <div class="divide-y divide-gray-100">
-          <div class="grid grid-cols-7 gap-4 items-center py-2">
+        <div class="px-3">
+          <div class="grid grid-cols-2 items-center py-2">
             <% submission.bulk_payment_attendees.each do |attendee| %>
               <% best = submission.best_match_for(attendee, event_registrations) %>
 
-              <div class="col-span-3 text-sm"><span class="text-gray-900 font-medium"><%= attendee["first_name"] %> <%= attendee["last_name"] %></span> <span class="text-gray-500 break-all"><%= attendee["email"] %></span></div>
+              <div class="text-sm"><span class="text-gray-900 font-medium"><%= attendee["first_name"] %> <%= attendee["last_name"] %></span> <span class="text-gray-500 break-all"><%= attendee["email"] %></span></div>
 
-              <div class="col-span-3">
-                <% if best %>
-                  <%= person_profile_button(best.registrant, compact: true, width_class: "w-auto") %>
-                <% else %>
-                  <span class="text-gray-400 text-xs">No match</span>
-                <% end %>
-              </div>
+              <div class="flex flex-wrap gap-2 items-center">
+                <div class="grow">
+                  <% if best %>
+                    <%= person_profile_button(best.registrant, compact: true, width_class: "w-auto") %>
+                  <% else %>
+                    <span class="text-gray-400 text-xs">No match</span>
+                  <% end %>
+                </div>
 
-              <div>
                 <% if best && !linked_ids.include?(best.id) %>
-                  <%= form_tag link_bulk_payment_event_path(@event), class: "inline" do %>
+                  <%= form_tag link_bulk_payment_event_path(@event), class: "p-4" do %>
                     <%= hidden_field_tag :submission_id, submission.id %>
                     <%= hidden_field_tag :event_registration_id, best.id %>
                     <%= button_tag "Link", class: "cursor-pointer text-xs text-blue-600 hover:text-blue-800 font-medium" %>
@@ -157,7 +159,7 @@
         </div>
       <% end %>
 
-      <div class="pt-2">
+      <div class="px-3 py-2">
         <h5 class="text-xs font-medium text-gray-400 uppercase tracking-wide mb-2">Manually link a registration</h5>
 
         <%= form_tag link_bulk_payment_event_path(@event), class: "flex flex-wrap items-center gap-2" do %>

From 37784723eff4b0ad46db386bfbccf1bbf20627c9 Mon Sep 17 00:00:00 2001
From: Justin Miller <16829344+jmilljr24@users.noreply.github.com>
Date: Tue, 28 Jul 2026 13:53:01 -0400
Subject: [PATCH 19/22] gap

---
 app/views/events/_bulk_payment_card.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/events/_bulk_payment_card.html.erb b/app/views/events/_bulk_payment_card.html.erb
index 74715e1c21..64820cacaa 100644
--- a/app/views/events/_bulk_payment_card.html.erb
+++ b/app/views/events/_bulk_payment_card.html.erb
@@ -131,7 +131,7 @@
 
       <% if submission.bulk_payment_attendees.present? %>
         <div class="px-3">
-          <div class="grid grid-cols-2 items-center py-2">
+          <div class="grid grid-cols-2 items-center py-2 gap-2">
             <% submission.bulk_payment_attendees.each do |attendee| %>
               <% best = submission.best_match_for(attendee, event_registrations) %>
 

From 3199da0e94a16a042bf3d066451be6a016d7e4c2 Mon Sep 17 00:00:00 2001
From: Justin Miller <16829344+jmilljr24@users.noreply.github.com>
Date: Tue, 28 Jul 2026 14:13:55 -0400
Subject: [PATCH 20/22] revert matching logic

---
 app/decorators/form_submission_decorator.rb  | 40 ++++++++++----------
 app/views/events/_bulk_payment_card.html.erb | 11 +++---
 2 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/app/decorators/form_submission_decorator.rb b/app/decorators/form_submission_decorator.rb
index 9528e6bcda..487ca067fb 100644
--- a/app/decorators/form_submission_decorator.rb
+++ b/app/decorators/form_submission_decorator.rb
@@ -1,29 +1,31 @@
 class FormSubmissionDecorator < ApplicationDecorator
   delegate_all
 
-  # Single best match for one attendee. Prefers first+last name match,
-  # falls back to email match. Returns nil when no match is found.
-  def best_match_for(attendee, event_registrations)
-    first = attendee["first_name"]&.strip
-    last = attendee["last_name"]&.strip
-    email = attendee["email"]&.strip
+  def matched_attendees(event_registrations)
+    object.bulk_payment_attendees.map do |attendee|
+      first = attendee["first_name"]&.strip
+      last = attendee["last_name"]&.strip
+      email = attendee["email"]&.strip
 
-    first_variants = first.present? ? NicknameMap.variants_for(first).to_set : Set.new
-    normalized_last = last.present? ? NicknameMap.normalize(last) : nil
+      first_variants = first.present? ? NicknameMap.variants_for(first).to_set : Set.new
+      normalized_last = last.present? ? NicknameMap.normalize(last) : nil
 
-    event_registrations.find do |reg|
-      person = reg.registrant
-      next false unless person
+      matches = event_registrations.select do |reg|
+        person = reg.registrant
+        next false unless person
 
-      first_matches = first_variants.include?(NicknameMap.normalize(person.first_name))
-      last_matches = normalized_last.present? &&
-                     NicknameMap.normalize(person.last_name) == normalized_last
-      email_matches = email.present? && (
-        person.email&.downcase == email.downcase ||
-        person.email_2&.downcase == email.downcase
-      )
+        first_matches = first_variants.include?(NicknameMap.normalize(person.first_name))
+        last_matches = normalized_last.present? &&
+                       NicknameMap.normalize(person.last_name) == normalized_last
+        email_matches = email.present? && (
+          person.email&.downcase == email.downcase ||
+          person.email_2&.downcase == email.downcase
+        )
 
-      (first_matches && last_matches) || email_matches
+        (first_matches && last_matches) || email_matches
+      end
+
+      { first_name: first, last_name: last, email: email, matches: matches }
     end
   end
 end
diff --git a/app/views/events/_bulk_payment_card.html.erb b/app/views/events/_bulk_payment_card.html.erb
index 64820cacaa..b6e46745fd 100644
--- a/app/views/events/_bulk_payment_card.html.erb
+++ b/app/views/events/_bulk_payment_card.html.erb
@@ -15,7 +15,8 @@
   allocated_by_registration ||= {}
   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) } %>
+  linked_regs = event_registrations.select { |r| linked_ids.include?(r.id) }
+  attendee_matches = submission.matched_attendees(event_registrations) %>
 
 <div id="payment-card-<%= submission.id %>" data-controller="dropdown" class="bg-white border border-gray-200 rounded-xl shadow-sm px-4 py-3 hover:shadow-md transition-shadow scroll-mt-4">
   <%#
@@ -129,13 +130,13 @@
     <div class="border border-gray-200 rounded-lg overflow-hidden">
       <div class="grid grid-cols-2 gap-x-4 text-xs font-medium text-gray-400 uppercase tracking-wide bg-gray-100 px-3 py-2"><span>First Last Email</span><span>Potential match</span></div>
 
-      <% if submission.bulk_payment_attendees.present? %>
+      <% if attendee_matches.present? %>
         <div class="px-3">
           <div class="grid grid-cols-2 items-center py-2 gap-2">
-            <% submission.bulk_payment_attendees.each do |attendee| %>
-              <% best = submission.best_match_for(attendee, event_registrations) %>
+            <% attendee_matches.each do |entry| %>
+              <% best = entry[:matches].first %>
 
-              <div class="text-sm"><span class="text-gray-900 font-medium"><%= attendee["first_name"] %> <%= attendee["last_name"] %></span> <span class="text-gray-500 break-all"><%= attendee["email"] %></span></div>
+              <div class="text-sm"><span class="text-gray-900 font-medium"><%= entry[:first_name] %> <%= entry[:last_name] %></span> <span class="text-gray-500 break-all"><%= entry[:email] %></span></div>
 
               <div class="flex flex-wrap gap-2 items-center">
                 <div class="grow">

From 6460356035d0eb970a521c6365dfd7e85087ff04 Mon Sep 17 00:00:00 2001
From: Justin Miller <16829344+jmilljr24@users.noreply.github.com>
Date: Wed, 29 Jul 2026 08:54:40 -0400
Subject: [PATCH 21/22] rename to BulkPaymentFormSubmissions

---
 ...oller.rb => bulk_payment_form_submissions_controller.rb} | 2 +-
 .../new.html.erb                                            | 0
 .../show.html.erb                                           | 0
 .../ticket.html.erb                                         | 0
 config/routes.rb                                            | 6 +++---
 ...ssions_spec.rb => bulk_payment_form_submissions_spec.rb} | 2 +-
 spec/views/page_bg_class_alignment_spec.rb                  | 6 +++---
 7 files changed, 8 insertions(+), 8 deletions(-)
 rename app/controllers/events/{bulk_payment_submissions_controller.rb => bulk_payment_form_submissions_controller.rb} (98%)
 rename app/views/events/{bulk_payment_submissions => bulk_payment_form_submissions}/new.html.erb (100%)
 rename app/views/events/{bulk_payment_submissions => bulk_payment_form_submissions}/show.html.erb (100%)
 rename app/views/events/{bulk_payment_submissions => bulk_payment_form_submissions}/ticket.html.erb (100%)
 rename spec/requests/events/{bulk_payment_submissions_spec.rb => bulk_payment_form_submissions_spec.rb} (99%)

diff --git a/app/controllers/events/bulk_payment_submissions_controller.rb b/app/controllers/events/bulk_payment_form_submissions_controller.rb
similarity index 98%
rename from app/controllers/events/bulk_payment_submissions_controller.rb
rename to app/controllers/events/bulk_payment_form_submissions_controller.rb
index 3105c1fd08..b92927099b 100644
--- a/app/controllers/events/bulk_payment_submissions_controller.rb
+++ b/app/controllers/events/bulk_payment_form_submissions_controller.rb
@@ -1,5 +1,5 @@
 module Events
-  class BulkPaymentSubmissionsController < ApplicationController
+  class BulkPaymentFormSubmissionsController < ApplicationController
     skip_before_action :authenticate_user!, only: [ :new, :create, :show, :ticket, :resend_confirmation ]
     before_action :set_event, only: [ :new, :create, :show ]
     before_action :set_form, only: [ :new, :create ]
diff --git a/app/views/events/bulk_payment_submissions/new.html.erb b/app/views/events/bulk_payment_form_submissions/new.html.erb
similarity index 100%
rename from app/views/events/bulk_payment_submissions/new.html.erb
rename to app/views/events/bulk_payment_form_submissions/new.html.erb
diff --git a/app/views/events/bulk_payment_submissions/show.html.erb b/app/views/events/bulk_payment_form_submissions/show.html.erb
similarity index 100%
rename from app/views/events/bulk_payment_submissions/show.html.erb
rename to app/views/events/bulk_payment_form_submissions/show.html.erb
diff --git a/app/views/events/bulk_payment_submissions/ticket.html.erb b/app/views/events/bulk_payment_form_submissions/ticket.html.erb
similarity index 100%
rename from app/views/events/bulk_payment_submissions/ticket.html.erb
rename to app/views/events/bulk_payment_form_submissions/ticket.html.erb
diff --git a/config/routes.rb b/config/routes.rb
index 58984049b4..189c537e1f 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -73,8 +73,8 @@
     end
   end
   resources :community_news
-  get "bulk_payment/:slug", to: "events/bulk_payment_submissions#ticket", as: :bulk_payment_ticket
-  post "bulk_payment/:slug/resend_confirmation", to: "events/bulk_payment_submissions#resend_confirmation", as: :bulk_payment_resend_confirmation
+  get "bulk_payment/:slug", to: "events/bulk_payment_form_submissions#ticket", as: :bulk_payment_ticket
+  post "bulk_payment/:slug/resend_confirmation", to: "events/bulk_payment_form_submissions#resend_confirmation", as: :bulk_payment_resend_confirmation
   get "registration/:slug", to: "events/registrations#show", as: :registration_ticket
   get "registration/:slug/invoice", to: "events/registrations#invoice", as: :registration_invoice
   get "registration/:slug/receipt", to: "events/registrations#receipt", as: :registration_receipt
@@ -163,7 +163,7 @@
     resources :registration_ticket_callouts, only: [ :show, :update ]
     resource :registrations, only: %i[ create ], module: :events, as: :registrant_registration
     resource :public_registration, only: [ :new, :create, :show ], module: :events
-    resource :bulk_payment, only: [ :new, :create, :show ], controller: "events/bulk_payment_submissions"
+    resource :bulk_payment, only: [ :new, :create, :show ], controller: "events/bulk_payment_form_submissions"
     resource :invoice, only: [ :show ], module: :events
     get "form_submissions/:person_id", to: "events/form_submissions#show", as: :registrant_submissions
   end
diff --git a/spec/requests/events/bulk_payment_submissions_spec.rb b/spec/requests/events/bulk_payment_form_submissions_spec.rb
similarity index 99%
rename from spec/requests/events/bulk_payment_submissions_spec.rb
rename to spec/requests/events/bulk_payment_form_submissions_spec.rb
index ef948fb666..abc0d38691 100644
--- a/spec/requests/events/bulk_payment_submissions_spec.rb
+++ b/spec/requests/events/bulk_payment_form_submissions_spec.rb
@@ -1,6 +1,6 @@
 require "rails_helper"
 
-RSpec.describe "Events::BulkPaymentSubmissions", type: :request do
+RSpec.describe "Events::BulkPaymentFormSubmissions", type: :request do
   let(:admin) { create(:user, :admin) }
   let(:event) { create(:event, cost_cents: 0) }
   let(:form) { create(:form) }
diff --git a/spec/views/page_bg_class_alignment_spec.rb b/spec/views/page_bg_class_alignment_spec.rb
index b53047371f..023520c78f 100644
--- a/spec/views/page_bg_class_alignment_spec.rb
+++ b/spec/views/page_bg_class_alignment_spec.rb
@@ -213,9 +213,9 @@
     "app/views/registration_ticket_callouts/show.html.erb" => "public",
 
     # ─── bulk payment views ───
-    "app/views/events/bulk_payment_submissions/new.html.erb"  => "public",
-    "app/views/events/bulk_payment_submissions/show.html.erb" => "public",
-    "app/views/events/bulk_payment_submissions/ticket.html.erb" => "public",
+    "app/views/events/bulk_payment_form_submissions/new.html.erb"  => "public",
+    "app/views/events/bulk_payment_form_submissions/show.html.erb" => "public",
+    "app/views/events/bulk_payment_form_submissions/ticket.html.erb" => "public",
 
     # ─── event invoice (slug/submission-reachable; blank template gated in controller) ───
     "app/views/events/invoices/show.html.erb"            => "public",

From 1e542aebddeaa059c909580c33a5d1f336acf425 Mon Sep 17 00:00:00 2001
From: Justin Miller <16829344+jmilljr24@users.noreply.github.com>
Date: Wed, 29 Jul 2026 09:27:24 -0400
Subject: [PATCH 22/22] fix name to attendees

---
 .../events/bulk_payment_form_submissions_controller.rb      | 6 +++---
 app/views/events/bulk_payment_form_submissions/new.html.erb | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/controllers/events/bulk_payment_form_submissions_controller.rb b/app/controllers/events/bulk_payment_form_submissions_controller.rb
index b92927099b..56e052fc46 100644
--- a/app/controllers/events/bulk_payment_form_submissions_controller.rb
+++ b/app/controllers/events/bulk_payment_form_submissions_controller.rb
@@ -15,7 +15,7 @@ def new
       @form_fields = visible_form_fields
       @event = @event.decorate
 
-      @attendee_field = @form.form_fields.find_by(field_identifier: "bulk_payment_attendees")
+      @attendees_field = @form.form_fields.find_by(field_identifier: "bulk_payment_attendees")
     end
 
     def create
@@ -27,7 +27,7 @@ def create
       if @field_errors.any?
         @form_fields = visible_form_fields
         @event = @event.decorate
-        @attendee_field = @form.form_fields.find_by(field_identifier: "bulk_payment_attendees")
+        @attendees_field = @form.form_fields.find_by(field_identifier: "bulk_payment_attendees")
         render :new, status: :unprocessable_content
         return
       end
@@ -50,7 +50,7 @@ def create
       else
         @form_fields = visible_form_fields
         @event = @event.decorate
-        @attendee_field = @form.form_fields.find_by(field_identifier: "bulk_payment_attendees")
+        @attendees_field = @form.form_fields.find_by(field_identifier: "bulk_payment_attendees")
         flash.now[:alert] = result.errors.join(", ")
         render :new, status: :unprocessable_content
       end
diff --git a/app/views/events/bulk_payment_form_submissions/new.html.erb b/app/views/events/bulk_payment_form_submissions/new.html.erb
index 0bcbe2e674..dc6730feb3 100644
--- a/app/views/events/bulk_payment_form_submissions/new.html.erb
+++ b/app/views/events/bulk_payment_form_submissions/new.html.erb
@@ -171,7 +171,7 @@
           <% end %>
         </div>
 
-        <% if @attendee_field %>
+        <% if @attendees_field %>
           <div>
 
             <template data-bulk-payment-attendees-target="template">
@@ -213,7 +213,7 @@
             <div data-bulk-payment-attendees-target="rows"></div>
 
             <input type="hidden"
-                   name="bulk_payment[form_fields][<%= @attendee_field.id %>]"
+                   name="bulk_payment[form_fields][<%= @attendees_field.id %>]"
                    data-bulk-payment-attendees-target="hiddenInput">
 
             <button type="button"