CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

PayPal: Refactor callback view

Browse Source
This commit is contained in:
Raphael Michel
2016-11-29 16:33:27 +01:00
parent eea6a5e9da
commit 2efde1669d
2 changed files with 32 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/pretix/plugins/paypal/payment.py
View File

@@ -114,7 +114,6 @@ class Paypal(BasePaymentProvider):
logger.error('Invalid payment state: ' + str(payment)) logger.error('Invalid payment state: ' + str(payment))
return return
request.session['payment_paypal_id'] = payment.id request.session['payment_paypal_id'] = payment.id
request.session['payment_paypal_event'] = self.event.id
for link in payment.links: for link in payment.links:
if link.method == "REDIRECT" and link.rel == "approval_url": if link.method == "REDIRECT" and link.rel == "approval_url":
return str(link.href) return str(link.href)

57
src/pretix/plugins/paypal/views.py
View File

@@ -4,41 +4,48 @@ from django.contrib import messages
from django.shortcuts import redirect from django.shortcuts import redirect
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from pretix.base.models import Event, Order from pretix.base.models import Order
from pretix.multidomain.urlreverse import eventreverse from pretix.multidomain.urlreverse import eventreverse
from pretix.plugins.paypal.payment import Paypal from pretix.plugins.paypal.payment import Paypal
from pretix.presale.utils import event_view
logger = logging.getLogger('pretix.plugins.paypal') logger = logging.getLogger('pretix.plugins.paypal')
def success(request, organizer=None, event=None): @event_view(require_live=False)
def success(request, *args, **kwargs):
pid = request.GET.get('paymentId') pid = request.GET.get('paymentId')
token = request.GET.get('token') token = request.GET.get('token')
payer = request.GET.get('PayerID') payer = request.GET.get('PayerID')
if pid == request.session.get('payment_paypal_id', None): request.session['payment_paypal_token'] = token
request.session['payment_paypal_token'] = token request.session['payment_paypal_payer'] = payer
request.session['payment_paypal_payer'] = payer
try: if request.session.get('payment_paypal_order'):
event = Event.objects.get(id=request.session['payment_paypal_event']) order = Order.objects.get(pk=request.session.get('payment_paypal_order'))
if request.session.get('payment_paypal_order'):
prov = Paypal(event)
order = Order.objects.get(pk=request.session.get('payment_paypal_order'))
resp = prov.payment_perform(request, order)
return redirect(resp or eventreverse(event, 'presale:event.order', kwargs={
'order': order.code,
'secret': order.secret
}) + '?paid=yes')
return redirect(eventreverse(event, 'presale:event.checkout', kwargs={'step': 'confirm'}))
except Event.DoesNotExist:
pass # TODO: Handle this
else: else:
pass # TODO: Handle this order = None
if pid == request.session.get('payment_paypal_id', None):
if order:
prov = Paypal(request.event)
resp = prov.payment_perform(request, order)
if resp:
return resp
else:
messages.error(request, _('Invalid response from PayPal received.'))
logger.error('Session did not contain payment_paypal_id')
return redirect(eventreverse(request.event, 'presale:event.checkout', kwargs={'step': 'payment'}))
if order:
return redirect(eventreverse(request.event, 'presale:event.order', kwargs={
'order': order.code,
'secret': order.secret
}) + ('?paid=yes' if order.status == Order.STATUS_PAID else ''))
else:
return redirect(eventreverse(request.event, 'presale:event.checkout', kwargs={'step': 'confirm'}))
def abort(request, organizer=None, event=None): @event_view(require_live=False)
def abort(request, *args, **kwargs):
messages.error(request, _('It looks like you canceled the PayPal payment')) messages.error(request, _('It looks like you canceled the PayPal payment'))
try: return redirect(eventreverse(request.event, 'presale:event.checkout', kwargs={'step': 'payment'}))
event = Event.objects.get(id=request.session['payment_paypal_event'])
return redirect(eventreverse(event, 'presale:event.checkout', kwargs={'step': 'payment'}))
except Event.DoesNotExist:
pass # TODO: Handle this