From 249f26d0f3d79b80b6b8fe633fd5621987ad42bc Mon Sep 17 00:00:00 2001
From: Justin Miller <16829344+jmilljr24@users.noreply.github.com>
Date: Mon, 8 Jun 2026 17:09:46 -0400
Subject: [PATCH] renam to bulk payment

more
---
 ...troller.rb => bulk_payments_controller.rb} | 38 +++++++++----------
 app/controllers/events_controller.rb          | 16 ++++----
 ...s => bulk_payment_attendees_controller.js} |  6 +--
 app/frontend/javascript/controllers/index.js  |  4 +-
 .../controllers/section_filter_controller.js  |  6 +--
 app/models/concerns/pay_charge_extensions.rb  |  6 +--
 app/models/event.rb                           |  4 +-
 app/models/event_form.rb                      |  4 +-
 app/policies/event_policy.rb                  |  2 +-
 ...yment_policy.rb => bulk_payment_policy.rb} |  2 +-
 .../{group_payment.rb => bulk_payment.rb}     |  4 +-
 app/services/form_builder_service.rb          | 30 +++++++--------
 app/views/events/_bulk_actions_menu.html.erb  |  2 +-
 app/views/events/_form.html.erb               |  4 +-
 app/views/events/_form_actions_menu.html.erb  |  6 +--
 ...yments.html.erb => bulk_payments.html.erb} | 10 ++---
 .../new.html.erb                              | 38 +++++++++----------
 .../show.html.erb                             |  6 +--
 app/views/events/show.html.erb                |  6 +--
 app/views/forms/edit.html.erb                 |  2 +-
 app/views/forms/edit_sections.html.erb        |  6 +--
 app/views/forms/new.html.erb                  |  4 +-
 config/routes.rb                              |  4 +-
 ...payment_enabled_to_bulk_payment_enabled.rb |  5 +++
 db/schema.rb                                  |  4 +-
 db/seeds/dev/events_management.rb             | 14 +++----
 spec/views/page_bg_class_alignment_spec.rb    |  6 +--
 27 files changed, 122 insertions(+), 117 deletions(-)
 rename app/controllers/events/{group_payments_controller.rb => bulk_payments_controller.rb} (77%)
 rename app/frontend/javascript/controllers/{group_payment_attendees_controller.js => bulk_payment_attendees_controller.js} (82%)
 rename app/policies/events/{group_payment_policy.rb => bulk_payment_policy.rb} (62%)
 rename app/services/event_registration_services/{group_payment.rb => bulk_payment.rb} (97%)
 rename app/views/events/{group_payments.html.erb => bulk_payments.html.erb} (88%)
 rename app/views/events/{group_payments => bulk_payments}/new.html.erb (87%)
 rename app/views/events/{group_payments => bulk_payments}/show.html.erb (94%)
 create mode 100644 db/migrate/20260608205816_rename_group_payment_enabled_to_bulk_payment_enabled.rb

diff --git a/app/controllers/events/group_payments_controller.rb b/app/controllers/events/bulk_payments_controller.rb
similarity index 77%
rename from app/controllers/events/group_payments_controller.rb
rename to app/controllers/events/bulk_payments_controller.rb
index 66f78e0f1..550889bc0 100644
--- a/app/controllers/events/group_payments_controller.rb
+++ b/app/controllers/events/bulk_payments_controller.rb
@@ -1,38 +1,38 @@
 module Events
-  class GroupPaymentsController < ApplicationController
+  class BulkPaymentsController < ApplicationController
     skip_before_action :authenticate_user!, only: [ :new, :create, :show ]
     before_action :set_event
     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_group_payment_path(@event)
+      redirect_to new_event_bulk_payment_path(@event)
     end
 
     def new
-      authorize! :group_payment, to: :new?
+      authorize! :bulk_payment, to: :new?
 
       @form_fields = visible_form_fields
       @event = @event.decorate
 
-      @attendee_field = @form.form_fields.find_by(field_identifier: "group_payment_attendees")
+      @attendee_field = @form.form_fields.find_by(field_identifier: "bulk_payment_attendees")
     end
 
     def create
-      authorize! :group_payment, to: :create?
+      authorize! :bulk_payment, to: :create?
 
-      @form_params = params.dig(:group_payment, :form_fields)&.to_unsafe_h || {}
+      @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: "group_payment_attendees")
+        @attendee_field = @form.form_fields.find_by(field_identifier: "bulk_payment_attendees")
         render :new, status: :unprocessable_content
         return
       end
 
-      result = EventRegistrationServices::GroupPayment.call(
+      result = EventRegistrationServices::BulkPayment.call(
         event: @event,
         form: @form,
         form_params: @form_params,
@@ -44,20 +44,20 @@ def create
           checkout_session = create_stripe_checkout_session(result.form_submission)
           redirect_to checkout_session.url, allow_other_host: true, status: :see_other
         else
-          redirect_to event_group_payment_path(@event, submission_id: result.form_submission.id),
-                      notice: "Your group payment information has been submitted."
+          redirect_to event_bulk_payment_path(@event, submission_id: result.form_submission.id),
+                      notice: "Your bulk payment information has been submitted."
         end
       else
         @form_fields = visible_form_fields
         @event = @event.decorate
-        @attendee_field = @form.form_fields.find_by(field_identifier: "group_payment_attendees")
+        @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
 
     def show
-      authorize! :group_payment, to: :show?
+      authorize! :bulk_payment, to: :show?
 
       @submission = FormSubmission.find(params[:submission_id])
       @form = @submission.form
@@ -66,7 +66,7 @@ def show
       @event = @event.decorate
 
       attendee_answer = @responses.values.find { |a|
-        a.form_field&.field_identifier == "group_payment_attendees"
+        a.form_field&.field_identifier == "bulk_payment_attendees"
       }
       @attendees = parse_attendees(attendee_answer&.submitted_answer)
     end
@@ -89,9 +89,9 @@ def set_event
     end
 
     def set_form
-      @form = @event.group_payment_form
+      @form = @event.bulk_payment_form
       unless @form
-        redirect_to event_path(@event), alert: "Group payment form is not available for this event."
+        redirect_to event_path(@event), alert: "Bulk payment form is not available for this event."
       end
     end
 
@@ -101,7 +101,7 @@ def validate_required_fields
 
       visible_fields.find_each do |field|
         next if field.group_header?
-        next if field.field_identifier == "group_payment_attendees"
+        next if field.field_identifier == "bulk_payment_attendees"
 
         value = @form_params[field.id.to_s]
 
@@ -148,13 +148,13 @@ def create_stripe_checkout_session(submission)
         line_items: [ {
           price_data: {
             currency: "usd",
-            product_data: { name: "Group Payment (#{qty} attendees): #{@event.title}" },
+            product_data: { name: "Bulk Payment (#{qty} attendees): #{@event.title}" },
             unit_amount: unit_amount
           },
           quantity: qty
         } ],
-        success_url: event_group_payment_url(@event, submission_id: submission.id, checkout: "success"),
-        cancel_url: event_group_payment_url(@event, submission_id: submission.id, checkout: "cancelled")
+        success_url: event_bulk_payment_url(@event, submission_id: submission.id, checkout: "success"),
+        cancel_url: event_bulk_payment_url(@event, submission_id: submission.id, checkout: "cancelled")
       )
     end
 
diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb
index f36e1239d..2ffa7f334 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 background registrants staff recipients group_payments preview_reminder send_reminder copy_registration_form ]
+  before_action :set_event, only: %i[ show edit update destroy preview dashboard background registrants staff recipients bulk_payments preview_reminder send_reminder copy_registration_form ]
 
   def index
     authorize!
@@ -106,12 +106,12 @@ def recipients
     @dashboard = EventDashboard.new(@event)
   end
 
-  def group_payments
+  def bulk_payments
     authorize! @event
 
     @event = @event.decorate
     @submissions = FormSubmission.joins(form: :event_forms)
-                                 .where(event_forms: { event_id: @event.id, role: "group_payment" })
+                                 .where(event_forms: { event_id: @event.id, role: "bulk_payment" })
                                  .includes(:person, form_answers: :form_field)
                                  .order(created_at: :desc)
   end
@@ -300,13 +300,13 @@ def assign_event_forms(event)
       event.event_forms.scholarship.destroy_all
     end
 
-    if params.dig(:event, :group_payment_enabled) == "1"
-      form = Form.standalone.find_by(role: "group_payment")
-      if form && !event.event_forms.group_payment.exists?
-        event.event_forms.create!(form: form, role: "group_payment")
+    if params.dig(:event, :bulk_payment_enabled) == "1"
+      form = Form.standalone.find_by(role: "bulk_payment")
+      if form && !event.event_forms.bulk_payment.exists?
+        event.event_forms.create!(form: form, role: "bulk_payment")
       end
     else
-      event.event_forms.group_payment.destroy_all
+      event.event_forms.bulk_payment.destroy_all
     end
   end
 
diff --git a/app/frontend/javascript/controllers/group_payment_attendees_controller.js b/app/frontend/javascript/controllers/bulk_payment_attendees_controller.js
similarity index 82%
rename from app/frontend/javascript/controllers/group_payment_attendees_controller.js
rename to app/frontend/javascript/controllers/bulk_payment_attendees_controller.js
index 62861cd44..a5a146ea8 100644
--- a/app/frontend/javascript/controllers/group_payment_attendees_controller.js
+++ b/app/frontend/javascript/controllers/bulk_payment_attendees_controller.js
@@ -14,7 +14,7 @@ export default class extends Controller {
     const index = this.countValue++
     const fragment = this.templateTarget.content.cloneNode(true)
 
-    fragment.querySelectorAll("[data-group-payment-attendees-target=\"row\"]").forEach(row => {
+    fragment.querySelectorAll("[data-bulk-payment-attendees-target=\"row\"]").forEach(row => {
       row.dataset.index = index
     })
 
@@ -31,7 +31,7 @@ export default class extends Controller {
   }
 
   removeRow(event) {
-    const row = event.target.closest("[data-group-payment-attendees-target=\"row\"]")
+    const row = event.target.closest("[data-bulk-payment-attendees-target=\"row\"]")
     if (row) {
       row.remove()
       this.serialize()
@@ -40,7 +40,7 @@ export default class extends Controller {
 
   serialize() {
     const attendees = []
-    this.rowsTarget.querySelectorAll("[data-group-payment-attendees-target=\"row\"]").forEach(row => {
+    this.rowsTarget.querySelectorAll("[data-bulk-payment-attendees-target=\"row\"]").forEach(row => {
       const first_name = row.querySelector("[data-attendee-field=\"first_name\"]")?.value || ""
       const last_name = row.querySelector("[data-attendee-field=\"last_name\"]")?.value || ""
       const email = row.querySelector("[data-attendee-field=\"email\"]")?.value || ""
diff --git a/app/frontend/javascript/controllers/index.js b/app/frontend/javascript/controllers/index.js
index 1904efd53..8ba5ac349 100644
--- a/app/frontend/javascript/controllers/index.js
+++ b/app/frontend/javascript/controllers/index.js
@@ -177,6 +177,6 @@ application.register("world-map-chart", WorldMapChartController)
 import CurrencyInputController from "./currency_input_controller"
 application.register("currency-input", CurrencyInputController)
 
-import GroupPaymentAttendeesController from "./group_payment_attendees_controller"
-application.register("group-payment-attendees", GroupPaymentAttendeesController)
+import BulkPaymentAttendeesController from "./bulk_payment_attendees_controller"
+application.register("bulk-payment-attendees", BulkPaymentAttendeesController)
 
diff --git a/app/frontend/javascript/controllers/section_filter_controller.js b/app/frontend/javascript/controllers/section_filter_controller.js
index 48463ffdc..105515136 100644
--- a/app/frontend/javascript/controllers/section_filter_controller.js
+++ b/app/frontend/javascript/controllers/section_filter_controller.js
@@ -13,10 +13,10 @@ export default class extends Controller {
       const sectionRole = el.dataset.sectionRole
       if (role === "scholarship") {
         el.classList.toggle("hidden", sectionRole !== "scholarship")
-      } else if (role === "group_payment") {
-        el.classList.toggle("hidden", sectionRole !== "group_payment")
+      } else if (role === "bulk_payment") {
+        el.classList.toggle("hidden", sectionRole !== "bulk_payment")
       } else {
-        el.classList.toggle("hidden", sectionRole === "scholarship" || sectionRole === "group_payment")
+        el.classList.toggle("hidden", sectionRole === "scholarship" || sectionRole === "bulk_payment")
       }
     })
   }
diff --git a/app/models/concerns/pay_charge_extensions.rb b/app/models/concerns/pay_charge_extensions.rb
index 23e93397f..05b40d01c 100644
--- a/app/models/concerns/pay_charge_extensions.rb
+++ b/app/models/concerns/pay_charge_extensions.rb
@@ -15,7 +15,7 @@ def create_external_processor_payment
     if (event_registration_id = metadata["event_registration_id"])
       create_event_registration_payment(event_registration_id)
     elsif (form_submission_id = metadata["form_submission_id"])
-      create_group_payment(form_submission_id)
+      create_bulk_payment(form_submission_id)
     elsif (person_id = metadata["person_id"])
       create_donation_payment(person_id)
     end
@@ -49,10 +49,10 @@ def create_event_registration_payment(event_registration_id)
     )
   end
 
-  def create_group_payment(form_submission_id)
+  def create_bulk_payment(form_submission_id)
     submission = FormSubmission.find_by(id: form_submission_id)
     return unless submission
-    return unless submission.role == "group_payment"
+    return unless submission.role == "bulk_payment"
 
     person = submission.person
     return unless person
diff --git a/app/models/event.rb b/app/models/event.rb
index 384636da9..15f1a3d68 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -69,8 +69,8 @@ def scholarship_form
     forms.find_by(event_forms: { role: "scholarship" })
   end
 
-  def group_payment_form
-    forms.find_by(event_forms: { role: "group_payment" })
+  def bulk_payment_form
+    forms.find_by(event_forms: { role: "bulk_payment" })
   end
 
   def active_registration_for(person)
diff --git a/app/models/event_form.rb b/app/models/event_form.rb
index e1d366539..4f2f6bdda 100644
--- a/app/models/event_form.rb
+++ b/app/models/event_form.rb
@@ -2,12 +2,12 @@ class EventForm < ApplicationRecord
   belongs_to :event
   belongs_to :form
 
-  ROLES = %w[registration scholarship group_payment].freeze
+  ROLES = %w[registration scholarship bulk_payment].freeze
 
   validates :role, presence: true, inclusion: { in: ROLES }
   validates :form_id, uniqueness: { scope: [ :event_id, :role ] }
 
   scope :registration, -> { where(role: "registration") }
   scope :scholarship, -> { where(role: "scholarship") }
-  scope :group_payment, -> { where(role: "group_payment") }
+  scope :bulk_payment, -> { where(role: "bulk_payment") }
 end
diff --git a/app/policies/event_policy.rb b/app/policies/event_policy.rb
index 870002e0f..d37d7473c 100644
--- a/app/policies/event_policy.rb
+++ b/app/policies/event_policy.rb
@@ -65,7 +65,7 @@ def recipients?
     manage?
   end
 
-  def group_payments?
+  def bulk_payments?
     manage?
   end
 
diff --git a/app/policies/events/group_payment_policy.rb b/app/policies/events/bulk_payment_policy.rb
similarity index 62%
rename from app/policies/events/group_payment_policy.rb
rename to app/policies/events/bulk_payment_policy.rb
index ba8c8be49..bd55a1570 100644
--- a/app/policies/events/group_payment_policy.rb
+++ b/app/policies/events/bulk_payment_policy.rb
@@ -1,4 +1,4 @@
-class Events::GroupPaymentPolicy < ApplicationPolicy
+class Events::BulkPaymentPolicy < ApplicationPolicy
   def new?
     true
   end
diff --git a/app/services/event_registration_services/group_payment.rb b/app/services/event_registration_services/bulk_payment.rb
similarity index 97%
rename from app/services/event_registration_services/group_payment.rb
rename to app/services/event_registration_services/bulk_payment.rb
index 6fdf10121..54733c411 100644
--- a/app/services/event_registration_services/group_payment.rb
+++ b/app/services/event_registration_services/bulk_payment.rb
@@ -1,5 +1,5 @@
 module EventRegistrationServices
-  class GroupPayment
+  class BulkPayment
     Result = Struct.new(:success?, :form_submission, :errors, keyword_init: true)
 
     def self.call(event:, form:, form_params:, person: nil)
@@ -53,7 +53,7 @@ def find_or_create_person
     end
 
     def create_form_submission(person)
-      submission = FormSubmission.create!(person: person, form: @form, role: "group_payment")
+      submission = FormSubmission.create!(person: person, form: @form, role: "bulk_payment")
       save_form_answers(submission)
       submission
     end
diff --git a/app/services/form_builder_service.rb b/app/services/form_builder_service.rb
index c456ad68e..9129ad24f 100644
--- a/app/services/form_builder_service.rb
+++ b/app/services/form_builder_service.rb
@@ -9,7 +9,7 @@ class FormBuilderService
     payment: { label: "Payment", method: :build_payment_fields },
     consent: { label: "Consent", method: :build_consent_fields },
     post_event_feedback: { label: "Post-event feedback", method: :build_post_event_feedback_fields },
-    group_payment: { label: "Group payment", method: :build_group_payment_fields }
+    bulk_payment: { label: "Bulk payment", method: :build_bulk_payment_fields }
   }.freeze
 
   def initialize(name:, sections:, role: nil)
@@ -49,7 +49,7 @@ def call
     payment: %w[payment_method],
     consent: %w[communication_consent],
     post_event_feedback: %w[event_rating most_valuable improvement_suggestions],
-    group_payment: %w[payer_first_name payer_last_name payer_email organization_name number_of_attendees payment_method group_payment_attendees]
+    bulk_payment: %w[payer_first_name payer_last_name payer_email organization_name number_of_attendees payment_method bulk_payment_attendees]
   }.freeze
 
   # Header questions created by each section's builder method
@@ -63,7 +63,7 @@ def call
     payment: [ "Payment Information" ],
     consent: [ "Consent" ],
     post_event_feedback: [ "Post-Event Feedback" ],
-    group_payment: [ "Payer Information", "Payment Information", "Attendees" ]
+    bulk_payment: [ "Payer Information", "Payment Information", "Attendees" ]
   }.freeze
 
   # Update sections on an existing form: add new sections, remove unchecked ones
@@ -111,7 +111,7 @@ def self.update_sections!(form, new_sections)
     "scholarship" => :always_ask,
     "consent" => :answers_on_file,
     "post_event_feedback" => :answers_on_file,
-    "group_payment" => :always_ask
+    "bulk_payment" => :always_ask
   }.freeze
 
   # Sections where answers carry across all events (ask once ever)
@@ -341,33 +341,33 @@ def build_post_event_feedback_fields(form, position)
     position
   end
 
-  def build_group_payment_fields(form, position)
-    position = add_header(form, position, "Payer Information", group: "group_payment", visibility: :logged_out_only)
+  def build_bulk_payment_fields(form, position)
+    position = add_header(form, position, "Payer Information", group: "bulk_payment", visibility: :logged_out_only)
 
     position = add_field(form, position, "Payer First Name", :free_form_input_one_line,
-                         key: "payer_first_name", group: "group_payment", required: true,
+                         key: "payer_first_name", group: "bulk_payment", required: true,
                          visibility: :logged_out_only)
     position = add_field(form, position, "Payer Last Name", :free_form_input_one_line,
-                         key: "payer_last_name", group: "group_payment", required: true,
+                         key: "payer_last_name", group: "bulk_payment", required: true,
                          visibility: :logged_out_only)
     position = add_field(form, position, "Payer Email", :free_form_input_one_line,
-                         key: "payer_email", group: "group_payment", required: true,
+                         key: "payer_email", group: "bulk_payment", required: true,
                          visibility: :logged_out_only)
     position = add_field(form, position, "Organization Name", :free_form_input_one_line,
-                         key: "organization_name", group: "group_payment", required: false,
+                         key: "organization_name", group: "bulk_payment", required: false,
                          visibility: :logged_out_only)
 
-    position = add_header(form, position, "Payment Information", group: "group_payment")
+    position = add_header(form, position, "Payment Information", group: "bulk_payment")
     position = add_field(form, position, "Payment Method", :multiple_choice_radio,
-                         key: "payment_method", group: "group_payment", required: true,
+                         key: "payment_method", group: "bulk_payment", required: true,
                          options: [ "Credit Card", "Check", "Purchase Order", "Other" ])
 
-    position = add_header(form, position, "Attendees", group: "group_payment")
+    position = add_header(form, position, "Attendees", group: "bulk_payment")
     position = add_field(form, position, "Number of Attendees", :free_form_input_one_line,
-                         key: "number_of_attendees", group: "group_payment", required: true,
+                         key: "number_of_attendees", group: "bulk_payment", required: true,
                          datatype: :number_integer)
     position = add_field(form, position, "Attendees", :no_user_input,
-                         key: "group_payment_attendees", group: "group_payment", required: false)
+                         key: "bulk_payment_attendees", group: "bulk_payment", required: false)
     position
   end
 end
diff --git a/app/views/events/_bulk_actions_menu.html.erb b/app/views/events/_bulk_actions_menu.html.erb
index 7e24ffc19..290eb6643 100644
--- a/app/views/events/_bulk_actions_menu.html.erb
+++ b/app/views/events/_bulk_actions_menu.html.erb
@@ -13,7 +13,7 @@
        data-dropdown-target="content"
        class="hidden absolute right-0 z-10 mt-1 bg-white border border-gray-200 rounded-md shadow-lg py-1 min-w-[180px]">
     <%= link_to "Send reminder emails", preview_reminder_event_path(@event), class: item_class %>
-    <%= link_to "Group payments", group_payments_event_path(@event), class: item_class %>
+    <%= link_to "Bulk payments", bulk_payments_event_path(@event), class: item_class %>
     <%= link_to registrants_event_path(@event, format: :csv), class: item_class, data: { turbo_frame: "_top" } do %>
       Download CSV <i class="fa-solid fa-download text-gray-400 ml-1"></i>
     <% end %>
diff --git a/app/views/events/_form.html.erb b/app/views/events/_form.html.erb
index 43ad62591..0976e3d71 100644
--- a/app/views/events/_form.html.erb
+++ b/app/views/events/_form.html.erb
@@ -394,8 +394,8 @@
           </div>
           <div class="pb-4">
             <label class="flex items-center gap-2 cursor-pointer">
-              <%= check_box_tag "event[group_payment_enabled]", "1", @event.group_payment_form.present? %>
-              <span class="text-sm font-medium text-gray-700">Enable group payment</span>
+              <%= check_box_tag "event[bulk_payment_enabled]", "1", @event.bulk_payment_form.present? %>
+              <span class="text-sm font-medium text-gray-700">Enable bulk payment</span>
             </label>
           </div>
         </div>
diff --git a/app/views/events/_form_actions_menu.html.erb b/app/views/events/_form_actions_menu.html.erb
index fd6624fd7..3238093f0 100644
--- a/app/views/events/_form_actions_menu.html.erb
+++ b/app/views/events/_form_actions_menu.html.erb
@@ -12,15 +12,15 @@
   <div id="<%= dropdown_id %>"
        data-dropdown-target="content"
        class="hidden absolute right-0 z-10 mt-1 bg-white border border-gray-200 rounded-md shadow-lg py-1 min-w-[180px]">
-    <% if @event.event_forms.registration.exists? || @event.scholarship_form || @event.group_payment_form %>
+    <% if @event.event_forms.registration.exists? || @event.scholarship_form || @event.bulk_payment_form %>
       <% if @event.event_forms.registration.exists? %>
         <%= link_to "Public registration", new_event_public_registration_path(@event), class: item_class, target: "_blank", rel: "noopener noreferrer" %>
       <% end %>
       <% if @event.scholarship_form %>
         <%= link_to "Scholarship version", new_event_public_registration_path(@event, scholarship_requested: true), class: item_class, target: "_blank", rel: "noopener noreferrer" %>
       <% end %>
-      <% if @event.group_payment_form %>
-        <%= link_to "Group payment", new_event_group_payment_path(@event), class: item_class, target: "_blank", rel: "noopener noreferrer" %>
+      <% if @event.bulk_payment_form %>
+        <%= link_to "Bulk payment", new_event_bulk_payment_path(@event), class: item_class, target: "_blank", rel: "noopener noreferrer" %>
       <% end %>
       <div class="my-1 border-t border-gray-100"></div>
       <%= link_to "Change form settings", edit_event_path(@event, anchor: "registration_form_section"), class: item_class %>
diff --git a/app/views/events/group_payments.html.erb b/app/views/events/bulk_payments.html.erb
similarity index 88%
rename from app/views/events/group_payments.html.erb
rename to app/views/events/bulk_payments.html.erb
index 1fa4f26db..5a20a7707 100644
--- a/app/views/events/group_payments.html.erb
+++ b/app/views/events/bulk_payments.html.erb
@@ -1,10 +1,10 @@
-<% content_for(:page_title, "Group Payments — #{@event.title}") %>
+<% content_for(:page_title, "Bulk Payments — #{@event.title}") %>
 
-<%= render "subnav", event: @event, current: :group_payments %>
+<%= render "subnav", event: @event, current: :bulk_payments %>
 
 <div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 py-8">
   <div class="sm:flex sm:items-center sm:justify-between mb-6">
-    <h1 class="text-2xl font-bold text-gray-900">Group Payments</h1>
+    <h1 class="text-2xl font-bold text-gray-900">Bulk Payments</h1>
     <p class="text-sm text-gray-500 mt-1 sm:mt-0"><%= @submissions.size %> submission<%= "s" unless @submissions.size == 1 %></p>
   </div>
 
@@ -41,7 +41,7 @@
             <%= submission.created_at.strftime("%b %-d, %Y") %>
           </div>
           <div class="shrink-0">
-            <%= link_to event_group_payment_path(@event, submission_id: submission.id),
+            <%= link_to event_bulk_payment_path(@event, submission_id: submission.id),
                         class: "text-sm text-blue-600 hover:text-blue-800 font-medium",
                         target: "_blank", rel: "noopener noreferrer" do %>
               View <i class="fa-solid fa-arrow-right text-xs ml-0.5"></i>
@@ -53,7 +53,7 @@
   <% else %>
     <div class="text-center py-16 bg-white border border-gray-200 rounded-lg">
       <i class="fa-regular fa-receipt text-4xl text-gray-300 mb-3"></i>
-      <p class="text-gray-500">No group payment submissions yet.</p>
+      <p class="text-gray-500">No bulk payment submissions yet.</p>
     </div>
   <% end %>
 </div>
\ No newline at end of file
diff --git a/app/views/events/group_payments/new.html.erb b/app/views/events/bulk_payments/new.html.erb
similarity index 87%
rename from app/views/events/group_payments/new.html.erb
rename to app/views/events/bulk_payments/new.html.erb
index dbc4a7512..a225a3282 100644
--- a/app/views/events/group_payments/new.html.erb
+++ b/app/views/events/bulk_payments/new.html.erb
@@ -27,7 +27,7 @@
           <%= image_tag("logo.png", alt: "Organization logo", class: "h-9 w-auto") %>
         </div>
         <div>
-          <h2 class="text-xl font-semibold tracking-wide leading-tight">Group Payment</h2>
+          <h2 class="text-xl font-semibold tracking-wide leading-tight">Bulk Payment</h2>
           <p class="text-sm text-blue-200">Pay for multiple attendees.</p>
         </div>
       </div>
@@ -42,12 +42,12 @@
         </div>
       <% end %>
 
-      <%= form_with url: event_group_payment_path(@event), method: :post,
-                     data: { controller: "group-payment-attendees", action: "submit->group-payment-attendees#serialize", turbo: false },
+      <%= form_with url: event_bulk_payment_path(@event), method: :post,
+                     data: { controller: "bulk-payment-attendees", action: "submit->bulk-payment-attendees#serialize", turbo: false },
                      class: "space-y-2" do |f| %>
 
         <div class="hidden" aria-hidden="true">
-          <input type="text" name="group_payment[website_url]" tabindex="-1" autocomplete="off">
+          <input type="text" name="bulk_payment[website_url]" tabindex="-1" autocomplete="off">
         </div>
 
         <%
@@ -56,7 +56,7 @@
         %>
 
         <% @form_fields.each do |field| %>
-          <% next if field.field_identifier == "group_payment_attendees" %>
+          <% next if field.field_identifier == "bulk_payment_attendees" %>
 
           <% if field.group_header? %>
             <div class="pt-7 pb-4">
@@ -70,8 +70,8 @@
               error = @field_errors&.dig(field.id)
               error_border = error ? "border-red-400 focus:border-red-500 focus:ring-red-500/30" : "border-gray-300 hover:border-gray-400 focus:border-blue-500 focus:ring-blue-500/30"
               input_classes = "w-full rounded-lg border bg-white px-3.5 py-2.5 text-sm text-gray-900 shadow-sm transition focus:outline-none focus:ring-2 #{error_border}"
-              field_name = "group_payment[form_fields][#{field.id}]"
-              field_id = "group_payment_form_fields_#{field.id}"
+              field_name = "bulk_payment[form_fields][#{field.id}]"
+              field_id = "bulk_payment_form_fields_#{field.id}"
               two_col = %w[payer_first_name payer_last_name].include?(field.field_identifier)
             %>
             <% if two_col %>
@@ -114,7 +114,7 @@
               submitted_value = @form_params&.dig(field.id.to_s)
               error = @field_errors&.dig(field.id)
               error_border = error ? "border-red-400 focus:border-red-500 focus:ring-red-500/30" : "border-gray-300 hover:border-gray-400 focus:border-blue-500 focus:ring-blue-500/30"
-              field_id = "group_payment_form_fields_#{field.id}"
+              field_id = "bulk_payment_form_fields_#{field.id}"
             %>
             <div class="mb-5">
               <label class="block text-sm font-semibold text-gray-700 mb-1.5">
@@ -125,7 +125,7 @@
                 <% field.form_field_answer_options.includes(:answer_option).each do |ffao| %>
                   <label class="inline-flex items-center gap-2 rounded-lg border <%= error ? 'border-red-400' : 'border-gray-300' %> px-4 py-2.5 cursor-pointer hover:border-blue-400 has-[:checked]:border-blue-600 has-[:checked]:bg-blue-50 transition">
                     <input type="radio"
-                           name="group_payment[form_fields][<%= field.id %>]"
+                           name="bulk_payment[form_fields][<%= field.id %>]"
                            value="<%= ffao.answer_option.name %>"
                            class="text-blue-600 focus:ring-blue-500"
                            <%= "checked" if submitted_value == ffao.answer_option.name || (submitted_value.blank? && ffao.answer_option.name == "Credit Card") %>
@@ -146,13 +146,13 @@
         <% if @attendee_field %>
           <div>
 
-            <template data-group-payment-attendees-target="template">
-              <div class="flex items-start gap-3 mb-3" data-group-payment-attendees-target="row">
+            <template data-bulk-payment-attendees-target="template">
+              <div class="flex items-start gap-3 mb-3" data-bulk-payment-attendees-target="row">
                 <div class="flex-1 grid grid-cols-1 md:grid-cols-3 gap-3">
                   <div>
                     <label class="block text-xs font-semibold text-gray-700 mb-1" for="attendee_INDEX_first_name">First Name</label>
                     <input type="text"
-                           name="group_payment[attendees][INDEX][first_name]"
+                           name="bulk_payment[attendees][INDEX][first_name]"
                            id="attendee_INDEX_first_name"
                            data-attendee-field="first_name"
                            class="w-full rounded-lg border border-gray-300 bg-white px-3.5 py-2.5 text-sm text-gray-900 shadow-sm transition hover:border-gray-400 focus:border-blue-500 focus:ring-2 focus:ring-blue-500/30 focus:outline-none">
@@ -160,7 +160,7 @@
                   <div>
                     <label class="block text-xs font-semibold text-gray-700 mb-1" for="attendee_INDEX_last_name">Last Name</label>
                     <input type="text"
-                           name="group_payment[attendees][INDEX][last_name]"
+                           name="bulk_payment[attendees][INDEX][last_name]"
                            id="attendee_INDEX_last_name"
                            data-attendee-field="last_name"
                            class="w-full rounded-lg border border-gray-300 bg-white px-3.5 py-2.5 text-sm text-gray-900 shadow-sm transition hover:border-gray-400 focus:border-blue-500 focus:ring-2 focus:ring-blue-500/30 focus:outline-none">
@@ -168,28 +168,28 @@
                   <div>
                     <label class="block text-xs font-semibold text-gray-700 mb-1" for="attendee_INDEX_email">Email</label>
                     <input type="email"
-                           name="group_payment[attendees][INDEX][email]"
+                           name="bulk_payment[attendees][INDEX][email]"
                            id="attendee_INDEX_email"
                            data-attendee-field="email"
                            class="w-full rounded-lg border border-gray-300 bg-white px-3.5 py-2.5 text-sm text-gray-900 shadow-sm transition hover:border-gray-400 focus:border-blue-500 focus:ring-2 focus:ring-blue-500/30 focus:outline-none">
                   </div>
                 </div>
                 <button type="button"
-                        data-action="group-payment-attendees#removeRow"
+                        data-action="bulk-payment-attendees#removeRow"
                         class="mt-6 inline-flex items-center justify-center w-8 h-8 rounded-full text-gray-400 hover:text-red-600 hover:bg-red-50 transition cursor-pointer">
                   <i class="fa-solid fa-xmark"></i>
                 </button>
               </div>
             </template>
 
-            <div data-group-payment-attendees-target="rows"></div>
+            <div data-bulk-payment-attendees-target="rows"></div>
 
             <input type="hidden"
-                   name="group_payment[form_fields][<%= @attendee_field.id %>]"
-                   data-group-payment-attendees-target="hiddenInput">
+                   name="bulk_payment[form_fields][<%= @attendee_field.id %>]"
+                   data-bulk-payment-attendees-target="hiddenInput">
 
             <button type="button"
-                    data-action="group-payment-attendees#addRow"
+                    data-action="bulk-payment-attendees#addRow"
                     class="inline-flex items-center gap-2 text-sm font-semibold text-blue-700 hover:text-blue-800 transition cursor-pointer mt-2">
               <i class="fa-solid fa-plus"></i> Add attendee
             </button>
diff --git a/app/views/events/group_payments/show.html.erb b/app/views/events/bulk_payments/show.html.erb
similarity index 94%
rename from app/views/events/group_payments/show.html.erb
rename to app/views/events/bulk_payments/show.html.erb
index 401a08b7f..87736744a 100644
--- a/app/views/events/group_payments/show.html.erb
+++ b/app/views/events/bulk_payments/show.html.erb
@@ -18,7 +18,7 @@
           <%= image_tag("logo.png", alt: "Organization logo", class: "h-9 w-auto") %>
         </div>
         <div class="flex-1">
-          <h1 class="text-xl font-semibold tracking-wide leading-tight">Group Payment Details</h1>
+          <h1 class="text-xl font-semibold tracking-wide leading-tight">Bulk Payment Details</h1>
           <p class="text-sm text-blue-200"><%= @event.title %></p>
         </div>
       </div>
@@ -34,11 +34,11 @@
       <% elsif params[:checkout] == "cancelled" %>
         <div class="flex items-start gap-3 bg-amber-50 border border-amber-200 text-amber-800 rounded-lg px-4 py-3 mb-6">
           <i class="fa-solid fa-circle-exclamation mt-0.5 text-amber-500"></i>
-          <span>Payment was cancelled. Your group payment information has been saved but payment is still pending.</span>
+          <span>Payment was cancelled. Your bulk payment information has been saved but payment is still pending.</span>
         </div>
       <% end %>
       <% @form_fields.each do |field| %>
-        <% next if field.field_identifier == "group_payment_attendees" %>
+        <% next if field.field_identifier == "bulk_payment_attendees" %>
         <% next if field.group_header? && field.name == "Attendees" %>
         <% response = @responses[field.id] %>
 
diff --git a/app/views/events/show.html.erb b/app/views/events/show.html.erb
index b273ddf33..4628ad383 100644
--- a/app/views/events/show.html.erb
+++ b/app/views/events/show.html.erb
@@ -144,10 +144,10 @@
     </div>
   <% end %>
 
-  <% if @event.group_payment_form %>
+  <% if @event.bulk_payment_form %>
     <div class="mt-4">
-      <%= link_to "Group Payment",
-                  new_event_group_payment_path(@event),
+      <%= link_to "Bulk Payment",
+                  new_event_bulk_payment_path(@event),
                   class: "btn px-10 py-2 text-2xl uppercase text-white hover:bg-white",
                   style: "font-family: 'Telefon Bold', sans-serif; background-color: rgb(22, 101, 52); border: 3px solid rgb(22, 101, 52);" %>
     </div>
diff --git a/app/views/forms/edit.html.erb b/app/views/forms/edit.html.erb
index c332fe924..3c52bd195 100644
--- a/app/views/forms/edit.html.erb
+++ b/app/views/forms/edit.html.erb
@@ -34,7 +34,7 @@
       <div>
         <label class="block text-sm font-medium text-gray-700 mb-1">Form role</label>
         <%= f.select :role,
-              [["General", ""], ["Registration", "registration"], ["Scholarship", "scholarship"], ["Group Payment", "group_payment"]],
+              [["General", ""], ["Registration", "registration"], ["Scholarship", "scholarship"], ["Bulk Payment", "bulk_payment"]],
               { selected: @form.role || "" },
               class: "w-full rounded border-gray-300 shadow-sm px-3 py-2 text-sm" %>
       </div>
diff --git a/app/views/forms/edit_sections.html.erb b/app/views/forms/edit_sections.html.erb
index 0447a3094..c047bc1a4 100644
--- a/app/views/forms/edit_sections.html.erb
+++ b/app/views/forms/edit_sections.html.erb
@@ -15,9 +15,9 @@
       <div class="space-y-2">
         <% FormBuilderService::SECTIONS.each do |key, section| %>
           <% next if key == :scholarship && @form.role != "scholarship" %>
-          <% next if key == :group_payment && @form.role != "group_payment" %>
-          <% next if key != :scholarship && key != :group_payment && @form.role == "scholarship" %>
-          <% next if key != :group_payment && key != :scholarship && @form.role == "group_payment" %>
+          <% next if key == :bulk_payment && @form.role != "bulk_payment" %>
+          <% next if key != :scholarship && key != :bulk_payment && @form.role == "scholarship" %>
+          <% next if key != :bulk_payment && key != :scholarship && @form.role == "bulk_payment" %>
           <label class="flex items-center gap-2 cursor-pointer">
             <input type="checkbox" name="sections[]" value="<%= key %>"
                    class="rounded border-gray-300 text-blue-600"
diff --git a/app/views/forms/new.html.erb b/app/views/forms/new.html.erb
index b7975612e..ee81f9210 100644
--- a/app/views/forms/new.html.erb
+++ b/app/views/forms/new.html.erb
@@ -16,7 +16,7 @@
         <option value="">General</option>
         <option value="registration" <%= "selected" if params[:role] == "registration" %>>Registration</option>
         <option value="scholarship" <%= "selected" if params[:role] == "scholarship" %>>Scholarship</option>
-        <option value="group_payment" <%= "selected" if params[:role] == "group_payment" %>>Group Payment</option>
+        <option value="bulk_payment" <%= "selected" if params[:role] == "bulk_payment" %>>Bulk Payment</option>
       </select>
     </div>
 
@@ -24,7 +24,7 @@
       <legend class="text-sm font-medium text-gray-700 mb-3">Select sections to include:</legend>
       <div class="space-y-2">
         <% FormBuilderService::SECTIONS.each do |key, section| %>
-          <% section_role = key == :scholarship ? "scholarship" : key == :group_payment ? "group_payment" : "other" %>
+          <% section_role = key == :scholarship ? "scholarship" : key == :bulk_payment ? "bulk_payment" : "other" %>
           <label class="flex items-center gap-2 cursor-pointer" data-section-role="<%= section_role %>">
             <input type="checkbox" name="sections[]" value="<%= key %>"
                    class="rounded border-gray-300 text-blue-600"
diff --git a/config/routes.rb b/config/routes.rb
index ae7d87dc2..b70e2f847 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -124,7 +124,7 @@
       get :registrants
       get :staff
       get :recipients
-      get :group_payments
+      get :bulk_payments
       get :preview_reminder
       patch :preview
       post :copy_registration_form
@@ -132,7 +132,7 @@
     end
     resource :registrations, only: %i[ create destroy ], module: :events, as: :registrant_registration
     resource :public_registration, only: [ :new, :create, :show ], module: :events
-    resource :group_payment, only: [ :new, :create, :show ], module: :events
+    resource :bulk_payment, only: [ :new, :create, :show ], module: :events
   end
   resources :people do
     collection do
diff --git a/db/migrate/20260608205816_rename_group_payment_enabled_to_bulk_payment_enabled.rb b/db/migrate/20260608205816_rename_group_payment_enabled_to_bulk_payment_enabled.rb
new file mode 100644
index 000000000..8ad2604d3
--- /dev/null
+++ b/db/migrate/20260608205816_rename_group_payment_enabled_to_bulk_payment_enabled.rb
@@ -0,0 +1,5 @@
+class RenameGroupPaymentEnabledToBulkPaymentEnabled < ActiveRecord::Migration[8.1]
+  def change
+    rename_column :events, :group_payment_enabled, :bulk_payment_enabled
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index a8ea8fe31..155c7618e 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_06_08_184843) do
+ActiveRecord::Schema[8.1].define(version: 2026_06_08_205816) 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
@@ -470,6 +470,7 @@
     t.boolean "autoshow_title", default: true, null: false
     t.boolean "autoshow_videoconference_label", default: true, null: false
     t.boolean "autoshow_videoconference_link", default: true, null: false
+    t.boolean "bulk_payment_enabled", default: false, null: false
     t.integer "cost_cents"
     t.datetime "created_at", null: false
     t.integer "created_by_id"
@@ -477,7 +478,6 @@
     t.datetime "end_date", precision: nil
     t.boolean "featured", default: false, null: false
     t.text "ga4_snippet"
-    t.boolean "group_payment_enabled", default: false, null: false
     t.text "gtm_body_snippet"
     t.text "gtm_head_snippet"
     t.boolean "inactive", default: true, null: false
diff --git a/db/seeds/dev/events_management.rb b/db/seeds/dev/events_management.rb
index 0de21a679..e31409557 100644
--- a/db/seeds/dev/events_management.rb
+++ b/db/seeds/dev/events_management.rb
@@ -20,11 +20,11 @@
   ).call
 end
 
-unless Form.standalone.find_by(role: "group_payment")
+unless Form.standalone.find_by(role: "bulk_payment")
   FormBuilderService.new(
-    name: "Group Payment",
-    sections: %i[group_payment],
-    role: "group_payment"
+    name: "Bulk Payment",
+    sections: %i[bulk_payment],
+    role: "bulk_payment"
   ).call
 end
 
@@ -32,7 +32,7 @@
 admin_user = User.find_by(email: "umberto.user@example.com")
 registration_form = Form.standalone.find_by!(role: "registration")
 scholarship_form = Form.standalone.find_by!(role: "scholarship")
-group_payment_form = Form.standalone.find_by!(role: "group_payment")
+bulk_payment_form = Form.standalone.find_by!(role: "bulk_payment")
 
 # Ensure the professional section (Primary Age Group(s) Served, Primary Service
 # Area, etc.) exists even on a registration form seeded before it was added — the
@@ -111,8 +111,8 @@
   end
 
   if cost_cents.to_i > 0
-    EventForm.find_or_create_by!(event: event, role: "group_payment") do |ef|
-      ef.form = group_payment_form
+    EventForm.find_or_create_by!(event: event, role: "bulk_payment") do |ef|
+      ef.form = bulk_payment_form
     end
   end
 end
diff --git a/spec/views/page_bg_class_alignment_spec.rb b/spec/views/page_bg_class_alignment_spec.rb
index b5c3e63b6..bacfe3536 100644
--- a/spec/views/page_bg_class_alignment_spec.rb
+++ b/spec/views/page_bg_class_alignment_spec.rb
@@ -184,9 +184,9 @@
     "app/views/events/public_registrations/show.html.erb" => "public",
     "app/views/events/registrations/show.html.erb"        => "public",
 
-    # ─── group payment views ───
-    "app/views/events/group_payments/new.html.erb"        => "public",
-    "app/views/events/group_payments/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",
 
     # ─── admin-only confirm/interstitial ───
     "app/views/event_registrations/confirm.html.erb"     => "admin-only bg-blue-100",