Add missing fields to sac membership config, fix translations

hitobito · May 23, 2024 · 6087bcb · 6087bcb
1 parent 2b9238e
commit 6087bcb
Show file tree

Hide file tree

Showing 8 changed files with 64 additions and 8 deletions.
diff --git a/app/components/sac_membership_configs/article_number_field_rows_component.rb b/app/components/sac_membership_configs/article_number_field_rows_component.rb
@@ -14,6 +14,9 @@ def initialize(form:, attrs: [])
                 :sac_entry_fee_article_number,
                 :hut_solidarity_fee_article_number,
                 :magazine_fee_article_number,
+                :magazine_postage_abroad_article_number,
+                :section_fee_article_number,
+                :section_entry_fee_article_number,
                 :section_bulletin_postage_abroad_article_number,
                 :service_fee_article_number,
                 :balancing_payment_article_number,

diff --git a/app/components/sac_membership_configs/field_rows_component.html.haml b/app/components/sac_membership_configs/field_rows_component.html.haml
@@ -2,7 +2,7 @@
   - @attrs.each do |attr|
     .row
       .col-3.p-1
-        = human_attribute_name(attr)
+        = t("#{model_class_plural}.form.#{attr}")
       .col-3.p-1
         .input-group.input-group-sm
           = @form.input_field attr

diff --git a/app/components/sac_membership_configs/field_rows_component.rb b/app/components/sac_membership_configs/field_rows_component.rb
@@ -25,8 +25,8 @@ def years?(attr)
       attr.to_s.match?(/_age|_years/)
     end
 
-    def human_attribute_name(attr)
-      model_class.human_attribute_name(attr)
+    def model_class_plural
+      model_class.to_s.underscore.pluralize
     end
 
   end

diff --git a/app/models/sac_membership_config.rb b/app/models/sac_membership_config.rb
@@ -53,11 +53,8 @@ class SacMembershipConfig < ApplicationRecord
   attr_readonly :valid_from
 
   # date format: 1.7., 1.10.
-  with_options format: { with: /\A[0123]?\d\.[012]?\d\.\z/ } do
-    validates :discount_date_1
-    validates :discount_date_2
-    validates :discount_date_3
-  end
+  validates :discount_date_1, :discount_date_2, :discount_date_3,
+    format: { with: /\A[0123]?\d\.[012]?\d\.\z/ }, allow_blank: true
 
   def to_s
     valid_from

diff --git a/config/locales/wagon.de.yml b/config/locales/wagon.de.yml
@@ -257,6 +257,9 @@ de:
         sac_entry_fee_article_number: Zentralverbandseintrittsgebühren, Artikelnummer
         hut_solidarity_fee_article_number: Hüttensolidaritätsbeitrag, Artikelnummer
         magazine_fee_article_number: Abogebühr SAC Magazin, Artikelnummer
+        magazine_postage_abroad_article_number: Porto Ausland SAC Magazin, Artikelnummer
+        section_entry_fee_article_number: Sektionseintrittsgebühren, Artikelnummer
+        section_fee_article_number: Sektionsbeitrag, Artikelnummer
         section_bulletin_postage_abroad_article_number: Porto Ausland Sektionsbulletin, Artikelnummer
         service_fee_article_number: Servicegebühr, Artikelnummer
         balancing_payment_article_number: Sektionseintrittsgebühren, Artikelnummer
@@ -864,6 +867,28 @@ de:
       discount_date: Ab Datum
       discount: Rabatt
       article_numbers: Artikelnummern Abacus
+      valid_from: Gültig ab Jahr
+      service_fee: Dienstleistungsgebühr
+      magazine_postage_abroad: Porto Ausland SAC Magazin
+      reduction_amount: Reduktionsbetrag
+      reduction_required_membership_years: Reduktion ab Mitgliedsjahren
+      sac_fee_article_number: Zentralverbandsbeitrag
+      sac_entry_fee_article_number: Zentralverbandseintrittsgebühren
+      hut_solidarity_fee_article_number: Hüttensolidaritätsbeitrag
+      magazine_fee_article_number: Abogebühr SAC Magazin
+      magazine_postage_abroad_article_number: Porto Ausland SAC Magazin
+      section_entry_fee_article_number: Sektionseintrittsgebühren
+      section_fee_article_number: Sektionsbeitrag
+      section_bulletin_postage_abroad_article_number: Porto Ausland Sektionsbulletin
+      service_fee_article_number: Servicegebühr
+      balancing_payment_article_number: Sektionseintrittsgebühren
+      course_fee_article_number: Porto Ausland Sektionsbulletin
+      discount_date_1: Rabattdatum 1
+      discount_percent_1: Rabattprozent 1
+      discount_date_2: Rabattdatum 2
+      discount_percent_2: Rabattprozent 2
+      discount_date_3: Rabattdatum 3
+      discount_percent_3: Rabattprozent 3
     global:
       link:
         add: Neu
@@ -878,6 +903,15 @@ de:
       entry_fee: Eintrittsgebühr
       bulletin_fee: Abogebühr Sektionsbulletin
       reductions: Reduktionen
+      valid_from: Gültig ab Jahr
+      bulletin_postage_abroad: Porto Ausland Sektionsbulletin
+      sac_fee_exemption_for_honorary_members: Zentralverbandsgebührenerlass für Ehrenmitglieder
+      sac_section_fee_exemption_for_honorary_members: Sektionsgebührenerlass für Ehrenmitglieder
+      sac_fee_exemption_for_benefited_members: Zentralverbandsgebührenerlass für Begünstigte
+      sac_section_fee_exemption_for_benefited_members: Sektionsgebührenerlass für Begünstigte
+      reduction_amount: Reduktionsbetrag Mitgliedsjahre/Alter
+      reduction_required_membership_years: Reduktion ab Mitgliedsjahren
+      reduction_required_age: Reduktion ab Altersjahren
     global:
       link:
         add: Neu
diff --git a/db/migrate/20240521141824_change_sac_membership_configs.rb b/db/migrate/20240521141824_change_sac_membership_configs.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+#  copyright (c) 2024, schweizer alpen-club. this file is part of
+#  hitobito_sac_cas and licensed under the affero general public license version 3
+#  or later. see the copying file at the top-level directory or at
+#  https://github.com/hitobito/hitobito_sac_cas.
+
+class ChangeSacMembershipConfigs < ActiveRecord::Migration[6.1]
+
+  def change
+    add_column :sac_membership_configs, :magazine_postage_abroad_article_number, :string, null: true
+    add_column :sac_membership_configs, :section_entry_fee_article_number, :string, null: true
+    add_column :sac_membership_configs, :section_fee_article_number, :string, null: true
+  end
+
+end
diff --git a/db/seeds/development/3_sac_membership_configs.rb b/db/seeds/development/3_sac_membership_configs.rb
@@ -36,6 +36,9 @@
                               sac_entry_fee_article_number: 43,
                               hut_solidarity_fee_article_number: 44,
                               magazine_fee_article_number: 45,
+                              magazine_postage_abroad_article_number: 99,
+                              section_fee_article_number: 98,
+                              section_entry_fee_article_number: 97,
                               section_bulletin_postage_abroad_article_number: 46,
                               service_fee_article_number: 47,
                               balancing_payment_article_number: 48,

diff --git a/spec/fixtures/sac_membership_configs.yml b/spec/fixtures/sac_membership_configs.yml
@@ -75,6 +75,9 @@
   sac_entry_fee_article_number: 43
   hut_solidarity_fee_article_number: 44
   magazine_fee_article_number: 45
+  magazine_postage_abroad_article_number: 99
+  section_fee_article_number: 98
+  section_entry_fee_article_number: 97
   section_bulletin_postage_abroad_article_number: 46
   service_fee_article_number: 47
   balancing_payment_article_number: 48