X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/f9b76b3071f108b29a086c14e745da2f3921d82c..8885fd14f5f040eb3aa69f1d705856f99a1fa572:/src/paypal/views.py?ds=inline

diff --git a/src/paypal/views.py b/src/paypal/views.py
index 15a7cf68a..444475f78 100644
--- a/src/paypal/views.py
+++ b/src/paypal/views.py
@@ -1,39 +1,31 @@
-# -*- 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.
+# This file is part of Wolne Lektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Wolne Lektury. See NOTICE for more information.
 #
 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, redirect
 
-from api.piston_patch import HttpResponseAppRedirect
-from paypal.forms import PaypalSubscriptionForm
-from paypal.rest import execute_agreement, check_agreement, agreement_approval_url, PaypalError
+from api.utils import HttpResponseAppRedirect
+from club.models import Schedule
+from paypal.rest import execute_agreement, check_agreement, agreement_approval_url
 from paypal.models import BillingAgreement, BillingPlan
 
 
-def paypal_form(request, app=False):
-    if request.POST:
-        if not request.user.is_authenticated():
-            return HttpResponseForbidden()
-        form = PaypalSubscriptionForm(data=request.POST)
-        if form.is_valid():
-            amount = form.cleaned_data['amount']
-            try:
-                approval_url = agreement_approval_url(amount, app=app)
-            except PaypalError as e:
-                return render(request, 'paypal/error_page.html', {'error': e.message})
-            return HttpResponseRedirect(approval_url)
-    else:
-        form = PaypalSubscriptionForm()
-    return render(request, 'paypal/form.html', {'form': form})
+def paypal_init(request, key):
+    schedule = get_object_or_404(Schedule, key=key)
+    schedule.method = 'paypal'
+    schedule.save(update_fields=['method'])
+    app = request.GET.get('app')
+    return redirect(agreement_approval_url(schedule.amount, schedule.key, app=app))
 
 
 @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
@@ -42,18 +34,20 @@ def paypal_return(request, app=False):
         if resource.id:
             amount = int(Decimal(resource.plan.payment_definitions[0].amount['value']))
             plan = BillingPlan.objects.get(amount=amount)
-            active = check_agreement(resource.id)
+            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:
-        if getattr(resource, 'error'):
+        if getattr(resource, 'error', None):
             return HttpResponseAppRedirect('wolnelekturyapp://paypal_error')
         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):