X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/3f527019946f993c9d1cadd41e80c2c7eac188ed..f0d9161da1b3fe4d3a528f95df30e26d221f73d4:/src/club/models.py

diff --git a/src/club/models.py b/src/club/models.py
index 77d1bb260..a0722d38e 100644
--- a/src/club/models.py
+++ b/src/club/models.py
@@ -299,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:
@@ -325,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
@@ -354,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]
             )
@@ -370,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')
-