From 9eb6edb37d65365850e2dc43d8a91c27b81133f3 Mon Sep 17 00:00:00 2001 From: Ehouarn Date: Thu, 29 May 2025 23:15:33 +0200 Subject: [PATCH] =?UTF-8?q?Probl=C3=A8me=20de=20membership=20fee?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/wei/templates/wei/base.html | 15 ++++----------- apps/wei/views.py | 1 + 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/apps/wei/templates/wei/base.html b/apps/wei/templates/wei/base.html index 43d61797..1a710cb7 100644 --- a/apps/wei/templates/wei/base.html +++ b/apps/wei/templates/wei/base.html @@ -40,19 +40,12 @@ SPDX-License-Identifier: GPL-3.0-or-later
{% trans 'membership fee'|capfirst %}
{{ club.membership_fee_paid|pretty_money }}
{% else %} - {% with bde_kfet_fee=club.parent_club.membership_fee_paid|add:club.parent_club.parent_club.membership_fee_paid %} -
{% trans 'WEI fee (paid students)'|capfirst %}
-
{{ club.membership_fee_paid|add:bde_kfet_fee|pretty_money }} -
- {% endwith %} - {% with bde_kfet_fee=club.parent_club.membership_fee_unpaid|add:club.parent_club.parent_club.membership_fee_unpaid %} +
{% trans 'WEI fee (paid students)'|capfirst %}
+
{{ club.membership_fee_paid|pretty_money }} +
{% trans 'WEI fee (unpaid students)'|capfirst %}
-
{{ club.membership_fee_unpaid|add:bde_kfet_fee|pretty_money }} -
- {% endwith %} +
{{ club.membership_fee_unpaid|pretty_money }} {% endif %} {% endif %} diff --git a/apps/wei/views.py b/apps/wei/views.py index 67d4eee7..99244846 100644 --- a/apps/wei/views.py +++ b/apps/wei/views.py @@ -885,6 +885,7 @@ class WEIValidateRegistrationView(ProtectQuerysetMixin, ProtectedCreateView): user=registration.user, club=registration.wei, date_start=registration.wei.date_start, + fee=registration.wei.membership_fee_paid if registration.user.profile.paid else registration.wei.membership_fee_unpaid, # Add any fields needed for proper permission checking registration=registration, )