X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/468c2e650c854ffa691afc73aa1f41ce61283cdb..df4e3c8b0d4dfa9ec6d16340465dc4ed0182a297:/src/paypal/views.py?ds=sidebyside diff --git a/src/paypal/views.py b/src/paypal/views.py index a4c04ce08..01d3a5aab 100644 --- a/src/paypal/views.py +++ b/src/paypal/views.py @@ -1,4 +1,3 @@ -# -*- 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. # @@ -6,24 +5,26 @@ from decimal import Decimal from django.contrib.auth.decorators import login_required from django.http import Http404 -from django.http.response import HttpResponseRedirect +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 -@login_required -def paypal_form(request): +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) + 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() @@ -31,19 +32,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):