fix

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

diff --git a/src/club/models.py b/src/club/models.py
index 77d1bb2..f09b68e 100644 (file)
--- a/src/club/models.py
+++ b/src/club/models.py
@@ -19,6 +19,7 @@ from messaging.states import Level
 from reporting.utils import render_to_pdf
 from .payment_methods import methods
 from .payu import models as payu_models
 from reporting.utils import render_to_pdf
 from .payment_methods import methods
 from .payu import models as payu_models

+from .civicrm import report_activity

 from . import utils
 
 
 from . import utils
 
 


@@ -277,7 +278,7 @@ class PayUOrder(payu_models.Order):
             self.schedule.get_thanks_url())
 
     def get_description(self):
             self.schedule.get_thanks_url())
 
     def get_description(self):

-        return ugettext('Towarzystwo Przyjaciół Wolnych Lektur')
+        return 'Wolne Lektury'

 
     def is_recurring(self):
         return self.schedule.get_payment_method().is_recurring
 
     def is_recurring(self):
         return self.schedule.get_payment_method().is_recurring


@@ -293,12 +294,42 @@ class PayUOrder(payu_models.Order):
     def status_updated(self):
         if self.status == 'COMPLETED':
             self.schedule.set_payed()
     def status_updated(self):
         if self.status == 'COMPLETED':
             self.schedule.set_payed()

-            
+        self.report_activity()
+
+    @property
+    def updated_at(self):
+        try:
+            return self.notification_set.all().order_by('-received_at')[0].received_at
+        except IndexError:
+            return None
+    
+    def report_activity(self):
+        if self.status not in ['COMPLETED', 'CANCELED', 'REJECTED']:
+            return
+
+        if self.status != 'COMPLETED':
+            name = settings.CIVICRM_ACTIVITIES['Failed contribution']
+        elif self.is_recurring():
+            name = settings.CIVICRM_ACTIVITIES['Recurring contribution']
+        else:
+            name = settings.CIVICRM_ACTIVITIES['Contribution']
+
+        report_activity.delay(
+            self.schedule.email,
+            self.schedule.key,
+            f'payu:{self.id}',
+            name,
+            self.updated_at,
+            {
+                'kwota': self.schedule.amount,
+            }
+        )            

 
     @classmethod
     def send_receipt(cls, email, year):
         Contact = apps.get_model('messaging', 'Contact')
         Funding = apps.get_model('funding', 'Funding')
 
     @classmethod
     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:
         payments = []
 
         try:


@@ -325,6 +356,9 @@ class PayUOrder(payu_models.Order):
                 'amount': order.get_amount(),
             })
 
                 '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
         fundings = Funding.objects.filter(
             email=email,
             payed_at__year=year


@@ -354,7 +388,7 @@ class PayUOrder(payu_models.Order):
             })
 
         message = EmailMessage(
             })
 
         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]
             )
                 template.loader.render_to_string('club/receipt_email.txt', ctx),
                 settings.CONTACT_EMAIL, [email]
             )


@@ -370,30 +404,3 @@ class PayUCardToken(payu_models.CardToken):
 
 class PayUNotification(payu_models.Notification):
     order = models.ForeignKey(PayUOrder, models.CASCADE, related_name='notification_set')
 
 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')
-