From 8cf9dfb9b9ec3566f3c9625715696b6db122c3e5 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Mon, 14 Jun 2021 21:43:04 +0200 Subject: [PATCH] Reduce complexity of the validation of a user, add verbosity in comments Signed-off-by: Yohann D'ANELLO --- apps/registration/views.py | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/apps/registration/views.py b/apps/registration/views.py index d8238975..312aa526 100644 --- a/apps/registration/views.py +++ b/apps/registration/views.py @@ -282,20 +282,19 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin, fee = 0 bde = Club.objects.get(name="BDE") bde_fee = bde.membership_fee_paid if user.profile.paid else bde.membership_fee_unpaid - if join_bde: - fee += bde_fee + # This is mandatory. + fee += bde_fee if join_bde else 0 kfet = Club.objects.get(name="Kfet") kfet_fee = kfet.membership_fee_paid if user.profile.paid else kfet.membership_fee_unpaid - if join_kfet: - fee += kfet_fee + # Add extra fee for the full membership + fee += kfet_fee if join_kfet else 0 - if soge: - # If the bank pays, then we don't credit now. Treasurers will validate the transaction - # and credit the note later. - credit_type = None + # If the bank pays, then we don't credit now. Treasurers will validate the transaction + # and credit the note later. + credit_type = None if soge else credit_type - if credit_type is None: - credit_amount = 0 + # If the user does not select any payment method, then no credit will be performed. + credit_amount = 0 if credit_type is None else credit_amount if fee > credit_amount and not soge: # Check if the user credits enough money