Membership fees for paid and unpaid students, closes #43

apps/member/fixtures/initial.json

@@ -6,7 +6,8 @@
             "name": "BDE",
             "email": "tresorerie.bde@example.com",
             "require_memberships":  true,
-            "membership_fee": 500,
+            "membership_fee_paid": 500,
+            "membership_fee_unpaid": 500,
             "membership_duration": 396,
             "membership_start": "2019-08-31",
             "membership_end": "2020-09-30"
@@ -20,7 +21,8 @@
             "email": "tresorerie.bde@example.com",
             "parent_club": 1,
             "require_memberships":  true,
-            "membership_fee": 3500,
+            "membership_fee_paid": 3500,
+            "membership_fee_unpaid": 3500,
             "membership_duration": 396,
             "membership_start": "2019-08-31",
             "membership_end": "2020-09-30"

apps/member/forms.py

@@ -4,7 +4,6 @@
 from django import forms
 from django.contrib.auth.forms import UserCreationForm, AuthenticationForm
 from django.contrib.auth.models import User
-from django.utils.translation import gettext_lazy as _
 from note_kfet.inputs import Autocomplete, AmountInput, DatePickerInput
 from permission.models import PermissionMask
 
@@ -46,7 +45,8 @@ class ClubForm(forms.ModelForm):
         model = Club
         fields = '__all__'
         widgets = {
-            "membership_fee": AmountInput(),
+            "membership_fee_paid": AmountInput(),
+            "membership_fee_unpaid": AmountInput(),
             "parent_club": Autocomplete(
                 Club,
                 attrs={

apps/member/models.py

@@ -9,7 +9,6 @@ from django.core.exceptions import ValidationError, PermissionDenied
 from django.db import models
 from django.urls import reverse, reverse_lazy
 from django.utils.translation import gettext_lazy as _
-
 from note.models import MembershipTransaction
 
 
@@ -89,9 +88,14 @@ class Club(models.Model):
         help_text=_("Uncheck if this club don't require memberships."),
     )
 
-    membership_fee = models.PositiveIntegerField(
+    membership_fee_paid = models.PositiveIntegerField(
         default=0,
-        verbose_name=_('membership fee'),
+        verbose_name=_('membership fee (paid students)'),
+    )
+
+    membership_fee_unpaid = models.PositiveIntegerField(
+        default=0,
+        verbose_name=_('membership fee (unpaid students)'),
     )
 
     membership_duration = models.PositiveIntegerField(
@@ -136,7 +140,8 @@ class Club(models.Model):
     def save(self, force_insert=False, force_update=False, using=None,
              update_fields=None):
         if not self.require_memberships:
-            self.membership_fee = 0
+            self.membership_fee_paid = 0
+            self.membership_fee_unpaid = 0
             self.membership_duration = None
             self.membership_start = None
             self.membership_end = None
@@ -225,7 +230,10 @@ class Membership(models.Model):
             ).exists():
                 raise ValidationError(_('User is already a member of the club'))
 
-            self.fee = self.club.membership_fee
+            if self.user.profile.paid:
+                self.fee = self.club.membership_fee_paid
+            else:
+                self.fee = self.club.membership_fee_unpaid
             if self.club.membership_duration is not None:
                 self.date_end = self.date_start + datetime.timedelta(days=self.club.membership_duration)
             else:
@@ -235,18 +243,23 @@ class Membership(models.Model):
 
         super().save(*args, **kwargs)
 
-        if created and self.fee:
-            try:
-                MembershipTransaction.objects.create(
-                    membership=self,
-                    source=self.user.note,
-                    destination=self.club.note,
-                    quantity=1,
-                    amount=self.fee,
-                    reason="Adhésion",
-                )
-            except PermissionDenied:
-                self.delete()
+        self.make_transaction()
+
+    def make_transaction(self):
+        if self.transaction is not None or not self.fee:
+            return
+
+        if self.fee:
+            transaction = MembershipTransaction(
+                membership=self,
+                source=self.user.note,
+                destination=self.club.note,
+                quantity=1,
+                amount=self.fee,
+                reason="Adhésion",
+            )
+            transaction._force_save = True
+            transaction.save(force_insert=True)
 
     class Meta:
         verbose_name = _('membership')

apps/member/tables.py

@@ -5,11 +5,10 @@ import django_tables2 as tables
 from django.contrib.auth.models import User
 from django.urls import reverse_lazy
 from django.utils.html import format_html
-from django_tables2 import A
-
 from note.templatetags.pretty_money import pretty_money
 from note_kfet.middlewares import get_current_authenticated_user
 from permission.backends import PermissionBackend
+
 from .models import Club, Membership
 
 

apps/member/views.py

@@ -380,7 +380,7 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView):
             return super().form_invalid(form)
 
         if form.instance.date_start > form.instance.club.membership_end:
-            form.add_error('user', _("The membership must end before {:%m-%d-%Y}.")
+            form.add_error('user', _("The membership must begin before {:%m-%d-%Y}.")
                            .format(form.instance.club.membership_start))
             return super().form_invalid(form)
 
@@ -412,7 +412,7 @@ class ClubManageRolesView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
             return super().form_invalid(form)
 
         if form.instance.date_start > form.instance.club.membership_end:
-            form.add_error('user', _("The membership must end before {:%m-%d-%Y}.")
+            form.add_error('user', _("The membership must begin before {:%m-%d-%Y}.")
                            .format(form.instance.club.membership_start))
             return super().form_invalid(form)