X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/d2a9ebf1eae1ee5fa8a09a7dfea76995274f7716..b09ddc60e118508d96906f26ecb0e1709ca89f1b:/src/club/models.py diff --git a/src/club/models.py b/src/club/models.py index 77154954b..8c6c8db1f 100644 --- a/src/club/models.py +++ b/src/club/models.py @@ -1,7 +1,7 @@ # This file is part of Wolne Lektury, licensed under GNU Affero GPLv3 or later. # Copyright © Fundacja Wolne Lektury. See NOTICE for more information. # -from datetime import datetime, timedelta +from datetime import datetime, timedelta, timezone from decimal import Decimal import os import tempfile @@ -12,7 +12,7 @@ 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, utc +from django.utils.timezone import now from django.utils.translation import get_language from django_countries.fields import CountryField from catalogue.utils import get_random_hash @@ -201,6 +201,20 @@ class Schedule(models.Model): def is_recurring(self): return self.monthly or self.yearly + def n_paypal_payments(self, since, until): + # TODO: pull BA payments. + t = self.payed_at + if t is None: return 0 + c = 0 + until = min(until, now()) + t += timedelta(days=1) + while t < until: + if t >= since: + c += 1 + m = datetime(t.year, t.month, 1) + t += ((m + timedelta(days=31)).replace(day=1)) - m + return c + def set_payed(self): since = self.expires_at n = now() @@ -300,7 +314,7 @@ class Membership(models.Model): Contact = apps.get_model('messaging', 'Contact') if self.manual: - Contact.update(email, Level.MANUAL_MEMBER, datetime.combine(self.updated_at, datetime.min.time(), utc)) + Contact.update(email, Level.MANUAL_MEMBER, datetime.combine(self.updated_at, datetime.min.time(), timezone.utc)) else: Contact.reset(email) @@ -483,7 +497,7 @@ class PayUOrder(payu_models.Order): booking_date__year=year ): payments.append({ - 'timestamp': datetime(pa.booking_date.year, pa.booking_date.month, pa.booking_date.day, tzinfo=utc), + 'timestamp': datetime(pa.booking_date.year, pa.booking_date.month, pa.booking_date.day, tzinfo=timezone.utc), 'amount': Decimal(str(pa.debit.amount) + '.00') }) @@ -514,6 +528,8 @@ class PayUOrder(payu_models.Order): receipt = cls.generate_receipt(email, year) if receipt: content, optout, payments = receipt + else: + return ctx = { "email": email, "year": year,