Remove machina, remove default cache config, add some upgrades and compatibility...

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

diff --git a/src/club/models.py b/src/club/models.py
index ba4466b..1a78d76 100644 (file)
--- a/src/club/models.py
+++ b/src/club/models.py
@@ -12,7 +12,7 @@ from django.urls import reverse
 from django.db import models
 from django import template
 from django.utils.timezone import now
 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.translation import gettext_lazy as _, ngettext, gettext, get_language

 from django_countries.fields import CountryField
 from pytz import utc
 from catalogue.utils import get_random_hash
 from django_countries.fields import CountryField
 from pytz import utc
 from catalogue.utils import get_random_hash


@@ -310,11 +310,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 +324,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()


@@ -380,8 +378,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


@@ -404,11 +402,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,
             })