fix

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

diff --git a/src/club/models.py b/src/club/models.py
index 8905f08..a0722d3 100644 (file)
--- a/src/club/models.py
+++ b/src/club/models.py
@@ -13,6 +13,7 @@ from django.db import models
 from django import template
 from django.utils.timezone import now
 from django.utils.translation import ugettext_lazy as _, ungettext, ugettext, get_language
+from django_countries.fields import CountryField
 from catalogue.utils import get_random_hash
 from messaging.states import Level
 from reporting.utils import render_to_pdf
@@ -43,6 +44,19 @@ class Club(models.Model):
         return [int(x) for x in self.monthly_amounts.split(',')]
 
 
+class Consent(models.Model):
+    order = models.IntegerField()
+    active = models.BooleanField(default=True)
+    text = models.CharField(max_length=2048)
+    required = models.BooleanField()
+
+    class Meta:
+        ordering = ['order']
+    
+    def __str__(self):
+        return self.text
+
+
 class Schedule(models.Model):
     """ Represents someone taking up a plan. """
     key = models.CharField(_('key'), max_length=255, unique=True)
@@ -63,6 +77,16 @@ class Schedule(models.Model):
     expires_at = models.DateTimeField(_('expires_at'), null=True, blank=True)
     email_sent = models.BooleanField(default=False)
 
+    first_name = models.CharField(max_length=255, blank=True)
+    last_name = models.CharField(max_length=255, blank=True)
+    phone = models.CharField(max_length=255, blank=True)
+    postal = models.CharField(max_length=255, blank=True)
+    postal_code = models.CharField(max_length=255, blank=True)
+    postal_town = models.CharField(max_length=255, blank=True)
+    postal_country = CountryField(default='PL', blank=True)
+
+    consent = models.ManyToManyField(Consent)
+    
     class Meta:
         verbose_name = _('schedule')
         verbose_name_plural = _('schedules')
@@ -148,6 +172,9 @@ class Schedule(models.Model):
         Contact.update(self.email, level, since, self.expires_at)
 
 
+
+
+
 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)
@@ -272,6 +299,7 @@ class PayUOrder(payu_models.Order):
     def send_receipt(cls, email, year):
         Contact = apps.get_model('messaging', 'Contact')
         Funding = apps.get_model('funding', 'Funding')
+        BillingAgreement = apps.get_model('paypal', 'BillingAgreement')
         payments = []
 
         try:
@@ -298,6 +326,9 @@ class PayUOrder(payu_models.Order):
                 'amount': order.get_amount(),
             })
 
+        for ba in BillingAgreement.objects.filter(schedule__email=email):
+            payments.extend(ba.get_donations(year))
+
         fundings = Funding.objects.filter(
             email=email,
             payed_at__year=year
@@ -327,7 +358,7 @@ class PayUOrder(payu_models.Order):
             })
 
         message = EmailMessage(
-                f'Odlicz od podatku swoje darowizny przekazane dla Wolnych Lektur',
+                'Odlicz darowiznę na Wolne Lektury od podatku',
                 template.loader.render_to_string('club/receipt_email.txt', ctx),
                 settings.CONTACT_EMAIL, [email]
             )
@@ -343,30 +374,3 @@ class PayUCardToken(payu_models.CardToken):
 
 class PayUNotification(payu_models.Notification):
     order = models.ForeignKey(PayUOrder, models.CASCADE, related_name='notification_set')
-
-
-class DirectDebit(models.Model):
-    first_name = models.CharField(_('first name'), max_length=255, blank=True)
-    last_name = models.CharField(_('last name'), max_length=255, blank=True)
-    sex = models.CharField(_('sex'), max_length=1, blank=True, choices=[
-        ('M', 'M'),
-        ('F', 'F'),
-    ])
-    date_of_birth = models.DateField(_('date of birth'), null=True, blank=True)
-    street = models.CharField(_('street'), max_length=255, blank=True)
-    building = models.CharField(_('building'), max_length=255, blank=True)
-    flat = models.CharField(_('flat'), max_length=255, blank=True)
-    town = models.CharField(_('town'), max_length=255, blank=True)
-    postal_code = models.CharField(_('postal code'),  max_length=255, blank=True)
-    phone = models.CharField(_('phone'), max_length=255, blank=True)
-    email = models.CharField(_('e-mail'), max_length=255, blank=True)
-    iban = models.CharField(_('IBAN'), max_length=255, blank=True)
-    payment_id = models.CharField(_('payment identifier'), max_length=255, blank=True)
-    agree_newsletter = models.BooleanField(_('agree newsletter'))
-    date = models.DateField(_('date'))
-    amount = models.IntegerField(_('amount'))
-
-    class Meta:
-        verbose_name = _('direct debit')
-        verbose_name_plural = _('direct debits')
-