Fixes #4076: Recommendations from collections.

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

diff --git a/src/club/views.py b/src/club/views.py
index 32daffd..e93864c 100644 (file)
--- 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.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
 from django.http import HttpResponseRedirect
 from django.shortcuts import get_object_or_404, render
 from django.utils.decorators import method_decorator


@@ -42,11 +43,7 @@ class JoinView(CreateView):
             request.session['from_app'] = True
         elif request.session and 'from_app' in request.session:
             del request.session['from_app']
             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)
+        return super(JoinView, self).get(request)

 
     def get_context_data(self, **kwargs):
         c = super(JoinView, self).get_context_data(**kwargs)
 
     def get_context_data(self, **kwargs):
         c = super(JoinView, self).get_context_data(**kwargs)


@@ -119,8 +116,14 @@ class DummyPaymentView(TemplateView):
         return HttpResponseRedirect(schedule.get_absolute_url())
 
 
         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):
 
 
 class PayURecPayment(payu_views.RecPayment):


@@ -162,3 +165,18 @@ class ScheduleThanksView(DetailView):
         ctx['active_menu_item'] = 'club'
         return ctx
 
         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