From 0547be6016d1b1e7c0888b943d7a56ff105642e1 Mon Sep 17 00:00:00 2001
From: maebeale <maebeale@users.noreply.github.com>
Date: Wed, 17 Jun 2026 13:20:55 -0400
Subject: [PATCH 1/2] Hide "Other" payment method on registration forms
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The "Other" option offered no clear meaning to registrants and added
noise to the payment choice. Keep it in code and form data — the
scholarship flow still relies on it as the stored payment method — but
filter it out of the options surfaced on the public registration and
bulk payment forms, preserving it only when it's already the selected
value (e.g. the scholarship preset).

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 app/services/form_builder_service.rb          |  7 ++++-
 app/views/events/bulk_payments/new.html.erb   |  3 ++-
 .../public_registrations/_form_field.html.erb |  6 +++++
 .../events/public_registrations/new.html.erb  |  2 +-
 .../events/public_registrations_spec.rb       | 27 +++++++++++++++++++
 5 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/app/services/form_builder_service.rb b/app/services/form_builder_service.rb
index 33f4a607d..eb715005b 100644
--- a/app/services/form_builder_service.rb
+++ b/app/services/form_builder_service.rb
@@ -3,7 +3,12 @@ class FormBuilderService
   # charge, so controllers match against PAYMENT_METHOD_PAY_NOW rather than
   # repeating its label. Keep this the single source of truth for the label.
   PAYMENT_METHOD_PAY_NOW = "Credit card (now)".freeze
-  PAYMENT_METHOD_OPTIONS = [ PAYMENT_METHOD_PAY_NOW, "Credit card (later)", "Check", "Other" ].freeze
+  # "Other" is retained as a payment method in code and form data — the scholarship
+  # flow stores it as the payment method — but it is intentionally hidden from the
+  # options surfaced on public forms for now (see the public registration and bulk
+  # payment views, which filter it out).
+  PAYMENT_METHOD_OTHER = "Other".freeze
+  PAYMENT_METHOD_OPTIONS = [ PAYMENT_METHOD_PAY_NOW, "Credit card (later)", "Check", PAYMENT_METHOD_OTHER ].freeze
 
   SECTIONS = {
     person_identifier: { label: "Person identifier", method: :build_person_identifier_fields },
diff --git a/app/views/events/bulk_payments/new.html.erb b/app/views/events/bulk_payments/new.html.erb
index 8896b0ea7..6c3ff481f 100644
--- a/app/views/events/bulk_payments/new.html.erb
+++ b/app/views/events/bulk_payments/new.html.erb
@@ -134,7 +134,8 @@
                     <% if field.required %><span class="text-red-500">*</span><% end %>
                   </label>
                   <div class="flex flex-wrap gap-2 mt-1">
-                    <% field.form_field_answer_options.includes(:answer_option).each do |ffao| %>
+                    <%# "Other" is kept in code/data but hidden on the form for now. %>
+                    <% field.form_field_answer_options.includes(:answer_option).reject { |ffao| ffao.answer_option.name == FormBuilderService::PAYMENT_METHOD_OTHER }.each do |ffao| %>
                       <label class="inline-flex items-center gap-2 rounded-lg border <%= error ? 'border-red-400' : 'border-gray-300' %> px-3 py-2.5 cursor-pointer hover:border-blue-400 has-[:checked]:border-blue-600 has-[:checked]:bg-blue-50 transition">
                         <input type="radio"
                                name="bulk_payment[form_fields][<%= field.id %>]"
diff --git a/app/views/events/public_registrations/_form_field.html.erb b/app/views/events/public_registrations/_form_field.html.erb
index 6e1cbe22a..b4c9bff04 100644
--- a/app/views/events/public_registrations/_form_field.html.erb
+++ b/app/views/events/public_registrations/_form_field.html.erb
@@ -72,6 +72,12 @@
         data and store none of their own, so fall back to those when present. %>
     <% radio_options = dynamic_form_field_options(field) ||
          field.form_field_answer_options.includes(:answer_option).map { |ffao| [ ffao.answer_option.name, ffao.answer_option.name ] } %>
+    <%# "Other" is hidden on the payment method field for now (it stays in code/data
+        for the scholarship flow). Keep it only when it's already the selected value
+        so a preset/stored "Other" still renders checked. %>
+    <% if field.field_identifier == "payment_method" %>
+      <% radio_options = radio_options.reject { |_option_label, option_value| option_value == FormBuilderService::PAYMENT_METHOD_OTHER && value != FormBuilderService::PAYMENT_METHOD_OTHER } %>
+    <% end %>
     <% has_specify = radio_options.any? { |option_label, _option_value| specify_placeholder(option_label).present? } %>
     <%= tag.div class: "flex flex-wrap gap-2.5 mt-1", data: (has_specify ? { controller: "specify-option", action: "change->specify-option#update" } : {}) do %>
       <% radio_options.each do |option_label, option_value, option_description| %>
diff --git a/app/views/events/public_registrations/new.html.erb b/app/views/events/public_registrations/new.html.erb
index 4d1a80d77..6f343ac4d 100644
--- a/app/views/events/public_registrations/new.html.erb
+++ b/app/views/events/public_registrations/new.html.erb
@@ -122,7 +122,7 @@
             <% else %>
               <% submitted_value = params.dig(:public_registration, :form_fields, field.id.to_s) %>
               <% if submitted_value.blank? && field.field_identifier == "payment_method" %>
-                <% submitted_value = @scholarship ? "Other" : FormBuilderService::PAYMENT_METHOD_PAY_NOW %>
+                <% submitted_value = @scholarship ? FormBuilderService::PAYMENT_METHOD_OTHER : FormBuilderService::PAYMENT_METHOD_PAY_NOW %>
               <% end %>
               <div class="<%= field.grid_span_class %>">
                 <%= render "events/public_registrations/form_field", field: field, value: submitted_value, label: email_label_overrides[field.field_identifier] %>
diff --git a/spec/requests/events/public_registrations_spec.rb b/spec/requests/events/public_registrations_spec.rb
index c11cf7ffc..58ddc621a 100644
--- a/spec/requests/events/public_registrations_spec.rb
+++ b/spec/requests/events/public_registrations_spec.rb
@@ -442,6 +442,33 @@ def post_with_scholarship(scholarship_answer)
     end
   end
 
+  describe "GET new payment method options" do
+    # A paid event so the payment section is not stripped from the form.
+    let(:event) { create(:event, cost_cents: 150_00) }
+    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
+
+    it "hides the 'Other' payment method from a normal registrant" do
+      get new_event_public_registration_path(event)
+
+      expect(response.body).to include(%(value="Check"))
+      expect(response.body).not_to include(%(value="Other"))
+    end
+
+    it "keeps 'Other' as the preselected payment method for a scholarship registrant" do
+      get new_event_public_registration_path(event, scholarship_requested: "true")
+
+      expect(response.body).to match(/value="Other"[^>]*\bchecked\b/)
+    end
+  end
+
   describe "GET show" do
     let(:person) { create(:person) }
 

From 091beb5d788fbdf6deac82716db03dd8e4cbc8a2 Mon Sep 17 00:00:00 2001
From: maebeale <maebeale@users.noreply.github.com>
Date: Wed, 17 Jun 2026 14:01:47 -0400
Subject: [PATCH 2/2] Remove "Other" payment method from registration forms

The "Other" option offered no clear meaning to registrants and added
noise to the payment choice, so drop it from the form builder's payment
method options. New registration and bulk payment forms no longer offer
it; existing forms are left as-is.

Scholarship applicants previously had "Other" preselected; they now see
the same default as everyone else, and are still never charged.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 app/services/form_builder_service.rb                  |  7 +------
 app/views/events/bulk_payments/new.html.erb           |  3 +--
 .../events/public_registrations/_form_field.html.erb  |  6 ------
 app/views/events/public_registrations/new.html.erb    |  2 +-
 spec/requests/events/public_registrations_spec.rb     | 11 ++++++++---
 5 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/app/services/form_builder_service.rb b/app/services/form_builder_service.rb
index eb715005b..78a0fc77a 100644
--- a/app/services/form_builder_service.rb
+++ b/app/services/form_builder_service.rb
@@ -3,12 +3,7 @@ class FormBuilderService
   # charge, so controllers match against PAYMENT_METHOD_PAY_NOW rather than
   # repeating its label. Keep this the single source of truth for the label.
   PAYMENT_METHOD_PAY_NOW = "Credit card (now)".freeze
-  # "Other" is retained as a payment method in code and form data — the scholarship
-  # flow stores it as the payment method — but it is intentionally hidden from the
-  # options surfaced on public forms for now (see the public registration and bulk
-  # payment views, which filter it out).
-  PAYMENT_METHOD_OTHER = "Other".freeze
-  PAYMENT_METHOD_OPTIONS = [ PAYMENT_METHOD_PAY_NOW, "Credit card (later)", "Check", PAYMENT_METHOD_OTHER ].freeze
+  PAYMENT_METHOD_OPTIONS = [ PAYMENT_METHOD_PAY_NOW, "Credit card (later)", "Check" ].freeze
 
   SECTIONS = {
     person_identifier: { label: "Person identifier", method: :build_person_identifier_fields },
diff --git a/app/views/events/bulk_payments/new.html.erb b/app/views/events/bulk_payments/new.html.erb
index 6c3ff481f..8896b0ea7 100644
--- a/app/views/events/bulk_payments/new.html.erb
+++ b/app/views/events/bulk_payments/new.html.erb
@@ -134,8 +134,7 @@
                     <% if field.required %><span class="text-red-500">*</span><% end %>
                   </label>
                   <div class="flex flex-wrap gap-2 mt-1">
-                    <%# "Other" is kept in code/data but hidden on the form for now. %>
-                    <% field.form_field_answer_options.includes(:answer_option).reject { |ffao| ffao.answer_option.name == FormBuilderService::PAYMENT_METHOD_OTHER }.each do |ffao| %>
+                    <% 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-3 py-2.5 cursor-pointer hover:border-blue-400 has-[:checked]:border-blue-600 has-[:checked]:bg-blue-50 transition">
                         <input type="radio"
                                name="bulk_payment[form_fields][<%= field.id %>]"
diff --git a/app/views/events/public_registrations/_form_field.html.erb b/app/views/events/public_registrations/_form_field.html.erb
index b4c9bff04..6e1cbe22a 100644
--- a/app/views/events/public_registrations/_form_field.html.erb
+++ b/app/views/events/public_registrations/_form_field.html.erb
@@ -72,12 +72,6 @@
         data and store none of their own, so fall back to those when present. %>
     <% radio_options = dynamic_form_field_options(field) ||
          field.form_field_answer_options.includes(:answer_option).map { |ffao| [ ffao.answer_option.name, ffao.answer_option.name ] } %>
-    <%# "Other" is hidden on the payment method field for now (it stays in code/data
-        for the scholarship flow). Keep it only when it's already the selected value
-        so a preset/stored "Other" still renders checked. %>
-    <% if field.field_identifier == "payment_method" %>
-      <% radio_options = radio_options.reject { |_option_label, option_value| option_value == FormBuilderService::PAYMENT_METHOD_OTHER && value != FormBuilderService::PAYMENT_METHOD_OTHER } %>
-    <% end %>
     <% has_specify = radio_options.any? { |option_label, _option_value| specify_placeholder(option_label).present? } %>
     <%= tag.div class: "flex flex-wrap gap-2.5 mt-1", data: (has_specify ? { controller: "specify-option", action: "change->specify-option#update" } : {}) do %>
       <% radio_options.each do |option_label, option_value, option_description| %>
diff --git a/app/views/events/public_registrations/new.html.erb b/app/views/events/public_registrations/new.html.erb
index 6f343ac4d..bf473bd62 100644
--- a/app/views/events/public_registrations/new.html.erb
+++ b/app/views/events/public_registrations/new.html.erb
@@ -122,7 +122,7 @@
             <% else %>
               <% submitted_value = params.dig(:public_registration, :form_fields, field.id.to_s) %>
               <% if submitted_value.blank? && field.field_identifier == "payment_method" %>
-                <% submitted_value = @scholarship ? FormBuilderService::PAYMENT_METHOD_OTHER : FormBuilderService::PAYMENT_METHOD_PAY_NOW %>
+                <% submitted_value = FormBuilderService::PAYMENT_METHOD_PAY_NOW %>
               <% end %>
               <div class="<%= field.grid_span_class %>">
                 <%= render "events/public_registrations/form_field", field: field, value: submitted_value, label: email_label_overrides[field.field_identifier] %>
diff --git a/spec/requests/events/public_registrations_spec.rb b/spec/requests/events/public_registrations_spec.rb
index 58ddc621a..3d46433ff 100644
--- a/spec/requests/events/public_registrations_spec.rb
+++ b/spec/requests/events/public_registrations_spec.rb
@@ -455,17 +455,22 @@ def post_with_scholarship(scholarship_answer)
       field
     end
 
-    it "hides the 'Other' payment method from a normal registrant" do
+    it "does not offer 'Other' as a payment method" do
+      expect(FormBuilderService::PAYMENT_METHOD_OPTIONS).not_to include("Other")
+    end
+
+    it "renders the remaining payment methods without 'Other'" do
       get new_event_public_registration_path(event)
 
       expect(response.body).to include(%(value="Check"))
       expect(response.body).not_to include(%(value="Other"))
     end
 
-    it "keeps 'Other' as the preselected payment method for a scholarship registrant" do
+    it "still shows the payment method (without 'Other') for a scholarship registrant" do
       get new_event_public_registration_path(event, scholarship_requested: "true")
 
-      expect(response.body).to match(/value="Other"[^>]*\bchecked\b/)
+      expect(response.body).to include(%(value="Check"))
+      expect(response.body).not_to include(%(value="Other"))
     end
   end