minor fixes

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

diff --git a/src/club/models.py b/src/club/models.py
index ba4466b..8fe3e47 100644 (file)
--- a/src/club/models.py
+++ b/src/club/models.py
@@ -2,6 +2,7 @@
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from datetime import datetime, timedelta
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from datetime import datetime, timedelta

+from decimal import Decimal

 import os
 import tempfile
 from django.apps import apps
 import os
 import tempfile
 from django.apps import apps


@@ -11,10 +12,9 @@ from django.core.mail import send_mail, EmailMessage
 from django.urls import reverse
 from django.db import models
 from django import template
 from django.urls import reverse
 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.utils.timezone import now, utc
+from django.utils.translation import gettext_lazy as _, ngettext, gettext, get_language

 from django_countries.fields import CountryField
 from django_countries.fields import CountryField

-from pytz import utc

 from catalogue.utils import get_random_hash
 from messaging.states import Level
 from reporting.utils import render_to_pdf
 from catalogue.utils import get_random_hash
 from messaging.states import Level
 from reporting.utils import render_to_pdf


@@ -37,11 +37,54 @@ class Club(models.Model):
     def __str__(self):
         return 'Klub'
 
     def __str__(self):
         return 'Klub'
 

+    def get_amounts(self):
+        c = {}
+        single = list(self.singleamount_set.all())
+        monthly = list(self.monthlyamount_set.all())
+        for tag, amounts in ('single', single), ('monthly', monthly):
+            wide_spot = narrow_spot = 0
+            for i, p in enumerate(amounts):
+                if p.wide:
+                    # Do we have space for xl?
+                    if wide_spot < 2:
+                        p.box_variant = 'xl'
+                        wide_spot += 2
+                    else:
+                        p.box_variant = 'card'
+                        wide_spot += 1
+                    narrow_spot = 0
+                elif p.description:
+                    p.box_variant = 'card'
+                    if narrow_spot:
+                        amounts[i-1].box_variant = 'bar'
+                    wide_spot += 1
+                    narrow_spot = 0
+                else:
+                    p.box_variant = 'half'
+                    wide_spot += 1
+                    narrow_spot += 1
+                wide_spot %= 3
+                narrow_spot %= 2
+            c[tag] = amounts
+            c[f'{tag}_wide_spot'] = wide_spot
+        return c
+
+    def get_description_for_amount(self, amount, monthly):
+        amounts = self.monthlyamount_set if monthly else self.singleamount_set
+        amount = amounts.all().filter(amount__lte=amount).last()
+        return amount.description if amount is not None else ''
+
+    @property
+    def paypal_enabled(self):
+        print("ENABLED?", settings.PAYPAL_ENABLED)
+        return settings.PAYPAL_ENABLED
+    

 
 class SingleAmount(models.Model):
     club = models.ForeignKey(Club, models.CASCADE)
     amount = models.IntegerField()
     description = models.TextField(blank=True)
 
 class SingleAmount(models.Model):
     club = models.ForeignKey(Club, models.CASCADE)
     amount = models.IntegerField()
     description = models.TextField(blank=True)

+    wide = models.BooleanField(default=False)

 
     class Meta:
         ordering = ['amount']
 
     class Meta:
         ordering = ['amount']


@@ -50,6 +93,7 @@ class MonthlyAmount(models.Model):
     club = models.ForeignKey(Club, models.CASCADE)
     amount = models.IntegerField()
     description = models.TextField(blank=True)
     club = models.ForeignKey(Club, models.CASCADE)
     amount = models.IntegerField()
     description = models.TextField(blank=True)

+    wide = models.BooleanField(default=False)

 
     class Meta:
         ordering = ['amount']
 
     class Meta:
         ordering = ['amount']


@@ -111,6 +155,10 @@ class Schedule(models.Model):
         super(Schedule, self).save(*args, **kwargs)
         self.update_contact()
 
         super(Schedule, self).save(*args, **kwargs)
         self.update_contact()
 

+    def get_description(self):
+        club = Club.objects.first()
+        return club.get_description_for_amount(self.amount, self.monthly)
+

     def initiate_payment(self, request):
         return self.get_payment_method().initiate(request, self)
 
     def initiate_payment(self, request):
         return self.get_payment_method().initiate(request, self)
 


@@ -310,11 +358,6 @@ class PayUOrder(payu_models.Order):
             "language": get_language(),
         }
 
             "language": get_language(),
         }
 

-    def get_continue_url(self):
-        return "https://{}{}".format(
-            Site.objects.get_current().domain,
-            self.schedule.get_thanks_url())
-

     def get_description(self):
         return 'Wolne Lektury'
 
     def get_description(self):
         return 'Wolne Lektury'
 


@@ -329,6 +372,9 @@ class PayUOrder(payu_models.Order):
             Site.objects.get_current().domain,
             reverse('club_payu_notify', args=[self.pk]))
 
             Site.objects.get_current().domain,
             reverse('club_payu_notify', args=[self.pk]))
 

+    def get_thanks_url(self):
+        return self.schedule.get_thanks_url()
+

     def status_updated(self):
         if self.status == 'COMPLETED':
             self.schedule.set_payed()
     def status_updated(self):
         if self.status == 'COMPLETED':
             self.schedule.set_payed()


@@ -373,19 +419,25 @@ class PayUOrder(payu_models.Order):
         Contact = apps.get_model('messaging', 'Contact')
         Funding = apps.get_model('funding', 'Funding')
         BillingAgreement = apps.get_model('paypal', 'BillingAgreement')
         Contact = apps.get_model('messaging', 'Contact')
         Funding = apps.get_model('funding', 'Funding')
         BillingAgreement = apps.get_model('paypal', 'BillingAgreement')

+        DirectDebit = apps.get_model('pz', 'DirectDebit')
+        Payment = apps.get_model('pz', 'Payment')
+

         payments = []
 
         payments = []
 

+        optout = None

         try:
             contact = Contact.objects.get(email=email)
         except Contact.DoesNotExist:
             funding = Funding.objects.filter(
                 email=email,
         try:
             contact = Contact.objects.get(email=email)
         except Contact.DoesNotExist:
             funding = Funding.objects.filter(
                 email=email,

-                payed_at__year=year,
-                notifications=True).order_by('payed_at').first()
+                completed_at__year=year,
+                notifications=True).order_by('completed_at').first()

             if funding is None:
                 print('no notifications')
             if funding is None:
                 print('no notifications')

-                return
-            optout = funding.wl_optout_url()
+                if not DirectDebit.objects.filter(email=email, optout=False).exists():
+                    return
+            else:
+                optout = funding.wl_optout_url()

         else:
             if contact.level == Level.OPT_OUT:
                 print('opt-out')
         else:
             if contact.level == Level.OPT_OUT:
                 print('opt-out')


@@ -404,14 +456,26 @@ class PayUOrder(payu_models.Order):
 
         fundings = Funding.objects.filter(
             email=email,
 
         fundings = Funding.objects.filter(
             email=email,

-            payed_at__year=year
-        ).order_by('payed_at')
+            completed_at__year=year
+        ).order_by('completed_at')

         for funding in fundings:
             payments.append({
         for funding in fundings:
             payments.append({

-                'timestamp': funding.payed_at,
+                'timestamp': funding.completed_at,

                 'amount': funding.amount,
             })
 
                 'amount': funding.amount,
             })
 

+        for pa in Payment.objects.filter(
+                debit__email=email,
+                realised=True,
+                is_dd=True,
+                booking_date__year=year
+        ):
+            payments.append({
+                'timestamp': datetime(pa.booking_date.year, pa.booking_date.month, pa.booking_date.day, tzinfo=utc),
+                'amount': Decimal(str(pa.debit.amount) + '.00')
+            })
+
+    

         if not payments: return
 
         payments.sort(key=lambda x: x['timestamp'])
         if not payments: return
 
         payments.sort(key=lambda x: x['timestamp'])


@@ -428,13 +492,13 @@ class PayUOrder(payu_models.Order):
         temp = tempfile.NamedTemporaryFile(prefix='receipt-', suffix='.pdf', delete=False)
         temp.close()
         render_to_pdf(temp.name, 'club/receipt.texml', ctx, {
         temp = tempfile.NamedTemporaryFile(prefix='receipt-', suffix='.pdf', delete=False)
         temp.close()
         render_to_pdf(temp.name, 'club/receipt.texml', ctx, {

-            "fnp.eps": os.path.join(settings.STATIC_ROOT, "img/fnp.eps"),
+            "wl.eps": os.path.join(settings.STATIC_ROOT, "img/wl.eps"),

             })
 
         message = EmailMessage(
                 'Odlicz darowiznę na Wolne Lektury od podatku',
                 template.loader.render_to_string('club/receipt_email.txt', ctx),
             })
 
         message = EmailMessage(
                 'Odlicz darowiznę na Wolne Lektury od podatku',
                 template.loader.render_to_string('club/receipt_email.txt', ctx),

-                settings.CONTACT_EMAIL, [email]
+                settings.CLUB_CONTACT_EMAIL, [email]

             )
         with open(temp.name, 'rb') as f:
             message.attach('wolnelektury-darowizny.pdf', f.read(), 'application/pdf')
             )
         with open(temp.name, 'rb') as f:
             message.attach('wolnelektury-darowizny.pdf', f.read(), 'application/pdf')