From 730e042eaf0fd4421d02e975d2593598a66b5ccf Mon Sep 17 00:00:00 2001 From: Kasper Brandt Date: Mon, 30 Jun 2014 16:32:42 +0200 Subject: [PATCH 01/25] [#147] Updated cancel button donation step 2 --- akvo/rsr/views.py | 6 +++++- .../partner_sites/project/donate/donate_redirect.html | 4 ++-- akvo/templates/rsr/project/donate/donate_step2.html | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/akvo/rsr/views.py b/akvo/rsr/views.py index da55e1f447..2f7b091acb 100644 --- a/akvo/rsr/views.py +++ b/akvo/rsr/views.py @@ -1083,7 +1083,7 @@ def donate(request, p, engine): if is_test_donation: invoice.test = True if request.session.get("donation_return_url", False): - return_url = request.session["donation_return_url"] + return_url = urljoin(request.session["donation_return_url"], reverse("donate_thanks")) del request.session["donation_return_url"] else: return_url = urljoin(request.domain_url, reverse("donate_thanks")) @@ -1138,6 +1138,10 @@ def donate(request, p, engine): donate_form = InvoiceForm(project=p, engine=engine, initial=dict(is_public=True)) + if request.session.get("donation_return_url", False): + request.session["cancel_url"] = request.session["donation_return_url"] + "/project/" + str(p.id) + else: + request.session["cancel_url"] = reverse("project_main", kwargs={'project_id': p.id}) return render_to_response("rsr/project/donate/donate_step2.html", dict(donate_form=donate_form, payment_engine=engine, diff --git a/akvo/templates/partner_sites/project/donate/donate_redirect.html b/akvo/templates/partner_sites/project/donate/donate_redirect.html index dce934a135..ea4a1ca5ef 100644 --- a/akvo/templates/partner_sites/project/donate/donate_redirect.html +++ b/akvo/templates/partner_sites/project/donate/donate_redirect.html @@ -3,7 +3,7 @@ {% block head %} - +