More members overhaul

Relates to #44
This commit is contained in:
Jan Tuomi
2017-05-12 21:19:01 +03:00
parent 3a468b9c39
commit 74746fc0de
23 changed files with 258 additions and 484 deletions
+9 -3
View File
@@ -30,8 +30,12 @@ class Payment(models.Model):
'''
Payment model representing one payment event
'''
date = models.DateTimeField(default=datetime.fromtimestamp(0))
source = models.CharField(max_length=255)
date = models.DateTimeField(default=datetime.now())
source = models.CharField(choices=[
('AYY', _('AYY')),
('cash', _('Cash')),
('bank_transfer', _('Bank transfer')),
], max_length=255)
member = models.ForeignKey('Member', on_delete=models.SET_NULL, blank=True, null=True)
@@ -41,4 +45,6 @@ class Member(BaseMember):
Member model represets one member on the registry.
'''
created = models.DateTimeField(default=timezone.now)
paid = models.DateTimeField(default=timezone.now) #this needs to be assigned as Payment.date
def __str__(self):
return "{} {}, {}".format(self.last_name, self.first_name, self.email)