Browse Source

[fix] Filter by membership fee

ljf 7 years ago
parent
commit
b7167cf842
1 changed files with 2 additions and 6 deletions
  1. 2 6
      coin/billing/membershipfee_filter.py

+ 2 - 6
coin/billing/membershipfee_filter.py

@@ -33,10 +33,6 @@ class MembershipFeeFilter(SimpleListFilter):
         `self.value()`.
         `self.value()`.
         """
         """
         if self.value() == 'paidup':
         if self.value() == 'paidup':
-            return queryset.filter(
-                membership_fees__start_date__lte=datetime.date.today,
-                membership_fees__end_date__gte=datetime.date.today)
+            return queryset.filter(id__in=[i.id for i in queryset.all() if i.is_paid_up()])
         if self.value() == 'late':
         if self.value() == 'late':
-            return queryset.filter(status='member').exclude(
-                membership_fees__start_date__lte=datetime.date.today,
-                membership_fees__end_date__gte=datetime.date.today)
+            return queryset.filter(id__in=[i.id for i in queryset.all() if not i.is_paid_up()])