X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/f9b76b3071f108b29a086c14e745da2f3921d82c..56a76b9dc0745d22d9b1eac54348d6109dc3c0e1:/src/paypal/views.py

diff --git a/src/paypal/views.py b/src/paypal/views.py
index 15a7cf68a..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.
 #
@@ -9,7 +8,7 @@ from django.http import Http404
 from django.http.response import HttpResponseRedirect, HttpResponseForbidden
 from django.shortcuts import render
 
-from api.piston_patch import HttpResponseAppRedirect
+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, BillingPlan
@@ -17,7 +16,7 @@ from paypal.models import BillingAgreement, BillingPlan
 
 def paypal_form(request, app=False):
     if request.POST:
-        if not request.user.is_authenticated():
+        if not request.user.is_authenticated:
             return HttpResponseForbidden()
         form = PaypalSubscriptionForm(data=request.POST)
         if form.is_valid():
@@ -25,7 +24,7 @@ def paypal_form(request, app=False):
             try:
                 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()
@@ -42,13 +41,13 @@ def paypal_return(request, app=False):
         if resource.id:
             amount = int(Decimal(resource.plan.payment_definitions[0].amount['value']))
             plan = BillingPlan.objects.get(amount=amount)
-            active = check_agreement(resource.id)
+            active = check_agreement(resource.id) or False
             BillingAgreement.objects.create(
                 agreement_id=resource.id, user=request.user, plan=plan, active=active, token=token)
     else:
         resource = None
     if app:
-        if getattr(resource, 'error'):
+        if getattr(resource, 'error', None):
             return HttpResponseAppRedirect('wolnelekturyapp://paypal_error')
         else:
             return HttpResponseAppRedirect('wolnelekturyapp://paypal_return')