@@ -103,16 +103,6 @@ class Member(BaseMember):
|
|||||||
verbose_name = _('Member')
|
verbose_name = _('Member')
|
||||||
verbose_name_plural = _('Members')
|
verbose_name_plural = _('Members')
|
||||||
|
|
||||||
def last_paid(self):
|
|
||||||
"""Return member's last payment."""
|
|
||||||
try:
|
|
||||||
payments = Payment.objects.filter(member=self)
|
|
||||||
latest = payments.latest('date')
|
|
||||||
date = latest.date
|
|
||||||
return date
|
|
||||||
except Payment.DoesNotExist:
|
|
||||||
return None
|
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def from_array(array):
|
def from_array(array):
|
||||||
"""Create member from array."""
|
"""Create member from array."""
|
||||||
|
|||||||
+2
-2
@@ -4,13 +4,13 @@ import django_tables2 as tables
|
|||||||
from django.utils.translation import ugettext as _
|
from django.utils.translation import ugettext as _
|
||||||
|
|
||||||
from members.models import Member, Payment, Request
|
from members.models import Member, Payment, Request
|
||||||
|
from django.db.models import F
|
||||||
|
|
||||||
|
|
||||||
class MemberTable(tables.Table):
|
class MemberTable(tables.Table):
|
||||||
"""Table for member."""
|
"""Table for member."""
|
||||||
|
|
||||||
last_paid = tables.DateTimeColumn(
|
last_paid = tables.DateTimeColumn(verbose_name=_('Last paid'), order_by='payments.date')
|
||||||
accessor='last_paid', verbose_name=_('Last paid'))
|
|
||||||
|
|
||||||
options = tables.TemplateColumn(
|
options = tables.TemplateColumn(
|
||||||
('<a class="data-table-button btn btn-primary" '
|
('<a class="data-table-button btn btn-primary" '
|
||||||
|
|||||||
@@ -27,7 +27,6 @@ from smtplib import SMTPAuthenticationError
|
|||||||
|
|
||||||
from members.models import Member, Request, Payment
|
from members.models import Member, Request, Payment
|
||||||
from members.forms import MemberForm, PaymentForm, ApplicationForm, CSVValidationError
|
from members.forms import MemberForm, PaymentForm, ApplicationForm, CSVValidationError
|
||||||
from members.tables import MemberTable, PaymentTable, RequestTable
|
|
||||||
|
|
||||||
|
|
||||||
@receiver(post_save, sender=Request)
|
@receiver(post_save, sender=Request)
|
||||||
|
|||||||
Reference in New Issue
Block a user