X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/7c324b777d31f1aa7b5f9549ad3c1ec920443f27..4fb23ed3c3396d23a37a718fc857ecc8b36b0c7f:/src/funding/views.py?ds=inline diff --git a/src/funding/views.py b/src/funding/views.py index 5d4669e66..5be8c4b89 100644 --- a/src/funding/views.py +++ b/src/funding/views.py @@ -1,12 +1,13 @@ -# 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 +from django.http import Http404, HttpResponseRedirect from django.shortcuts import get_object_or_404, redirect, render from django.urls import reverse +from django.contrib.auth.decorators import login_required from django.views.decorators.csrf import csrf_exempt from django.views.generic import TemplateView, FormView, ListView -from getpaid.models import Payment +import club.payu.views from . import app_settings from .forms import FundingForm from .models import Offer, Spent, Funding @@ -50,28 +51,22 @@ class WLFundView(TemplateView): 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( - (offers, lambda x: x.end, 'offer'), (Spent.objects.all().select_related(), lambda x: x.timestamp, 'spent'), + (offers, lambda x: x.end, 'offer'), )) return ctx class OfferDetailView(FormView): form_class = FundingForm - template_name = "funding/offer_detail.html" - backend = 'getpaid.backends.payu' + template_name = 'funding/offer_detail.html' @csrf_exempt def dispatch(self, request, slug=None): @@ -92,9 +87,9 @@ class OfferDetailView(FormView): if form_class is None: form_class = self.get_form_class() if self.request.method == 'POST': - return form_class(self.object, self.request.POST) + return form_class(self.request, self.object, self.request.POST) else: - return form_class(self.object, initial={'amount': app_settings.DEFAULT_AMOUNT}) + return form_class(self.request, self.object, initial={'amount': app_settings.DEFAULT_AMOUNT}) def get_context_data(self, **kwargs): ctx = super(OfferDetailView, self).get_context_data(**kwargs) @@ -105,11 +100,7 @@ class OfferDetailView(FormView): def form_valid(self, form): funding = form.save() - # Skip getpaid.forms.PaymentMethodForm, go directly to the broker. - payment = Payment.create(funding, self.backend) - gateway_url_tuple = payment.get_processor()(payment).get_gateway_url(self.request) - payment.change_status('in_progress') - return redirect(gateway_url_tuple[0]) + return redirect(funding.put()) class CurrentView(OfferDetailView): @@ -125,7 +116,8 @@ class CurrentView(OfferDetailView): 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 @@ -157,3 +149,20 @@ class DisableNotifications(TemplateView): def post(self, *args, **kwargs): self.object.disable_notifications() return redirect(self.request.get_full_path()) + + +@login_required +def claim(request, key): + funding = get_object_or_404(Funding, notify_key=key) + if funding.user is None: + funding.user = request.user + funding.save() + return HttpResponseRedirect( + funding.offer.book.get_absolute_url() if funding.offer.book is not None + else funding.offer.get_absolute_url() + ) + + +class PayUNotifyView(club.payu.views.NotifyView): + order_model = Funding +