Minor carousel fixes.

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

diff --git a/src/funding/models.py b/src/funding/models.py
index e36b732..6ca0261 100644 (file)
--- a/src/funding/models.py
+++ b/src/funding/models.py
@@ -3,12 +3,13 @@
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from datetime import date, datetime
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from datetime import date, datetime

-from urllib import urlencode
+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.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.utils.timezone import utc
 from django.utils.translation import ugettext_lazy as _, override
 from django.template.loader import render_to_string
 from django.utils.timezone import utc
 from django.utils.translation import ugettext_lazy as _, override


@@ -30,8 +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)
     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, 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)
 
     cover = models.ImageField(_('Cover'), upload_to='funding/covers')
     poll = models.ForeignKey(Poll, help_text=_('Poll'), null=True, blank=True, on_delete=models.SET_NULL)
 


@@ -48,15 +48,15 @@ class Offer(models.Model):
         verbose_name_plural = _('offers')
         ordering = ['-end']
 
         verbose_name_plural = _('offers')
         ordering = ['-end']
 

-    def __unicode__(self):
+    def __str__(self):

         return u"%s - %s" % (self.author, self.title)
 
     def get_absolute_url(self):
         return reverse('funding_offer', args=[self.slug])
 
     def save(self, *args, **kw):
         return u"%s - %s" % (self.author, self.title)
 
     def get_absolute_url(self):
         return reverse('funding_offer', args=[self.slug])
 
     def save(self, *args, **kw):

-        published_now = (self.book_id is not None and
-            self.pk is not None and
+        published_now = (
+            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()
             type(self).objects.values('book').get(pk=self.pk)['book'] != self.book_id)
         retval = super(Offer, self).save(*args, **kw)
         self.flush_includes()


@@ -157,7 +157,8 @@ class Offer(models.Model):
         )
 
     def notify_end(self, force=False):
         )
 
     def notify_end(self, force=False):

-        if not force and self.notified_end: return
+        if not force and self.notified_end:
+            return

         assert not self.is_current()
         self.notify_all(
             _('The fundraiser has ended!'),
         assert not self.is_current()
         self.notify_all(
             _('The fundraiser has ended!'),


@@ -171,7 +172,8 @@ class Offer(models.Model):
         self.save()
 
     def notify_near(self, force=False):
         self.save()
 
     def notify_near(self, force=False):

-        if not force and self.notified_near: return
+        if not force and self.notified_near:
+            return

         assert self.is_current()
         sum_ = self.sum()
         need = self.target - sum_
         assert self.is_current()
         sum_ = self.sum()
         need = self.target - sum_


@@ -216,7 +218,7 @@ class Perk(models.Model):
         verbose_name_plural = _('perks')
         ordering = ['-price']
 
         verbose_name_plural = _('perks')
         ordering = ['-price']
 

-    def __unicode__(self):
+    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, u" for %s" % self.offer if self.offer else "")
 
 


@@ -239,15 +241,15 @@ class Funding(models.Model):
     class Meta:
         verbose_name = _('funding')
         verbose_name_plural = _('fundings')
     class Meta:
         verbose_name = _('funding')
         verbose_name_plural = _('fundings')

-        ordering = ['-payed_at']
+        ordering = ['-payed_at', 'pk']

 
     @classmethod
     def payed(cls):
         """ QuerySet for all completed payments. """
         return cls.objects.exclude(payed_at=None)
 
 
     @classmethod
     def payed(cls):
         """ QuerySet for all completed payments. """
         return cls.objects.exclude(payed_at=None)
 

-    def __unicode__(self):
-        return unicode(self.offer)
+    def __str__(self):
+        return str(self.offer)

 
     def get_absolute_url(self):
         return reverse('funding_funding', args=[self.pk])
 
     def get_absolute_url(self):
         return reverse('funding_funding', args=[self.pk])


@@ -256,7 +258,8 @@ class Funding(models.Model):
         return ", ".join(perk.name for perk in self.perks.all())
 
     def get_disable_notifications_url(self):
         return ", ".join(perk.name for perk in self.perks.all())
 
     def get_disable_notifications_url(self):

-        return "%s?%s" % (reverse("funding_disable_notifications"),
+        return "%s?%s" % (
+            reverse("funding_disable_notifications"),

             urlencode({
                 'email': self.email,
                 'key': self.notify_key,
             urlencode({
                 'email': self.email,
                 'key': self.notify_key,


@@ -270,8 +273,7 @@ class Funding(models.Model):
         return ret
 
     @classmethod
         return ret
 
     @classmethod

-    def notify_funders(cls, subject, template_name, extra_context=None,
-                query_filter=None, payed_only=True):
+    def notify_funders(cls, subject, template_name, extra_context=None, query_filter=None, payed_only=True):

         funders = cls.objects.exclude(email="").filter(notifications=True)
         if payed_only:
             funders = funders.exclude(payed_at=None)
         funders = cls.objects.exclude(email="").filter(notifications=True)
         if payed_only:
             funders = funders.exclude(payed_at=None)


@@ -292,12 +294,9 @@ class Funding(models.Model):
         if extra_context:
             context.update(extra_context)
         with override(self.language_code or app_settings.DEFAULT_LANGUAGE):
         if extra_context:
             context.update(extra_context)
         with override(self.language_code or app_settings.DEFAULT_LANGUAGE):

-            send_mail(subject,
-                render_to_string(template_name, context),
-                settings.CONTACT_EMAIL,
-                [self.email],
-                fail_silently=False
-            )
+            send_mail(
+                subject, render_to_string(template_name, context), settings.CONTACT_EMAIL, [self.email],
+                fail_silently=False)

 
     def disable_notifications(self):
         """Disables all notifications for this e-mail address."""
 
     def disable_notifications(self):
         """Disables all notifications for this e-mail address."""


@@ -319,22 +318,24 @@ class Spent(models.Model):
         verbose_name_plural = _('money spent on books')
         ordering = ['-timestamp']
 
         verbose_name_plural = _('money spent on books')
         ordering = ['-timestamp']
 

-    def __unicode__(self):
-        return u"Spent: %s" % unicode(self.book)
+    def __str__(self):
+        return u"Spent: %s" % str(self.book)

 
 
 
 

+@receiver(getpaid.signals.new_payment_query)

 def new_payment_query_listener(sender, order=None, payment=None, **kwargs):
     """ Set payment details for getpaid. """
     payment.amount = order.amount
     payment.currency = 'PLN'
 def new_payment_query_listener(sender, order=None, payment=None, **kwargs):
     """ Set payment details for getpaid. """
     payment.amount = order.amount
     payment.currency = 'PLN'

-getpaid.signals.new_payment_query.connect(new_payment_query_listener)

 
 
 
 

+@receiver(getpaid.signals.user_data_query)

 def user_data_query_listener(sender, order, user_data, **kwargs):
     """ Set user data for payment. """
     user_data['email'] = order.email
 def user_data_query_listener(sender, order, user_data, **kwargs):
     """ Set user data for payment. """
     user_data['email'] = order.email

-getpaid.signals.user_data_query.connect(user_data_query_listener)

 
 

+
+@receiver(getpaid.signals.payment_status_changed)

 def payment_status_changed_listener(sender, instance, old_status, new_status, **kwargs):
     """ React to status changes from getpaid. """
     if old_status != 'paid' and new_status == 'paid':
 def payment_status_changed_listener(sender, instance, old_status, new_status, **kwargs):
     """ React to status changes from getpaid. """
     if old_status != 'paid' and new_status == 'paid':


@@ -345,4 +346,3 @@ def payment_status_changed_listener(sender, instance, old_status, new_status, **
                 _('Thank you for your support!'),
                 'funding/email/thanks.txt'
             )
                 _('Thank you for your support!'),
                 'funding/email/thanks.txt'
             )

-getpaid.signals.payment_status_changed.connect(payment_status_changed_listener)