X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/d04b366656def9a659889c0c83b07ccd0833fd5d..24f09a9815fff57bde69683b12980480fd8dc6a2:/src/club/models.py diff --git a/src/club/models.py b/src/club/models.py index ba4466b18..468622f91 100644 --- a/src/club/models.py +++ b/src/club/models.py @@ -11,10 +11,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.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 pytz import utc from catalogue.utils import get_random_hash from messaging.states import Level from reporting.utils import render_to_pdf @@ -310,11 +309,6 @@ class PayUOrder(payu_models.Order): "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' @@ -329,6 +323,9 @@ class PayUOrder(payu_models.Order): 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() @@ -380,8 +377,8 @@ class PayUOrder(payu_models.Order): 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 @@ -404,11 +401,11 @@ class PayUOrder(payu_models.Order): 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({ - 'timestamp': funding.payed_at, + 'timestamp': funding.completed_at, 'amount': funding.amount, })