X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/1a12630094dd57a463a8a1d4f64744e3b3b245af..481c75133987a510db34b0950b6861962aa2aaab:/src/paypal/views.py diff --git a/src/paypal/views.py b/src/paypal/views.py index 81c198559..6708f2d86 100644 --- 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.piston_patch 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 -def paypal_form(request): +def paypal_form(request, app=False): if request.POST: if not request.user.is_authenticated(): return HttpResponseForbidden() @@ -22,7 +23,7 @@ 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 HttpResponseRedirect(approval_url) @@ -32,7 +33,7 @@ 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 @@ -44,7 +45,15 @@ def paypal_return(request): active = check_agreement(resource.id) BillingAgreementModel.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'): + return HttpResponseAppRedirect('wolnelekturyapp://paypal_error') + else: + return HttpResponseAppRedirect('wolnelekturyapp://paypal_return') + else: + return render(request, 'paypal/return.html', {'resource': resource}) def paypal_cancel(request):