Minor fix.

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

diff --git a/apps/funding/models.py b/apps/funding/models.py
index 8d6fa62..d193b41 100644 (file)
--- a/apps/funding/models.py
+++ b/apps/funding/models.py
@@ -31,7 +31,7 @@ class Offer(models.Model):
         ordering = ['-end']
 
     def __unicode__(self):
         ordering = ['-end']
 
     def __unicode__(self):

-        return u"%s – %s" % (self.author, self.title)
+        return u"%s - %s" % (self.author, self.title)

 
     def get_absolute_url(self):
         return reverse('funding_offer', args=[self.slug])
 
     def get_absolute_url(self):
         return reverse('funding_offer', args=[self.slug])


@@ -39,6 +39,17 @@ class Offer(models.Model):
     def is_current(self):
         return self.start <= date.today() <= self.end
 
     def is_current(self):
         return self.start <= date.today() <= self.end
 

+    def is_win(self):
+        return self.sum() >= self.target
+
+    def remaining(self):
+        if self.is_current():
+            return None
+        if self.is_win():
+            return self.sum() - self.target
+        else:
+            return self.sum()
+

     @classmethod
     def current(cls):
         """ Returns current fundraiser or None. """
     @classmethod
     def current(cls):
         """ Returns current fundraiser or None. """


@@ -49,11 +60,17 @@ class Offer(models.Model):
         except IndexError:
             return None
 
         except IndexError:
             return None
 

+    @classmethod
+    def past(cls):
+        """ QuerySet for all current and past fundraisers. """
+        today = date.today()
+        return cls.objects.filter(end__lt=today)
+

     @classmethod
     def public(cls):
         """ QuerySet for all current and past fundraisers. """
         today = date.today()
     @classmethod
     def public(cls):
         """ QuerySet for all current and past fundraisers. """
         today = date.today()

-        return cls.objects.filter(start__lte=today)        
+        return cls.objects.filter(start__lte=today)

 
     def get_perks(self, amount=None):
         """ Finds all the perks for the offer.
 
     def get_perks(self, amount=None):
         """ Finds all the perks for the offer.


@@ -76,14 +93,6 @@ class Offer(models.Model):
         """ The money gathered. """
         return self.funding_payed().aggregate(s=models.Sum('amount'))['s'] or 0
 
         """ The money gathered. """
         return self.funding_payed().aggregate(s=models.Sum('amount'))['s'] or 0
 

-    def state(self):
-        if self.sum() >= self.target:
-            return 'win'
-        elif self.start <= date.today() <= self.end:
-            return 'running'
-        else:
-            return 'lose'
-

 
 class Perk(models.Model):
     """ A perk offer.
 
 class Perk(models.Model):
     """ A perk offer.


@@ -163,6 +172,11 @@ def new_payment_query_listener(sender, order=None, payment=None, **kwargs):
 getpaid.signals.new_payment_query.connect(new_payment_query_listener)
 
 
 getpaid.signals.new_payment_query.connect(new_payment_query_listener)
 
 

+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)
+

 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':