X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/4e361d55331351f56077e5f9999ecb4ee7e93819..972f33fb2d98a9ff59c931ac6a8a82def7cea6fe:/src/paypal/views.py?ds=inline

diff --git a/src/paypal/views.py b/src/paypal/views.py
index 01d3a5aab..7d7eea5c8 100644
--- a/src/paypal/views.py
+++ b/src/paypal/views.py
@@ -6,33 +6,26 @@ 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.utils import HttpResponseAppRedirect
-from paypal.forms import PaypalSubscriptionForm
-from paypal.rest import execute_agreement, check_agreement, agreement_approval_url, PaypalError
+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': str(e)})
-            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
@@ -43,7 +36,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:
@@ -52,7 +47,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):