fixes

[wolnelektury.git] / src / pz / models.py

diff --git a/src/pz/models.py b/src/pz/models.py
index 8b6db0e..87e25fc 100644 (file)
--- a/src/pz/models.py
+++ b/src/pz/models.py
@@ -1,15 +1,18 @@
+import re

 from django.db import models
 from django.db import models

+from django.utils.timezone import now

 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ugettext_lazy as _

+from .bank import parse_export_feedback

 
 
 class Campaign(models.Model):
     name = models.CharField(_('name'), max_length=255, unique=True)
     description = models.TextField(_('description'), blank=True)
 
 
 
 class Campaign(models.Model):
     name = models.CharField(_('name'), max_length=255, unique=True)
     description = models.TextField(_('description'), blank=True)
 

-    class Meta: 
+    class Meta:

         verbose_name = _('campaign')
         verbose_name_plural = _('campaigns')
         verbose_name = _('campaign')
         verbose_name_plural = _('campaigns')

-   
+

     def __str__(self):
         return self.name
 
     def __str__(self):
         return self.name
 


@@ -17,7 +20,7 @@ class Campaign(models.Model):
 class Fundraiser(models.Model):
     name = models.CharField(_('name'), max_length=255, unique=True)
 
 class Fundraiser(models.Model):
     name = models.CharField(_('name'), max_length=255, unique=True)
 

-    class Meta: 
+    class Meta:

         verbose_name = _('fundraiser')
         verbose_name_plural = _('fundraisers')
 
         verbose_name = _('fundraiser')
         verbose_name_plural = _('fundraisers')
 


@@ -54,6 +57,7 @@ class DirectDebit(models.Model):
 
     fundraiser = models.ForeignKey(Fundraiser, models.PROTECT, blank=True, null=True, verbose_name=_('fundraiser'))
     fundraiser_commission = models.IntegerField(_('fundraiser commission'), null=True, blank=True)
 
     fundraiser = models.ForeignKey(Fundraiser, models.PROTECT, blank=True, null=True, verbose_name=_('fundraiser'))
     fundraiser_commission = models.IntegerField(_('fundraiser commission'), null=True, blank=True)

+    fundraiser_bonus = models.IntegerField(_('fundraiser bonus'), null=True, blank=True)

     fundraiser_bill = models.CharField(_('fundaiser bill number'), max_length=255, blank=True)
 
     amount = models.IntegerField(_('amount'), null=True, blank=True)
     fundraiser_bill = models.CharField(_('fundaiser bill number'), max_length=255, blank=True)
 
     amount = models.IntegerField(_('amount'), null=True, blank=True)


@@ -61,17 +65,28 @@ class DirectDebit(models.Model):
     notes = models.TextField(_('notes'), blank=True)
 
     needs_redo = models.BooleanField(_('needs redo'), default=False)
     notes = models.TextField(_('notes'), blank=True)
 
     needs_redo = models.BooleanField(_('needs redo'), default=False)

-    is_cancelled = models.BooleanField(_('is cancelled'), default=False)
+    cancelled_at = models.DateTimeField(_('cancelled at'), null=True, blank=True)

     optout = models.BooleanField(_('optout'), default=False)
 
     campaign = models.ForeignKey(Campaign, models.PROTECT, null=True, blank=True, verbose_name=_('campaign'))
 
     optout = models.BooleanField(_('optout'), default=False)
 
     campaign = models.ForeignKey(Campaign, models.PROTECT, null=True, blank=True, verbose_name=_('campaign'))
 

+    latest_status = models.CharField(max_length=255, blank=True)
+    

     class Meta:
         verbose_name = _('direct debit')
         verbose_name_plural = _('direct debits')
 
     class Meta:
         verbose_name = _('direct debit')
         verbose_name_plural = _('direct debits')
 

+    def __str__(self):
+        return "{} {}".format(self.payment_id, self.latest_status)
+
+    def get_latest_status(self):
+        line = self.bankexportfeedbackline_set.order_by('-feedback__created_at').first()
+        if line is None: return ""
+        return line.comment
+

     def save(self, **kwargs):
         self.iban_valid = not self.iban_warning() if self.iban else None
     def save(self, **kwargs):
         self.iban_valid = not self.iban_warning() if self.iban else None

+        self.latest_status = self.get_latest_status()

         super().save(**kwargs)
 
     @classmethod
         super().save(**kwargs)
 
     @classmethod


@@ -93,6 +108,20 @@ class DirectDebit(models.Model):
                 break
         return payment_id
 
                 break
         return payment_id
 

+    @property
+    def full_name(self):
+        return ' '.join((self.first_name, self.last_name)).strip()
+
+    @property
+    def street_address(self):
+        street_addr = self.street
+        if self.building:
+            street_addr += ' ' + self.building
+        if self.flat:
+            street_addr += ' m. ' + self.flat
+        street_addr = street_addr.strip()
+        return street_addr
+

     def iban_warning(self):
         if not self.iban:
             return 'No IBAN'
     def iban_warning(self):
         if not self.iban:
             return 'No IBAN'


@@ -102,3 +131,41 @@ class DirectDebit(models.Model):
             return 'This IBAN number looks invalid'
         return ''
     iban_warning.short_description = ''
             return 'This IBAN number looks invalid'
         return ''
     iban_warning.short_description = ''

+
+
+class BankExportFeedback(models.Model):
+    created_at = models.DateTimeField(auto_now_add=True)
+    csv = models.FileField(upload_to='pz/feedback/')
+
+    def save(self, **kwargs):
+        super().save(**kwargs)
+        for payment_id, status, comment in parse_export_feedback(self.csv):
+            debit = DirectDebit.objects.get(payment_id = payment_id)
+            b, created = self.bankexportfeedbackline_set.get_or_create(
+                debit=debit,
+                defaults={
+                    "status": status,
+                    "comment": comment,
+                }
+            )
+            if not created:
+                b.status = status
+                b.comment = comment
+                b.save()
+            if status == 1 and not debit.bank_acceptance_date:
+                debit.bank_acceptance_date = now().date()
+                debit.save()
+
+
+class BankExportFeedbackLine(models.Model):
+    feedback = models.ForeignKey(BankExportFeedback, models.CASCADE)
+    debit = models.ForeignKey(DirectDebit, models.CASCADE)
+    status = models.SmallIntegerField()
+    comment = models.CharField(max_length=255)
+
+
+
+class BankOrder(models.Model):
+    payment_date = models.DateField(null=True, blank=True)
+    sent = models.DateTimeField(null=True, blank=True)
+    debits = models.ManyToManyField(DirectDebit, blank=True)