More Py3 compatibility fixes.

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

diff --git a/src/paypal/views.py b/src/paypal/views.py
index 81c1985..c541ba8 100644 (file)
--- a/src/paypal/views.py
+++ b/src/paypal/views.py
@@ -9,12 +9,13 @@ from django.http import Http404
 from django.http.response import HttpResponseRedirect, HttpResponseForbidden
 from django.shortcuts import render
 
+from api.utils import HttpResponseAppRedirect
 from paypal.forms import PaypalSubscriptionForm
 from paypal.rest import execute_agreement, check_agreement, agreement_approval_url, PaypalError
-from paypal.models import BillingAgreement as BillingAgreementModel, BillingPlan
+from paypal.models import BillingAgreement, BillingPlan
 
 
-def paypal_form(request):
+def paypal_form(request, app=False):
     if request.POST:
         if not request.user.is_authenticated():
             return HttpResponseForbidden()
@@ -22,9 +23,9 @@ def paypal_form(request):
         if form.is_valid():
             amount = form.cleaned_data['amount']
             try:
-                approval_url = agreement_approval_url(amount)
+                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()
@@ -32,19 +33,27 @@ def paypal_form(request):
 
 
 @login_required
-def paypal_return(request):
+def paypal_return(request, app=False):
     token = request.GET.get('token')
     if not token:
         raise Http404
-    if not BillingAgreementModel.objects.filter(token=token):
+    if not BillingAgreement.objects.filter(token=token):
         resource = execute_agreement(token)
         if resource.id:
             amount = int(Decimal(resource.plan.payment_definitions[0].amount['value']))
             plan = BillingPlan.objects.get(amount=amount)
-            active = check_agreement(resource.id)
-            BillingAgreementModel.objects.create(
+            active = check_agreement(resource.id) or False
+            BillingAgreement.objects.create(
                 agreement_id=resource.id, user=request.user, plan=plan, active=active, token=token)
-    return render(request, 'paypal/return.html', {'resource': resource})
+    else:
+        resource = None
+    if app:
+        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})
 
 
 def paypal_cancel(request):