From 06bf80ca7326e9e1c72b27cb4734f9eefc20f68e Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Thu, 29 Aug 2019 19:13:16 +0200 Subject: no more redirect URL --- talerdonations/donations/donations.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'talerdonations/donations/donations.py') diff --git a/talerdonations/donations/donations.py b/talerdonations/donations/donations.py index 886705f..d4dd36d 100644 --- a/talerdonations/donations/donations.py +++ b/talerdonations/donations/donations.py @@ -269,7 +269,18 @@ def fulfillment(receiver): pay_params = dict(instance=receiver, order_id=order_id) pay_status = backend_get("check-payment", pay_params) - if pay_status.get("payment_redirect_url"): + + if pay_status.get("paid"): + extra = pay_status["contract_terms"]["extra"] + return flask.render_template( + "templates/fulfillment.html", + donation_receiver=extra["receiver"], + donation_amount=extra["amount"], + donation_donor=extra["donor"], + order_id=order_id, + currency=CURRENCY + ) + else: taler_pay_uri = pay_status["taler_pay_uri"] qrcode_svg = get_qrcode_svg(taler_pay_uri) check_status_url_enc = urllib.parse.quote( @@ -286,16 +297,5 @@ def fulfillment(receiver): resp = flask.Response(content, status=402, headers=headers) return resp - if pay_status.get("paid"): - extra = pay_status["contract_terms"]["extra"] - return flask.render_template( - "templates/fulfillment.html", - donation_receiver=extra["receiver"], - donation_amount=extra["amount"], - donation_donor=extra["donor"], - order_id=order_id, - currency=CURRENCY - ) - # no pay_redirect but article not paid, this should never happen! err_abort(500, message="Internal error, invariant failed", json=pay_status) -- cgit v1.2.3