Add grammar to tags. Also: respect custom tag slugs on publishing.

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

diff --git a/src/club/models.py b/src/club/models.py
index 4f3a8f6..468622f 100644 (file)
--- a/src/club/models.py
+++ b/src/club/models.py
@@ -11,8 +11,8 @@ 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 catalogue.utils import get_random_hash
 from messaging.states import Level
 from django_countries.fields import CountryField
 from catalogue.utils import get_random_hash
 from messaging.states import Level


@@ -26,9 +26,7 @@ from . import utils
 class Club(models.Model):
     min_amount = models.IntegerField(_('minimum amount'))
     min_for_year = models.IntegerField(_('minimum amount for year'))
 class Club(models.Model):
     min_amount = models.IntegerField(_('minimum amount'))
     min_for_year = models.IntegerField(_('minimum amount for year'))

-    single_amounts = models.CharField(_('proposed amounts for single payment'), max_length=255)

     default_single_amount = models.IntegerField(_('default single amount'))
     default_single_amount = models.IntegerField(_('default single amount'))

-    monthly_amounts = models.CharField(_('proposed amounts for monthly payments'), max_length=255)

     default_monthly_amount = models.IntegerField(_('default monthly amount'))
 
     class Meta:
     default_monthly_amount = models.IntegerField(_('default monthly amount'))
 
     class Meta:


@@ -37,12 +35,23 @@ class Club(models.Model):
     
     def __str__(self):
         return 'Klub'
     
     def __str__(self):
         return 'Klub'

-    
-    def proposed_single_amounts(self):
-        return [int(x) for x in self.single_amounts.split(',')]

 
 

-    def proposed_monthly_amounts(self):
-        return [int(x) for x in self.monthly_amounts.split(',')]
+
+class SingleAmount(models.Model):
+    club = models.ForeignKey(Club, models.CASCADE)
+    amount = models.IntegerField()
+    description = models.TextField(blank=True)
+
+    class Meta:
+        ordering = ['amount']
+
+class MonthlyAmount(models.Model):
+    club = models.ForeignKey(Club, models.CASCADE)
+    amount = models.IntegerField()
+    description = models.TextField(blank=True)
+
+    class Meta:
+        ordering = ['amount']

 
 
 class Consent(models.Model):
 
 
 class Consent(models.Model):


@@ -116,6 +125,13 @@ class Schedule(models.Model):
     def get_payment_method(self):
         return [m for m in methods if m.slug == self.method][0]
 
     def get_payment_method(self):
         return [m for m in methods if m.slug == self.method][0]
 

+    def get_payment_methods(self):
+        for method in methods:
+            if (self.monthly or self.yearly) and method.is_recurring:
+                yield method
+            elif not (self.monthly or self.yearly) and method.is_onetime:
+                yield method
+

     def is_expired(self):
         return self.expires_at is not None and self.expires_at <= now()
 
     def is_expired(self):
         return self.expires_at is not None and self.expires_at <= now()
 


@@ -224,7 +240,7 @@ class Membership(models.Model):
 
         Contact = apps.get_model('messaging', 'Contact')
         if self.manual:
 
         Contact = apps.get_model('messaging', 'Contact')
         if self.manual:

-            Contact.update(email, Level.MANUAL_MEMBER, self.updated_at)
+            Contact.update(email, Level.MANUAL_MEMBER, datetime.combine(self.updated_at, datetime.min.time(), utc))

         else:
             Contact.reset(email)
 
         else:
             Contact.reset(email)
 


@@ -293,11 +309,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'
 


@@ -312,6 +323,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()


@@ -363,8 +377,8 @@ class PayUOrder(payu_models.Order):
         except Contact.DoesNotExist:
             funding = Funding.objects.filter(
                 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')
                 return
             if funding is None:
                 print('no notifications')
                 return


@@ -387,11 +401,11 @@ 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,
             })