Add the sub provider field to UI (#1173)

* add the sub provider field to user forms

* make the field only visble when needed

* have the label be a set name

* make the field required when it is shown

* make labels default again

* final fix

Author: lodewiges

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

app/views/users/_edit_sofia_account_modal.html.erb

@@ -21,6 +21,9 @@
                   <%= f.input :name, label: 'Naam', placeholder: 'Naam', required: true %>
                 <% 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();' } %>
+                <% end %>
                 <% if current_user.treasurer? %>
                   <div class="row">
                     <div class="col-lg-3">

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">

config/application.rb

@@ -75,6 +75,8 @@ 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', nil)
     config.x.deposit_button_enabled = ENV.fetch('DEPOSIT_BUTTON_ENABLED', 'true') == 'true'
 
     config.x.min_payment_amount   = [ENV.fetch('MIN_PAYMENT_AMOUNT', '21.8').to_f, 0.01].max