Update abo_basic_login wizard form

app/models/wizards/steps/signup/abo_basic_login/person_fields.rb

@@ -7,10 +7,11 @@
 
 module Wizards::Steps::Signup::AboBasicLogin
  class PersonFields < Wizards::Steps::Signup::PersonFields
+ def self.agreements = [:data_protection]
+
  include Wizards::Steps::Signup::AgreementFields
 
  NON_ASSIGNABLE_ATTRS = Wizards::Steps::Signup::AgreementFields::AGREEMENTS + [:newsletter]
- self.partial = "wizards/steps/signup/person_fields"
 
  def requires_adult_consent? = false
 

app/models/wizards/steps/signup/abo_touren_portal/person_fields.rb

@@ -6,11 +6,19 @@
 # https://github.com/hitobito/hitobito_sac_cas.
 
 module Wizards::Steps::Signup::AboTourenPortal
- class PersonFields < Wizards::Steps::Signup::AboBasicLogin::PersonFields
+ class PersonFields < Wizards::Steps::Signup::PersonFields
+ include Wizards::Steps::Signup::AgreementFields
+
  self.minimum_age = 18
  self.partial = "wizards/steps/signup/person_fields"
 
  validates :street, :housenumber, :town, :zip_code,
  :country, :phone_number, presence: true
+
+ def requires_adult_consent? = false
+
+ def person_attributes
+ super.except(*Wizards::Steps::Signup::AboBasicLogin::PersonFields::NON_ASSIGNABLE_ATTRS)
+ end
  end
 end

app/models/wizards/steps/signup/agreement_fields.rb

@@ -9,20 +9,16 @@ module Wizards::Steps::Signup
  module AgreementFields
  extend ActiveSupport::Concern
 
- AGREEMENTS = [
- :statutes,
- :data_protection
- ].freeze
+ AGREEMENTS = %i[statutes data_protection].freeze
 
  included do
- include Rails.application.routes.url_helpers
+ class_attribute :agreements, default: AGREEMENTS unless respond_to?(:agreements)
+ attribute :newsletter, :boolean
 
- AGREEMENTS.each do |agreement|
+ agreements.each do |agreement|
  attribute agreement, :boolean, default: false
  validates agreement, acceptance: true
  end
-
- attribute :newsletter, :boolean
  end
 
  def link_translations(key)

app/views/wizards/steps/signup/abo_basic_login/_person_fields.html.haml

@@ -0,0 +1,6 @@
+-# 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.
+
+= render 'wizards/steps/signup/person_fields', c:

config/locales/wagon.de.yml

@@ -1548,6 +1548,9 @@ de:
  agreement_fields:
  adult_consent_caption: Ich bestätige, dass ich mindestens 18 Jahre alt bin oder das Einverständnis meiner Erziehungsberechtigten habe
  newsletter_caption: Ich möchte einen Newsletter abonnieren
+ abo_basic_login:
+ person_fields:
+ next_button: SAC-KONTO ERSTELLEN
  abo_magazin:
  issues_from_field_title: Abo
  issues_from_field:

spec/features/signup/abo_basic_login_spec.rb

@@ -24,7 +24,6 @@ def complete_main_person_form
  fill_in "Telefon", with: "+41 79 123 45 56"
  fill_in "wizards_signup_abo_basic_login_wizard_person_fields_zip_code", with: "8000"
  fill_in "wizards_signup_abo_basic_login_wizard_person_fields_town", with: "Zürich"
- check "Ich habe die Statuten gelesen und stimme diesen zu"
  check "Ich habe die Datenschutzerklärung gelesen und stimme diesen zu"
  end
 
@@ -44,18 +43,18 @@ def expect_validation_error(message)
  allow(Truemail).to receive(:valid?).with("[email protected]").and_return(false)
  visit group_self_registration_path(group_id: group.id)
  fill_in "E-Mail", with: "[email protected]"
- click_on "Weiter"
+ click_button "Weiter"
  expect_active_step("E-Mail")
  expect_validation_error("E-Mail ist nicht gültig")
  end
 
  it "creates person" do
  visit group_self_registration_path(group_id: group.id)
  fill_in "E-Mail", with: "[email protected]"
- click_on "Weiter"
+ click_button "Weiter"
  complete_main_person_form
  expect do
- click_on "Registrieren"
+ click_button "SAC-KONTO ERSTELLEN"
  expect(page).to have_css "#error_explanation, #flash > .alert"
  end.to change { Person.count }.by(1)
  expect(Person.last.roles.last.delete_on).not_to be_nil
@@ -64,12 +63,12 @@ def expect_validation_error(message)
  it "subscribes to mailinglist" do
  visit group_self_registration_path(group_id: group)
  fill_in "E-Mail", with: "[email protected]"
- click_on "Weiter"
+ click_button "Weiter"
  complete_main_person_form
  check "Ich möchte einen Newsletter abonnieren"
 
  expect do
- click_on "Registrieren"
+ click_button "SAC-KONTO ERSTELLEN"
  expect(page).to have_css "#error_explanation, #flash > .alert"
  end.to change { Person.count }.by(1)
 
@@ -84,12 +83,12 @@ def expect_validation_error(message)
  it "opts out of mailinglist" do
  visit group_self_registration_path(group_id: group)
  fill_in "E-Mail", with: "[email protected]"
- click_on "Weiter"
+ click_button "Weiter"
  complete_main_person_form
  uncheck "Ich möchte einen Newsletter abonnieren"
 
  expect do
- click_on "Registrieren"
+ click_button "SAC-KONTO ERSTELLEN"
  expect(page).to have_css "#error_explanation, #flash > .alert"
  end.to change { Person.count }.by(1)