Phone not required.

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

diff --git a/src/funding/views.py b/src/funding/views.py
index d34eccc..5be8c4b 100644 (file)
--- a/src/funding/views.py
+++ b/src/funding/views.py
@@ -1,5 +1,5 @@
-# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
-# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+# This file is part of Wolne Lektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Wolne Lektury. See NOTICE for more information.

 #
 from django.http import Http404, HttpResponseRedirect
 from django.shortcuts import get_object_or_404, redirect, render
 #
 from django.http import Http404, HttpResponseRedirect
 from django.shortcuts import get_object_or_404, redirect, render


@@ -51,32 +51,22 @@ class WLFundView(TemplateView):
         offers = []
 
         for o in Offer.past():
         offers = []
 
         for o in Offer.past():

-            if o.is_win():
-                o.wlfund = o.sum() - o.target
-                if o.wlfund > 0:
-                    offers.append(o)
-            else:
-                o.wlfund = o.sum()
-                if o.wlfund > 0:
-                    offers.append(o)
+            o.wlfund = o.sum()
+            if o.wlfund > 0:
+                offers.append(o)

         amount = sum(o.wlfund for o in offers) - sum(o.amount for o in Spent.objects.all())
 
         ctx['amount'] = amount
         ctx['log'] = add_total(amount, mix(
         amount = sum(o.wlfund for o in offers) - sum(o.amount for o in Spent.objects.all())
 
         ctx['amount'] = amount
         ctx['log'] = add_total(amount, mix(

-            (offers, lambda x: x.end, 'offer'),

             (Spent.objects.all().select_related(), lambda x: x.timestamp, 'spent'),
             (Spent.objects.all().select_related(), lambda x: x.timestamp, 'spent'),

+            (offers, lambda x: x.end, 'offer'),

         ))
         return ctx
 
 
 class OfferDetailView(FormView):
     form_class = FundingForm
         ))
         return ctx
 
 
 class OfferDetailView(FormView):
     form_class = FundingForm

-
-    def get_template_names(self):
-        if self.request.EXPERIMENTS['layout'].value:
-            return 'funding/2022/offer_detail.html'
-        else:
-            return "funding/offer_detail.html"
+    template_name = 'funding/offer_detail.html'

 
     @csrf_exempt
     def dispatch(self, request, slug=None):
 
     @csrf_exempt
     def dispatch(self, request, slug=None):


@@ -126,7 +116,8 @@ class CurrentView(OfferDetailView):
 
 class OfferListView(ListView):
     queryset = Offer.public()
 
 class OfferListView(ListView):
     queryset = Offer.public()

-
+    template_name = 'funding/offer_list.html'
+    

     def get_context_data(self, **kwargs):
         ctx = super(OfferListView, self).get_context_data(**kwargs)
         ctx['funding_no_show_current'] = True
     def get_context_data(self, **kwargs):
         ctx = super(OfferListView, self).get_context_data(**kwargs)
         ctx['funding_no_show_current'] = True