X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/a5d95bc65cbd0b8703471a2dddef0a48234bd265..b08ceb573c9a41d421cc796fb5688720a9cb0995:/src/club/models.py?ds=inline

diff --git a/src/club/models.py b/src/club/models.py
index 1d993bc77..db5fde857 100644
--- a/src/club/models.py
+++ b/src/club/models.py
@@ -132,8 +132,10 @@ class Membership(models.Model):
     """ Represents a user being recognized as a member of the club. """
     user = models.OneToOneField(settings.AUTH_USER_MODEL, verbose_name=_('user'), on_delete=models.CASCADE)
     created_at = models.DateTimeField(_('created at'), auto_now_add=True)
-    name = models.CharField(max_length=255, blank=True)
-    honorary = models.BooleanField(default=False)
+    name = models.CharField(_('name'), max_length=255, blank=True)
+    manual = models.BooleanField(_('manual'), default=False)
+    notes = models.CharField(_('notes'), max_length=2048, blank=True)
+    updated_at = models.DateField(_('updated at'), auto_now=True, blank=True)
 
     class Meta:
         verbose_name = _('membership')
@@ -142,6 +144,21 @@ class Membership(models.Model):
     def __str__(self):
         return str(self.user)
 
+    def save(self, *args, **kwargs):
+        super().save(*args, **kwargs)
+        self.update_contact()
+
+    def update_contact(self):
+        email = self.user.email
+        if not email:
+            return
+
+        Contact = apps.get_model('messaging', 'Contact')
+        if self.manual:
+            Contact.update(email, Level.MANUAL_MEMBER, self.updated_at)
+        else:
+            Contact.reset(email)
+
     @classmethod
     def is_active_for(cls, user):
         if user.is_anonymous:
@@ -150,7 +167,7 @@ class Membership(models.Model):
             membership = user.membership
         except cls.DoesNotExist:
             return False
-        if membership.honorary:
+        if membership.manual:
             return True
         return Schedule.objects.filter(
                 expires_at__gt=now(),
@@ -213,7 +230,7 @@ class PayUOrder(payu_models.Order):
             self.schedule.get_thanks_url())
 
     def get_description(self):
-        return ugettext('Towarzystwo Wolnych Lektur')
+        return ugettext('Towarzystwo Przyjaciół Wolnych Lektur')
 
     def is_recurring(self):
         return self.schedule.get_payment_method().is_recurring
@@ -244,14 +261,36 @@ class PayUOrder(payu_models.Order):
 
     @classmethod
     def send_receipt(cls, email, year):
+        Funding = apps.get_model('funding', 'Funding')
+        payments = []
+
         qs = cls.objects.filter(status='COMPLETED', schedule__email=email, completed_at__year=year).order_by('completed_at')
-        if not qs.exists(): return
+        for order in qs:
+            payments.append({
+                'timestamp': order.completed_at,
+                'amount': order.get_amount(),
+            })
+            
+        fundings = Funding.objects.filter(
+            email=email,
+            payed_at__year=year
+        ).order_by('payed_at')
+        for funding in fundings:
+            payments.append({
+                'timestamp': funding.payed_at,
+                'amount': funding.amount,
+            })
+
+        if not payments: return
+
+        payments.sort(key=lambda x: x['timestamp'])
+
         ctx = {
             "email": email,
             "year": year,
             "next_year": year + 1,
-            "total": qs.aggregate(s=models.Sum('schedule__amount'))['s'],
-            "orders": qs,
+            "total": sum(x['amount'] for x in payments),
+            "payments": payments,
         }
         temp = tempfile.NamedTemporaryFile(prefix='receipt-', suffix='.pdf', delete=False)
         temp.close()