X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/e466cef774f05a0c2fd99df7b8e714d0da2b9773..30ceb98e6272767f8f271ecb0de30858e1c1a88e:/src/club/models.py?ds=sidebyside diff --git a/src/club/models.py b/src/club/models.py index 548423a1b..468622f91 100644 --- 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.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 @@ -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')) - single_amounts = models.CharField(_('proposed amounts for single payment'), max_length=255) 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: @@ -37,12 +35,23 @@ class Club(models.Model): 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): @@ -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_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() @@ -150,6 +166,16 @@ class Schedule(models.Model): return utils.add_year(date) return utils.add_month(date) + def get_other_active_recurring(self): + schedules = type(self).objects.exclude( + monthly=False, yearly=False + ).filter(is_cancelled=False, expires_at__gt=now()).exclude(pk=self.pk) + mine_q = models.Q(email=self.email) + if self.membership is not None: + mine_q |= models.Q(membership__user=self.membership.user) + schedules = schedules.filter(mine_q) + return schedules.order_by('-expires_at').first() + def send_email(self): ctx = {'schedule': self} send_mail( @@ -159,6 +185,17 @@ class Schedule(models.Model): self.email_sent = True self.save() + def send_email_failed_recurring(self): + ctx = { + 'schedule': self, + 'other': self.get_other_active_recurring(), + } + send_mail( + 'Darowizna na Wolne Lektury — problem z płatnością', + template.loader.render_to_string('club/email/failed_recurring.txt', ctx), + settings.CONTACT_EMAIL, [self.email], fail_silently=False + ) + def update_contact(self): Contact = apps.get_model('messaging', 'Contact') if not self.payed_at: @@ -203,7 +240,7 @@ class Membership(models.Model): 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) @@ -272,13 +309,8 @@ 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 ugettext('Towarzystwo Przyjaciół Wolnych Lektur') + return 'Wolne Lektury' def is_recurring(self): return self.schedule.get_payment_method().is_recurring @@ -291,9 +323,17 @@ 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() + + elif self.status == 'CANCELED' or self.status.startswith('ERR-'): + if self.is_recurring() and self.schedule.expires_at: + self.schedule.send_email_failed_recurring() + self.report_activity() @property @@ -326,7 +366,7 @@ class PayUOrder(payu_models.Order): ) @classmethod - def send_receipt(cls, email, year): + def send_receipt(cls, email, year, resend=False): Contact = apps.get_model('messaging', 'Contact') Funding = apps.get_model('funding', 'Funding') BillingAgreement = apps.get_model('paypal', 'BillingAgreement') @@ -337,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 @@ -361,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, }) @@ -380,6 +420,7 @@ class PayUOrder(payu_models.Order): "total": sum(x['amount'] for x in payments), "payments": payments, "optout": optout, + "resend": resend, } temp = tempfile.NamedTemporaryFile(prefix='receipt-', suffix='.pdf', delete=False) temp.close()