X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/967eed676fc83d15b26149047f353ac61faa8217..df60910b2d457f031cbe0a153e51e7378c0165d8:/src/funding/models.py
diff --git a/src/funding/models.py b/src/funding/models.py
index 6ca02615f..0e3fa425d 100644
--- a/src/funding/models.py
+++ b/src/funding/models.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
#
@@ -6,18 +5,19 @@ from datetime import date, datetime
from urllib.parse import urlencode
from django.conf import settings
from django.contrib.sites.models import Site
-from django.core.urlresolvers import reverse
from django.core.mail import send_mail
from django.db import models
from django.dispatch import receiver
from django.template.loader import render_to_string
+from django.urls import reverse
+from django.utils.html import mark_safe
from django.utils.timezone import utc
from django.utils.translation import ugettext_lazy as _, override
import getpaid
-from ssify import flush_ssi_includes
from catalogue.models import Book
from catalogue.utils import get_random_hash
from polls.models import Poll
+from wolnelektury.utils import cached_render, clear_cached_renders
from . import app_settings
@@ -31,7 +31,7 @@ class Offer(models.Model):
start = models.DateField(_('start'), db_index=True)
end = models.DateField(_('end'), db_index=True)
redakcja_url = models.URLField(_('redakcja URL'), blank=True)
- book = models.ForeignKey(Book, null=True, blank=True, help_text=_('Published book.'))
+ book = models.ForeignKey(Book, models.PROTECT, null=True, blank=True, help_text=_('Published book.'))
cover = models.ImageField(_('Cover'), upload_to='funding/covers')
poll = models.ForeignKey(Poll, help_text=_('Poll'), null=True, blank=True, on_delete=models.SET_NULL)
@@ -39,9 +39,8 @@ class Offer(models.Model):
notified_end = models.DateTimeField(_('End notifications sent'), blank=True, null=True)
def cover_img_tag(self):
- return u'
' % self.cover.url
+ return mark_safe('' % self.cover.url)
cover_img_tag.short_description = _('Cover preview')
- cover_img_tag.allow_tags = True
class Meta:
verbose_name = _('offer')
@@ -49,7 +48,7 @@ class Offer(models.Model):
ordering = ['-end']
def __str__(self):
- return u"%s - %s" % (self.author, self.title)
+ return "%s - %s" % (self.author, self.title)
def get_absolute_url(self):
return reverse('funding_offer', args=[self.slug])
@@ -59,26 +58,17 @@ class Offer(models.Model):
self.book_id is not None and self.pk is not None and
type(self).objects.values('book').get(pk=self.pk)['book'] != self.book_id)
retval = super(Offer, self).save(*args, **kw)
- self.flush_includes()
+ self.clear_cache()
if published_now:
self.notify_published()
return retval
- def flush_includes(self):
- flush_ssi_includes([
- template % (self.pk, lang)
- for template in [
- '/wesprzyj/o/%d/top-bar.%s.html',
- '/wesprzyj/o/%d/detail-bar.%s.html',
- '/wesprzyj/o/%d/list-bar.%s.html',
- '/wesprzyj/o/%d/status.%s.html',
- '/wesprzyj/o/%d/status-more.%s.html',
- ] + [
- '/wesprzyj/o/%%d/fundings/%d.%%s.html' % page
- for page in range(1, len(self.funding_payed()) // 10 + 2)
- ]
- for lang in [lc for (lc, _ln) in settings.LANGUAGES]
- ])
+ def clear_cache(self):
+ clear_cached_renders(self.top_bar)
+ clear_cached_renders(self.list_bar)
+ clear_cached_renders(self.detail_bar)
+ clear_cached_renders(self.status)
+ clear_cached_renders(self.status_more)
def is_current(self):
return self.start <= date.today() <= self.end and self == self.current()
@@ -200,6 +190,55 @@ class Offer(models.Model):
'current': self.current(),
})
+ def basic_info(self):
+ offer_sum = self.sum()
+ return {
+ 'offer': self,
+ 'sum': offer_sum,
+ 'is_current': self.is_current(),
+ 'is_win': offer_sum >= self.target,
+ 'missing': self.target - offer_sum,
+ 'percentage': 100 * offer_sum / self.target,
+
+ 'show_title': True,
+ 'show_title_calling': True,
+ }
+
+ @cached_render('funding/includes/funding.html')
+ def top_bar(self):
+ ctx = self.basic_info()
+ ctx.update({
+ 'link': True,
+ 'closeable': True,
+ 'add_class': 'funding-top-header',
+ })
+ return ctx
+
+ @cached_render('funding/includes/funding.html')
+ def list_bar(self):
+ ctx = self.basic_info()
+ ctx.update({
+ 'link': True,
+ 'show_title_calling': False,
+ })
+ return ctx
+
+ @cached_render('funding/includes/funding.html')
+ def detail_bar(self):
+ ctx = self.basic_info()
+ ctx.update({
+ 'show_title': False,
+ })
+ return ctx
+
+ @cached_render('funding/includes/offer_status.html')
+ def status(self):
+ return {'offer': self}
+
+ @cached_render('funding/includes/offer_status_more.html')
+ def status_more(self):
+ return {'offer': self}
+
class Perk(models.Model):
""" A perk offer.
@@ -207,7 +246,7 @@ class Perk(models.Model):
If no attached to a particular Offer, applies to all.
"""
- offer = models.ForeignKey(Offer, verbose_name=_('offer'), null=True, blank=True)
+ offer = models.ForeignKey(Offer, models.CASCADE, verbose_name=_('offer'), null=True, blank=True)
price = models.DecimalField(_('price'), decimal_places=2, max_digits=10)
name = models.CharField(_('name'), max_length=255)
long_name = models.CharField(_('long name'), max_length=255)
@@ -219,7 +258,7 @@ class Perk(models.Model):
ordering = ['-price']
def __str__(self):
- return "%s (%s%s)" % (self.name, self.price, u" for %s" % self.offer if self.offer else "")
+ return "%s (%s%s)" % (self.name, self.price, " for %s" % self.offer if self.offer else "")
class Funding(models.Model):
@@ -228,9 +267,10 @@ class Funding(models.Model):
The payment was completed if and only if payed_at is set.
"""
- offer = models.ForeignKey(Offer, verbose_name=_('offer'))
+ offer = models.ForeignKey(Offer, models.PROTECT, verbose_name=_('offer'))
name = models.CharField(_('name'), max_length=127, blank=True)
email = models.EmailField(_('email'), blank=True, db_index=True)
+ user = models.ForeignKey(settings.AUTH_USER_MODEL, models.SET_NULL, blank=True, null=True)
amount = models.DecimalField(_('amount'), decimal_places=2, max_digits=10)
payed_at = models.DateTimeField(_('payed at'), null=True, blank=True, db_index=True)
perks = models.ManyToManyField(Perk, verbose_name=_('perks'), blank=True)
@@ -265,11 +305,14 @@ class Funding(models.Model):
'key': self.notify_key,
}))
+ def wl_optout_url(self):
+ return 'https://wolnelektury.pl' + self.get_disable_notifications_url()
+
def save(self, *args, **kwargs):
if self.email and not self.notify_key:
self.notify_key = get_random_hash(self.email)
ret = super(Funding, self).save(*args, **kwargs)
- self.offer.flush_includes()
+ self.offer.clear_cache()
return ret
@classmethod
@@ -309,7 +352,7 @@ getpaid.register_to_payment(Funding, unique=False, related_name='payment')
class Spent(models.Model):
""" Some of the remaining money spent on a book. """
- book = models.ForeignKey(Book)
+ book = models.ForeignKey(Book, models.PROTECT)
amount = models.DecimalField(_('amount'), decimal_places=2, max_digits=10)
timestamp = models.DateField(_('when'))
@@ -319,7 +362,7 @@ class Spent(models.Model):
ordering = ['-timestamp']
def __str__(self):
- return u"Spent: %s" % str(self.book)
+ return "Spent: %s" % str(self.book)
@receiver(getpaid.signals.new_payment_query)