Fix imports.

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

diff --git a/src/paypal/views.py b/src/paypal/views.py
index 6708f2d..01d3a5a 100644 (file)
--- 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.
 #
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #


@@ -9,15 +8,15 @@ from django.http import Http404
 from django.http.response import HttpResponseRedirect, HttpResponseForbidden
 from django.shortcuts import render
 
 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.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, app=False):
     if request.POST:
 
 
 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():
             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:
             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()
             return HttpResponseRedirect(approval_url)
     else:
         form = PaypalSubscriptionForm()


@@ -37,18 +36,18 @@ def paypal_return(request, app=False):
     token = request.GET.get('token')
     if not token:
         raise Http404
     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)
         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)
     else:
         resource = None
     if app:
                 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')
             return HttpResponseAppRedirect('wolnelekturyapp://paypal_error')
         else:
             return HttpResponseAppRedirect('wolnelekturyapp://paypal_return')