X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/ea656434007c3ec64f0e583c65e177b08403c865..2a8b16aa45fb2b17f92068016ec72f93ccdef776:/apps/funding/models.py

diff --git a/apps/funding/models.py b/apps/funding/models.py
index 10243132c..de90226f3 100644
--- a/apps/funding/models.py
+++ b/apps/funding/models.py
@@ -15,14 +15,15 @@ class Offer(models.Model):
     author = models.CharField(_('author'), max_length=255)
     title = models.CharField(_('title'), max_length=255)
     slug = models.SlugField(_('slug'))
-    book = models.ForeignKey(Book, null=True, blank=True,
-        help_text=_('Published book.'))
-    redakcja_url = models.URLField(_('redakcja URL'), blank=True)
+    description = models.TextField(_('description'), blank=True)
     target = models.DecimalField(_('target'), decimal_places=2, max_digits=10)
     start = models.DateField(_('start'))
     end = models.DateField(_('end'))
     due = models.DateField(_('due'),
         help_text=_('When will it be published if the money is raised.'))
+    redakcja_url = models.URLField(_('redakcja URL'), blank=True)
+    book = models.ForeignKey(Book, null=True, blank=True,
+        help_text=_('Published book.'))
 
     class Meta:
         verbose_name = _('offer')
@@ -30,7 +31,7 @@ class Offer(models.Model):
         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])
@@ -38,6 +39,17 @@ class Offer(models.Model):
     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. """
@@ -62,7 +74,7 @@ class Offer(models.Model):
         """
         perks = Perk.objects.filter(
                 models.Q(offer=self) | models.Q(offer=None)
-            )
+            ).exclude(end_date__lt=date.today())
         if amount is not None:
             perks = perks.filter(price__lte=amount)
         return perks
@@ -75,14 +87,6 @@ class Offer(models.Model):
         """ 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.
@@ -94,6 +98,7 @@ class Perk(models.Model):
     price = models.DecimalField(_('price'), decimal_places=2, max_digits=10)
     name = models.CharField(_('name'), max_length=255)
     description = models.TextField(_('description'), blank=True)
+    end_date = models.DateField(_('end date'), null=True, blank=True)
 
     class Meta:
         verbose_name = _('perk')
@@ -116,7 +121,8 @@ class Funding(models.Model):
     amount = models.DecimalField(_('amount'), decimal_places=2, max_digits=10)
     payed_at = models.DateTimeField(_('payed at'), null=True, blank=True)
     perks = models.ManyToManyField(Perk, verbose_name=_('perks'), blank=True)
-    anonymous = models.BooleanField(_('anonymous'))
+
+    # Any additional info needed for perks?
 
     @classmethod
     def payed(cls):
@@ -129,7 +135,7 @@ class Funding(models.Model):
         ordering = ['-payed_at']
 
     def __unicode__(self):
-        return "%s payed %s for %s" % (self.name, self.amount, self.offer)
+        return unicode(self.offer)
 
     def get_absolute_url(self):
         return reverse('funding_funding', args=[self.pk])
@@ -140,9 +146,9 @@ 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)
     amount = models.DecimalField(_('amount'), decimal_places=2, max_digits=10)
     timestamp = models.DateField(_('when'))
-    book = models.ForeignKey(Book)
 
     class Meta:
         verbose_name = _('money spent on a book')