apps/treasury/models.py

@@ -1,6 +1,6 @@
 # Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
-import datetime
+
 from datetime import date
 
 from django.conf import settings
@@ -305,16 +305,8 @@ class SogeCredit(models.Model):
 
     @property
     def amount(self):
-        if self.valid:
-            return self.credit_transaction.total
-        amount = sum(transaction.total for transaction in self.transactions.all())
-        if 'wei' in settings.INSTALLED_APPS:
-            from wei.models import WEIMembership
-            if not WEIMembership.objects.filter(club__weiclub__year=datetime.date.today().year, user=self.user)\
-                    .exists():
-                # 80 € for people that don't go to WEI
-                amount += 8000
-        return amount
+        return self.credit_transaction.total if self.valid \
+            else sum(transaction.total for transaction in self.transactions.all())
 
     def update_transactions(self):
         """
@@ -331,15 +323,13 @@ class SogeCredit(models.Model):
 
         if bde_qs.exists():
             m = bde_qs.get()
-            if MembershipTransaction.objects.filter(membership=m).exists():  # non-free membership
-                if m.transaction not in self.transactions.all():
-                    self.transactions.add(m.transaction)
+            if m.transaction not in self.transactions.all():
+                self.transactions.add(m.transaction)
 
         if kfet_qs.exists():
             m = kfet_qs.get()
-            if MembershipTransaction.objects.filter(membership=m).exists():  # non-free membership
-                if m.transaction not in self.transactions.all():
-                    self.transactions.add(m.transaction)
+            if m.transaction not in self.transactions.all():
+                self.transactions.add(m.transaction)
 
         if 'wei' in settings.INSTALLED_APPS:
             from wei.models import WEIClub
@@ -347,9 +337,8 @@ class SogeCredit(models.Model):
             wei_qs = Membership.objects.filter(user=self.user, club=wei, date_start__gte=wei.membership_start)
             if wei_qs.exists():
                 m = wei_qs.get()
-                if MembershipTransaction.objects.filter(membership=m).exists():  # non-free membership
-                    if m.transaction not in self.transactions.all():
-                        self.transactions.add(m.transaction)
+                if m.transaction not in self.transactions.all():
+                    self.transactions.add(m.transaction)
 
         for tr in self.transactions.all():
             tr.valid = False