From a6a69c6b7250ceb1052ebb2d8a93d82999b4a140 Mon Sep 17 00:00:00 2001
From: Tom Teichler <tom.teichler@teckids.org>
Date: Sun, 20 Feb 2022 19:31:41 +0100
Subject: [PATCH] Validate SEPA
---
aleksis/apps/paweljong/forms.py | 7 ++++++-
aleksis/apps/paweljong/templates/paweljong/event/full.html | 6 +++++-
aleksis/apps/paweljong/views.py | 3 ---
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/aleksis/apps/paweljong/forms.py b/aleksis/apps/paweljong/forms.py
index 2ae4ed7..e9c98a2 100644
--- a/aleksis/apps/paweljong/forms.py
+++ b/aleksis/apps/paweljong/forms.py
@@ -248,7 +248,7 @@ class RegisterEventContactDetails(ExtensibleForm):
email = forms.EmailField(
label=_("Email address"),
- help_text=_("Please use your perosnal e-mail address here, which you will check "
+ help_text=_("Please use your personal e-mail address here, which you will check "
"personally. Important information will always be sent to your parents "
"as well. Do not use an e-mail address owned by your parents here."),
)
@@ -322,6 +322,11 @@ class RegisterEventFinancial(ExtensibleForm):
required=False,
)
+ def clean(self):
+ if self.cleaned_data["accept_sepa"]:
+ if not self.cleaned_data["iban"]:
+ raise forms.ValidationError(_("Please enter your IBAN"))
+
class Meta:
model = EventRegistration
fields = ["voucher_code", "iban", "donation", "accept_sepa"]
diff --git a/aleksis/apps/paweljong/templates/paweljong/event/full.html b/aleksis/apps/paweljong/templates/paweljong/event/full.html
index 49cec6e..bfa967f 100644
--- a/aleksis/apps/paweljong/templates/paweljong/event/full.html
+++ b/aleksis/apps/paweljong/templates/paweljong/event/full.html
@@ -54,7 +54,11 @@
</div>
</div>
<div class="card-action">
- <a href="{% url "register_event_by_slug_start" event.linked_group.short_name %}">{% trans "Register now" %}</a>
+ {% if can_register %}
+ <a href="{% url "register_event_by_slug_start" event.linked_group.short_name %}">{% trans "Register now" %}</a>
+ {% else %}
+ <a href="#">{% trans "Not available" %}</a>
+ {% endif %}
</div>
</div>
diff --git a/aleksis/apps/paweljong/views.py b/aleksis/apps/paweljong/views.py
index f76d22f..cafc5ab 100644
--- a/aleksis/apps/paweljong/views.py
+++ b/aleksis/apps/paweljong/views.py
@@ -379,9 +379,6 @@ class RegisterEventWizardView(SessionWizardView):
{
"first_name": person.first_name,
"last_name": person.last_name,
- "school": person.school,
- "school_place": person.school_place,
- "school_class": person.school_class,
"mobile_number": person.mobile_number,
"email": person.email,
"street": person.street,
--
GitLab