Add grammar to tags. Also: respect custom tag slugs on publishing.

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

diff --git a/src/paypal/views.py b/src/paypal/views.py
index 01d3a5a..b5640c4 100644 (file)
--- a/src/paypal/views.py
+++ b/src/paypal/views.py
@@ -6,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.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 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
 from paypal.forms import PaypalSubscriptionForm
 from paypal.rest import execute_agreement, check_agreement, agreement_approval_url, PaypalError
 from paypal.models import BillingAgreement, BillingPlan


@@ -31,8 +32,18 @@ def paypal_form(request, app=False):
     return render(request, 'paypal/form.html', {'form': form})
 
 
     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
 @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
     token = request.GET.get('token')
     if not token:
         raise Http404


@@ -43,7 +54,9 @@ def paypal_return(request, app=False):
             plan = BillingPlan.objects.get(amount=amount)
             active = check_agreement(resource.id) or False
             BillingAgreement.objects.create(
             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:
     else:
         resource = None
     if app:


@@ -52,7 +65,7 @@ def paypal_return(request, app=False):
         else:
             return HttpResponseAppRedirect('wolnelekturyapp://paypal_return')
     else:
         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):
 
 
 def paypal_cancel(request):