From 2801eacc969509920ca44f0b889fdc00fc7fd93a Mon Sep 17 00:00:00 2001 From: Magnus Hagander Date: Thu, 11 Oct 2018 13:06:07 +0200 Subject: [PATCH] Don't put None in return URLs for bank transfer payments None got turned into the string None, and then put in the URL, which means the return URL was simply broken. In the case where there is no return url, the link shouldn't be there at all. --- postgresqleu/invoices/views.py | 9 ++++++--- postgresqleu/util/payment/banktransfer.py | 3 ++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/postgresqleu/invoices/views.py b/postgresqleu/invoices/views.py index 9510e78..13d3952 100644 --- a/postgresqleu/invoices/views.py +++ b/postgresqleu/invoices/views.py @@ -403,11 +403,14 @@ def userhome(request): @login_required def banktransfer(request): - return render(request, 'invoices/banktransfer.html', { + param = { 'title': request.GET['title'], 'amount': request.GET['amount'], - 'returnurl': request.GET['ret'], - }) + } + if request.GET.has_key('ret'): + param['returnurl'] = request.GET['ret'] + + return render(request, 'invoices/banktransfer.html', param) @login_required @transaction.atomic diff --git a/postgresqleu/util/payment/banktransfer.py b/postgresqleu/util/payment/banktransfer.py index ea76a7c..c91cce4 100644 --- a/postgresqleu/util/payment/banktransfer.py +++ b/postgresqleu/util/payment/banktransfer.py @@ -11,6 +11,7 @@ payment in Euros, and requires you to cover all transfer charges. param = { 'title': invoicestr.encode('utf-8'), 'amount': invoiceamount, - 'ret': returnurl, } + if returnurl: + param['ret'] = returnurl return "/invoices/banktransfer/?%s" % urlencode(param) -- 2.39.5