X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/1a6ad5b9b48a5efa90410fd324c256f59f57e08f..1b2102e996789db8a8c6bc1e71f1798a87731a22:/src/club/views.py diff --git a/src/club/views.py b/src/club/views.py index 920180a49..6a5c7d725 100644 --- a/src/club/views.py +++ b/src/club/views.py @@ -3,6 +3,7 @@ # 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 @@ -42,10 +43,6 @@ 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_context_data(self, **kwargs): @@ -63,6 +60,11 @@ class JoinView(CreateView): 'email': self.request.user.email, } + def get_form_kwargs(self): + kwargs = super().get_form_kwargs() + kwargs['referer'] = self.request.META.get('HTTP_REFERER', '') + return kwargs + def form_valid(self, form): retval = super(JoinView, self).form_valid(form) if self.request.user.is_authenticated: @@ -168,3 +170,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