From 17238cce13fb189083ef30450d7ce20f9d6434c2 Mon Sep 17 00:00:00 2001
From: Lodewiges <jamestreeg@gmail.com>
Date: Fri, 12 Dec 2025 13:42:25 +0100
Subject: [PATCH 1/6] add the sub provider field to user forms

---
 app/controllers/users_controller.rb                    | 4 ++--
 app/views/users/_edit_sofia_account_modal.html.erb     | 1 +
 app/views/users/_new_sofia_account_user_modal.html.erb | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index a68b689c4..603f168c6 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -140,7 +140,7 @@ def update_with_sofia_account # rubocop:disable Metrics/AbcSize, Metrics/MethodL
     end
     authorize @sofia_account
 
-    if @user.update(params.require(:user).permit(%i[email] + (current_user.treasurer? ? %i[name deactivated] : []),
+    if @user.update(params.require(:user).permit(%i[email sub_provider] + (current_user.treasurer? ? %i[name deactivated] : []),
                                                  sofia_account_attributes: %i[id username]))
       flash[:success] = 'Gegevens gewijzigd'
     else
@@ -167,6 +167,6 @@ def find_or_create_user(user_json) # rubocop:disable Metrics/AbcSize, Metrics/Me
   end
 
   def permitted_attributes
-    params.require(:user).permit(%w[name email provider])
+    params.require(:user).permit(%w[name email provider sub_provider])
   end
 end
diff --git a/app/views/users/_edit_sofia_account_modal.html.erb b/app/views/users/_edit_sofia_account_modal.html.erb
index 3d8a50a5f..a44886eee 100644
--- a/app/views/users/_edit_sofia_account_modal.html.erb
+++ b/app/views/users/_edit_sofia_account_modal.html.erb
@@ -21,6 +21,7 @@
                   <%= f.input :name, label: 'Naam', placeholder: 'Naam', required: true %>
                 <% end %>
                 <%= f.input :email, label: 'E-mailadres', placeholder: 'E-mailadres', required: true %>
+                <%= f.input :sub_provider, label: 'Subprovider', placeholder: 'Subprovider', input_html: { style: 'text-transform: uppercase;', onkeyup: 'this.value = this.value.toUpperCase();' } %>
                 <% if current_user.treasurer? %>
                   <div class="row">
                     <div class="col-lg-3">
diff --git a/app/views/users/_new_sofia_account_user_modal.html.erb b/app/views/users/_new_sofia_account_user_modal.html.erb
index 5cc5b1d08..8a3450db5 100644
--- a/app/views/users/_new_sofia_account_user_modal.html.erb
+++ b/app/views/users/_new_sofia_account_user_modal.html.erb
@@ -13,6 +13,7 @@
         <div class="modal-body" id="activities_modal">
           <%= f.input :name, label: 'Naam', placeholder: 'Naam', required: true %>
           <%= f.input :email, label: 'E-mailadres', placeholder: 'E-mailadres', required: true %>
+          <%= f.input :sub_provider, label: 'Subprovider', placeholder: 'Subprovider', input_html: { style: 'text-transform: uppercase;', onkeyup: 'this.value = this.value.toUpperCase();' } %>
         </div>
 
         <div class="modal-footer">

From f30dad9dfd44bf92932e4afac9433e69964ab0b3 Mon Sep 17 00:00:00 2001
From: Lodewiges <jamestreeg@gmail.com>
Date: Thu, 18 Dec 2025 15:48:13 +0100
Subject: [PATCH 2/6] make the field only visble when needed

---
 app/views/users/_edit_sofia_account_modal.html.erb     | 4 +++-
 app/views/users/_new_sofia_account_user_modal.html.erb | 4 +++-
 config/application.rb                                  | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/views/users/_edit_sofia_account_modal.html.erb b/app/views/users/_edit_sofia_account_modal.html.erb
index a44886eee..f1f0a8022 100644
--- a/app/views/users/_edit_sofia_account_modal.html.erb
+++ b/app/views/users/_edit_sofia_account_modal.html.erb
@@ -21,7 +21,9 @@
                   <%= f.input :name, label: 'Naam', placeholder: 'Naam', required: true %>
                 <% end %>
                 <%= f.input :email, label: 'E-mailadres', placeholder: 'E-mailadres', required: true %>
-                <%= f.input :sub_provider, label: 'Subprovider', placeholder: 'Subprovider', input_html: { style: 'text-transform: uppercase;', onkeyup: 'this.value = this.value.toUpperCase();' } %>
+                <% if Rails.application.config.x.subprovider_label.present? %>
+                  <%= f.input :sub_provider, label: Rails.application.config.x.subprovider_label, placeholder: Rails.application.config.x.subprovider_label, input_html: { style: 'text-transform: uppercase;', onkeyup: 'this.value = this.value.toUpperCase();' } %>
+                <% end %>
                 <% if current_user.treasurer? %>
                   <div class="row">
                     <div class="col-lg-3">
diff --git a/app/views/users/_new_sofia_account_user_modal.html.erb b/app/views/users/_new_sofia_account_user_modal.html.erb
index 8a3450db5..a69bf9b4d 100644
--- a/app/views/users/_new_sofia_account_user_modal.html.erb
+++ b/app/views/users/_new_sofia_account_user_modal.html.erb
@@ -13,7 +13,9 @@
         <div class="modal-body" id="activities_modal">
           <%= f.input :name, label: 'Naam', placeholder: 'Naam', required: true %>
           <%= f.input :email, label: 'E-mailadres', placeholder: 'E-mailadres', required: true %>
-          <%= f.input :sub_provider, label: 'Subprovider', placeholder: 'Subprovider', input_html: { style: 'text-transform: uppercase;', onkeyup: 'this.value = this.value.toUpperCase();' } %>
+          <% if Rails.application.config.x.subprovider_label.present? %>
+            <%= f.input :sub_provider, label: Rails.application.config.x.subprovider_label, placeholder: Rails.application.config.x.subprovider_label, input_html: { style: 'text-transform: uppercase;', onkeyup: 'this.value = this.value.toUpperCase();' } %>
+          <% end %>
         </div>
 
         <div class="modal-footer">
diff --git a/config/application.rb b/config/application.rb
index 8e3f90712..04a7dc544 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -75,6 +75,7 @@ class Application < Rails::Application
     config.x.site_short_name      = ENV.fetch('SITE_SHORT_NAME', 'SOFIA')
     config.x.site_long_name       = ENV.fetch('SITE_LONG_NAME', 'Streepsysteem voor de Ordentelijke Festiviteiten van Inleggend Alpha')
     config.x.site_association     = ENV.fetch('SITE_ASSOCIATION', 'C.S.V. Alpha')
+    config.x.subprovider_label    = ENV.fetch('SUBPROVIDER_LABEL', 'Subprovider')
 
     config.x.min_payment_amount   = [ENV.fetch('MIN_PAYMENT_AMOUNT', '21.8').to_f, 0.01].max
 

From d0b9037c0fbbae1e3f26e09c92db32f263eb035a Mon Sep 17 00:00:00 2001
From: Lodewiges <jamestreeg@gmail.com>
Date: Thu, 18 Dec 2025 15:56:13 +0100
Subject: [PATCH 3/6] have the label be a set name

---
 app/views/users/_edit_sofia_account_modal.html.erb     | 2 +-
 app/views/users/_new_sofia_account_user_modal.html.erb | 2 +-
 config/application.rb                                  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/users/_edit_sofia_account_modal.html.erb b/app/views/users/_edit_sofia_account_modal.html.erb
index f1f0a8022..79054f00e 100644
--- a/app/views/users/_edit_sofia_account_modal.html.erb
+++ b/app/views/users/_edit_sofia_account_modal.html.erb
@@ -22,7 +22,7 @@
                 <% end %>
                 <%= f.input :email, label: 'E-mailadres', placeholder: 'E-mailadres', required: true %>
                 <% if Rails.application.config.x.subprovider_label.present? %>
-                  <%= f.input :sub_provider, label: Rails.application.config.x.subprovider_label, placeholder: Rails.application.config.x.subprovider_label, input_html: { style: 'text-transform: uppercase;', onkeyup: 'this.value = this.value.toUpperCase();' } %>
+                  <%= f.input :sub_provider, label: "SubProvider", placeholder: Rails.application.config.x.subprovider_label, input_html: { style: 'text-transform: uppercase;', onkeyup: 'this.value = this.value.toUpperCase();' } %>
                 <% end %>
                 <% if current_user.treasurer? %>
                   <div class="row">
diff --git a/app/views/users/_new_sofia_account_user_modal.html.erb b/app/views/users/_new_sofia_account_user_modal.html.erb
index a69bf9b4d..eb60259e9 100644
--- a/app/views/users/_new_sofia_account_user_modal.html.erb
+++ b/app/views/users/_new_sofia_account_user_modal.html.erb
@@ -14,7 +14,7 @@
           <%= f.input :name, label: 'Naam', placeholder: 'Naam', required: true %>
           <%= f.input :email, label: 'E-mailadres', placeholder: 'E-mailadres', required: true %>
           <% if Rails.application.config.x.subprovider_label.present? %>
-            <%= f.input :sub_provider, label: Rails.application.config.x.subprovider_label, placeholder: Rails.application.config.x.subprovider_label, input_html: { style: 'text-transform: uppercase;', onkeyup: 'this.value = this.value.toUpperCase();' } %>
+            <%= f.input :sub_provider, label: "SubProvider", placeholder: Rails.application.config.x.subprovider_label, input_html: { style: 'text-transform: uppercase;', onkeyup: 'this.value = this.value.toUpperCase();' } %>
           <% end %>
         </div>
 
diff --git a/config/application.rb b/config/application.rb
index 04a7dc544..29040d138 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -75,7 +75,7 @@ class Application < Rails::Application
     config.x.site_short_name      = ENV.fetch('SITE_SHORT_NAME', 'SOFIA')
     config.x.site_long_name       = ENV.fetch('SITE_LONG_NAME', 'Streepsysteem voor de Ordentelijke Festiviteiten van Inleggend Alpha')
     config.x.site_association     = ENV.fetch('SITE_ASSOCIATION', 'C.S.V. Alpha')
-    config.x.subprovider_label    = ENV.fetch('SUBPROVIDER_LABEL', 'Subprovider')
+    config.x.subprovider_label    = ENV.fetch('SUBPROVIDER_LABEL', nil)
 
     config.x.min_payment_amount   = [ENV.fetch('MIN_PAYMENT_AMOUNT', '21.8').to_f, 0.01].max
 

From 11cc361a97c1275a0a535f7c92835f0a380a9907 Mon Sep 17 00:00:00 2001
From: Lodewiges <jamestreeg@gmail.com>
Date: Thu, 18 Dec 2025 16:02:16 +0100
Subject: [PATCH 4/6] make the field required when it is shown

---
 app/views/users/_edit_sofia_account_modal.html.erb     | 2 +-
 app/views/users/_new_sofia_account_user_modal.html.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/users/_edit_sofia_account_modal.html.erb b/app/views/users/_edit_sofia_account_modal.html.erb
index 79054f00e..1ad47dfb2 100644
--- a/app/views/users/_edit_sofia_account_modal.html.erb
+++ b/app/views/users/_edit_sofia_account_modal.html.erb
@@ -22,7 +22,7 @@
                 <% end %>
                 <%= f.input :email, label: 'E-mailadres', placeholder: 'E-mailadres', required: true %>
                 <% if Rails.application.config.x.subprovider_label.present? %>
-                  <%= f.input :sub_provider, label: "SubProvider", placeholder: Rails.application.config.x.subprovider_label, input_html: { style: 'text-transform: uppercase;', onkeyup: 'this.value = this.value.toUpperCase();' } %>
+                  <%= f.input :sub_provider, label: Rails.application.config.x.subprovider_label, placeholder: Rails.application.config.x.subprovider_label, required: true, input_html: { style: 'text-transform: uppercase;', onkeyup: 'this.value = this.value.toUpperCase();' } %>
                 <% end %>
                 <% if current_user.treasurer? %>
                   <div class="row">
diff --git a/app/views/users/_new_sofia_account_user_modal.html.erb b/app/views/users/_new_sofia_account_user_modal.html.erb
index eb60259e9..4dd6c7cd5 100644
--- a/app/views/users/_new_sofia_account_user_modal.html.erb
+++ b/app/views/users/_new_sofia_account_user_modal.html.erb
@@ -14,7 +14,7 @@
           <%= f.input :name, label: 'Naam', placeholder: 'Naam', required: true %>
           <%= f.input :email, label: 'E-mailadres', placeholder: 'E-mailadres', required: true %>
           <% if Rails.application.config.x.subprovider_label.present? %>
-            <%= f.input :sub_provider, label: "SubProvider", placeholder: Rails.application.config.x.subprovider_label, input_html: { style: 'text-transform: uppercase;', onkeyup: 'this.value = this.value.toUpperCase();' } %>
+            <%= f.input :sub_provider, label: Rails.application.config.x.subprovider_label, placeholder: Rails.application.config.x.subprovider_label, required: true, input_html: { style: 'text-transform: uppercase;', onkeyup: 'this.value = this.value.toUpperCase();' } %>
           <% end %>
         </div>
 

From 7e3b6358a3a9641e8852f98501d8f4c9219d6cbe Mon Sep 17 00:00:00 2001
From: Lodewiges <jamestreeg@gmail.com>
Date: Thu, 18 Dec 2025 16:06:30 +0100
Subject: [PATCH 5/6] make labels default again

---
 app/views/users/_edit_sofia_account_modal.html.erb     | 2 +-
 app/views/users/_new_sofia_account_user_modal.html.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/users/_edit_sofia_account_modal.html.erb b/app/views/users/_edit_sofia_account_modal.html.erb
index 1ad47dfb2..fd31f4acd 100644
--- a/app/views/users/_edit_sofia_account_modal.html.erb
+++ b/app/views/users/_edit_sofia_account_modal.html.erb
@@ -22,7 +22,7 @@
                 <% end %>
                 <%= f.input :email, label: 'E-mailadres', placeholder: 'E-mailadres', required: true %>
                 <% if Rails.application.config.x.subprovider_label.present? %>
-                  <%= f.input :sub_provider, label: Rails.application.config.x.subprovider_label, placeholder: Rails.application.config.x.subprovider_label, required: true, input_html: { style: 'text-transform: uppercase;', onkeyup: 'this.value = this.value.toUpperCase();' } %>
+                  <%= f.input :sub_provider, label: "SubProvider", placeholder: Rails.application.config.x.subprovider_label, required: true, input_html: { style: 'text-transform: uppercase;', onkeyup: 'this.value = this.value.toUpperCase();' } %>
                 <% end %>
                 <% if current_user.treasurer? %>
                   <div class="row">
diff --git a/app/views/users/_new_sofia_account_user_modal.html.erb b/app/views/users/_new_sofia_account_user_modal.html.erb
index 4dd6c7cd5..766c2cc82 100644
--- a/app/views/users/_new_sofia_account_user_modal.html.erb
+++ b/app/views/users/_new_sofia_account_user_modal.html.erb
@@ -14,7 +14,7 @@
           <%= f.input :name, label: 'Naam', placeholder: 'Naam', required: true %>
           <%= f.input :email, label: 'E-mailadres', placeholder: 'E-mailadres', required: true %>
           <% if Rails.application.config.x.subprovider_label.present? %>
-            <%= f.input :sub_provider, label: Rails.application.config.x.subprovider_label, placeholder: Rails.application.config.x.subprovider_label, required: true, input_html: { style: 'text-transform: uppercase;', onkeyup: 'this.value = this.value.toUpperCase();' } %>
+            <%= f.input :sub_provider, label: "SubProvider", placeholder: Rails.application.config.x.subprovider_label, required: true, input_html: { style: 'text-transform: uppercase;', onkeyup: 'this.value = this.value.toUpperCase();' } %>
           <% end %>
         </div>
 

From 40443e26629c3a20da6e1557e9264fad93c79ecf Mon Sep 17 00:00:00 2001
From: Lodewiges <jamestreeg@gmail.com>
Date: Thu, 18 Dec 2025 16:29:22 +0100
Subject: [PATCH 6/6] final fix

---
 app/views/users/_edit_sofia_account_modal.html.erb     | 2 +-
 app/views/users/_modal.html.erb                        | 3 +++
 app/views/users/_new_sofia_account_user_modal.html.erb | 3 ---
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/users/_edit_sofia_account_modal.html.erb b/app/views/users/_edit_sofia_account_modal.html.erb
index fd31f4acd..224d9894c 100644
--- a/app/views/users/_edit_sofia_account_modal.html.erb
+++ b/app/views/users/_edit_sofia_account_modal.html.erb
@@ -22,7 +22,7 @@
                 <% end %>
                 <%= f.input :email, label: 'E-mailadres', placeholder: 'E-mailadres', required: true %>
                 <% if Rails.application.config.x.subprovider_label.present? %>
-                  <%= f.input :sub_provider, label: "SubProvider", placeholder: Rails.application.config.x.subprovider_label, required: true, input_html: { style: 'text-transform: uppercase;', onkeyup: 'this.value = this.value.toUpperCase();' } %>
+                  <%= f.input :sub_provider, label: 'SubProvider', placeholder: Rails.application.config.x.subprovider_label, required: true, input_html: { style: 'text-transform: uppercase;', onkeyup: 'this.value = this.value.toUpperCase();' } %>
                 <% end %>
                 <% if current_user.treasurer? %>
                   <div class="row">
diff --git a/app/views/users/_modal.html.erb b/app/views/users/_modal.html.erb
index a7fce21ef..eec49e112 100644
--- a/app/views/users/_modal.html.erb
+++ b/app/views/users/_modal.html.erb
@@ -13,6 +13,9 @@
         <div class="modal-body" id="activities_modal">
           <%= f.input :name, label: 'Naam', placeholder: 'Naam', required: true %>
           <%= f.input :email, label: 'E-mailadres', placeholder: 'E-mailadres' %>
+          <% if Rails.application.config.x.subprovider_label.present? %>
+            <%= f.input :sub_provider, label: 'Subprovider', placeholder: Rails.application.config.x.subprovider_label, required: true, input_html: { style: 'text-transform: uppercase;', onkeyup: 'this.value = this.value.toUpperCase();' } %>
+          <% end %>
           <% if @new_user.persisted? %>
             <div class="row">
               <div class="col-lg-3">
diff --git a/app/views/users/_new_sofia_account_user_modal.html.erb b/app/views/users/_new_sofia_account_user_modal.html.erb
index 766c2cc82..5cc5b1d08 100644
--- a/app/views/users/_new_sofia_account_user_modal.html.erb
+++ b/app/views/users/_new_sofia_account_user_modal.html.erb
@@ -13,9 +13,6 @@
         <div class="modal-body" id="activities_modal">
           <%= f.input :name, label: 'Naam', placeholder: 'Naam', required: true %>
           <%= f.input :email, label: 'E-mailadres', placeholder: 'E-mailadres', required: true %>
-          <% if Rails.application.config.x.subprovider_label.present? %>
-            <%= f.input :sub_provider, label: "SubProvider", placeholder: Rails.application.config.x.subprovider_label, required: true, input_html: { style: 'text-transform: uppercase;', onkeyup: 'this.value = this.value.toUpperCase();' } %>
-          <% end %>
         </div>
 
         <div class="modal-footer">