Experiment fixes.

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

diff --git a/src/paypal/views.py b/src/paypal/views.py
index c78a19a..b1720f9 100644 (file)
--- a/src/paypal/views.py
+++ b/src/paypal/views.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
@@ -7,9 +6,10 @@ from decimal import Decimal
 from django.contrib.auth.decorators import login_required
 from django.http import Http404
 from django.http.response import HttpResponseRedirect, HttpResponseForbidden
-from django.shortcuts import render
+from django.shortcuts import get_object_or_404, render
 
 from api.utils import HttpResponseAppRedirect
+from club.models import Schedule
 from paypal.forms import PaypalSubscriptionForm
 from paypal.rest import execute_agreement, check_agreement, agreement_approval_url, PaypalError
 from paypal.models import BillingAgreement, BillingPlan
@@ -17,7 +17,7 @@ from paypal.models import BillingAgreement, BillingPlan
 
 def paypal_form(request, app=False):
     if request.POST:
-        if not request.user.is_authenticated():
+        if not request.user.is_authenticated:
             return HttpResponseForbidden()
         form = PaypalSubscriptionForm(data=request.POST)
         if form.is_valid():
@@ -25,7 +25,7 @@ def paypal_form(request, app=False):
             try:
                 approval_url = agreement_approval_url(amount, app=app)
             except PaypalError as e:
-                return render(request, 'paypal/error_page.html', {'error': e.message})
+                return render(request, 'paypal/error_page.html', {'error': str(e)})
             return HttpResponseRedirect(approval_url)
     else:
         form = PaypalSubscriptionForm()
@@ -33,7 +33,9 @@ def paypal_form(request, app=False):
 
 
 @login_required
-def paypal_return(request, app=False):
+def paypal_return(request, key, app=False):
+    schedule = get_object_or_404(Schedule, key=key)
+    
     token = request.GET.get('token')
     if not token:
         raise Http404
@@ -44,7 +46,9 @@ def paypal_return(request, app=False):
             plan = BillingPlan.objects.get(amount=amount)
             active = check_agreement(resource.id) or False
             BillingAgreement.objects.create(
-                agreement_id=resource.id, user=request.user, plan=plan, active=active, token=token)
+                agreement_id=resource.id, schedule=schedule, plan=plan, active=active, token=token)
+            if active:
+                schedule.set_payed()
     else:
         resource = None
     if app:
@@ -53,7 +57,7 @@ def paypal_return(request, app=False):
         else:
             return HttpResponseAppRedirect('wolnelekturyapp://paypal_return')
     else:
-        return render(request, 'paypal/return.html', {'resource': resource})
+        return HttpResponseRedirect(schedule.get_thanks_url())
 
 
 def paypal_cancel(request):