X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/65c9feda79d2b2c94cb7dcd561318a83fd796f0a..788c99a388fd34de4c159d6a3cefed84291b95f5:/src/club/views.py diff --git a/src/club/views.py b/src/club/views.py index e80acaa94..d673cc021 100644 --- a/src/club/views.py +++ b/src/club/views.py @@ -1,5 +1,9 @@ +# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. +# from django.conf import settings from django.contrib.auth.decorators import login_required +from django.db.models import Sum from django.http import HttpResponseRedirect from django.shortcuts import get_object_or_404, render from django.utils.decorators import method_decorator @@ -11,7 +15,7 @@ from .payu import views as payu_views from .forms import ScheduleForm, PayUCardTokenForm from . import models from .helpers import get_active_schedule -from .payment_methods import payure_method +from .payment_methods import recurring_payment_method class ClubView(TemplateView): @@ -39,21 +43,19 @@ class JoinView(CreateView): request.session['from_app'] = True elif request.session and 'from_app' in request.session: del request.session['from_app'] - schedule = get_active_schedule(request.user) - if schedule is not None: - return HttpResponseRedirect(schedule.get_absolute_url()) - else: - return super(JoinView, self).get(request) - - def get_form_kwargs(self): - kwargs = super().get_form_kwargs() - kwargs['request'] = self.request - return kwargs + #schedule = get_active_schedule(request.user) + #if schedule is not None: + # return HttpResponseRedirect(schedule.get_absolute_url()) + #else: + return super(JoinView, self).get(request) def get_context_data(self, **kwargs): c = super(JoinView, self).get_context_data(**kwargs) c['membership'] = getattr(self.request.user, 'membership', None) c['active_menu_item'] = 'club' + c['club'] = models.Club.objects.first() + + c['ambassador'] = models.Ambassador.objects.all().order_by('?').first() return c def get_initial(self): @@ -118,8 +120,14 @@ class DummyPaymentView(TemplateView): return HttpResponseRedirect(schedule.get_absolute_url()) -class PayUPayment(payu_views.Payment): - pass +class PayUPayment(DetailView): + model = models.Schedule + slug_field = slug_url_kwarg = 'key' + + def get(self, request, key): + schedule = self.get_object() + return HttpResponseRedirect(schedule.initiate_payment(request)) + class PayURecPayment(payu_views.RecPayment): @@ -129,7 +137,7 @@ class PayURecPayment(payu_views.RecPayment): return get_object_or_404(models.Schedule, key=self.kwargs['key']) def get_pos(self): - pos_id = payure_method.pos_id + pos_id = recurring_payment_method.pos_id return POSS[pos_id] def get_success_url(self): @@ -161,3 +169,18 @@ class ScheduleThanksView(DetailView): ctx['active_menu_item'] = 'club' return ctx + +class YearSummaryView(DetailView): + model = models.Schedule + slug_field = slug_url_kwarg = 'key' + template_name = 'club/year_summary.html' + + def get_context_data(self, *args, **kwargs): + ctx = super().get_context_data(*args, **kwargs) + ctx['payments'] = models.PayUOrder.objects.filter( + status='COMPLETED', + completed_at__year=self.kwargs['year'], + schedule__email=self.object.email, + ).order_by('completed_at') + ctx['total_amount'] = ctx['payments'].aggregate(s=Sum('schedule__amount'))['s'] + return ctx