fix

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

diff --git a/src/club/models.py b/src/club/models.py
index 3540268..8338b55 100644 (file)
--- a/src/club/models.py
+++ b/src/club/models.py
@@ -37,11 +37,39 @@ 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.description or p.wide:
+                    if not p.description:
+                        p.narrow_wide = True
+                    if narrow_spot == 1:
+                        amounts[i-1].narrow_wide = True
+                        narrow_spot = 0
+                if p.wide:
+                    if wide_spot == 2:
+                        p.wide_not_wide = True
+                        wide_spot += 1
+                    else:
+                        wide_spot += 2
+                else:
+                    wide_spot += 1
+                wide_spot %= 3
+            c[tag] = amounts
+            c[f'{tag}_wide_spot'] = wide_spot
+        return c
+
+    

 
 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 +78,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']


@@ -431,7 +460,6 @@ class PayUOrder(payu_models.Order):
         if not payments: return
 
         payments.sort(key=lambda x: x['timestamp'])
         if not payments: return
 
         payments.sort(key=lambda x: x['timestamp'])

-        print(payments)

 
         ctx = {
             "email": email,
 
         ctx = {
             "email": email,


@@ -451,7 +479,7 @@ class PayUOrder(payu_models.Order):
         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')