summaryrefslogtreecommitdiff
path: root/talermerchantdemos/donations/donations.py
diff options
context:
space:
mode:
Diffstat (limited to 'talermerchantdemos/donations/donations.py')
-rw-r--r--talermerchantdemos/donations/donations.py43
1 files changed, 18 insertions, 25 deletions
diff --git a/talermerchantdemos/donations/donations.py b/talermerchantdemos/donations/donations.py
index 08b4cfe..4acb8c5 100644
--- a/talermerchantdemos/donations/donations.py
+++ b/talermerchantdemos/donations/donations.py
@@ -18,21 +18,18 @@
# @brief Implementation of a donations site.
import base64
-import flask
import logging
+import flask
import lxml.etree
import os
import qrcode
import qrcode.image.svg
-import random
-import requests
import time
import traceback
import urllib
-import uuid
from taler.util.talerconfig import TalerConfig
-from urllib.parse import urljoin, parse_qsl
-from .httpcommon import backend_post, backend_get
+from urllib.parse import urljoin
+from ..httpcommon import backend_post, backend_get
LOGGER = logging.getLogger(__name__)
@@ -94,7 +91,7 @@ def backend_instanced_get(instance, endpoint, params):
# @return the backend response (JSON format).
def backend_instanced_post(instance, endpoint, json):
backend_url = urljoin(BACKEND_BASE_URL, f"instances/{instance}/")
- return backend_post(backend_url, endpoint, params)
+ return backend_post(backend_url, endpoint, json)
##
# Inspect GET arguments in the look for a parameter.
@@ -253,21 +250,17 @@ def fulfillment(receiver):
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(
- flask.url_for("check_status", instance=receiver, order_id=order_id)
- )
- content = flask.render_template(
- "templates/request_payment.html",
- taler_pay_uri=taler_pay_uri,
- qrcode_svg=qrcode_svg,
- check_status_url_enc=check_status_url_enc
- )
- headers = {"Taler": taler_pay_uri}
- resp = flask.Response(content, status=402, headers=headers)
- return resp
-
- # no pay_redirect but article not paid, this should never happen!
- err_abort(500, message="Internal error, invariant failed", json=pay_status)
+ taler_pay_uri = pay_status["taler_pay_uri"]
+ qrcode_svg = get_qrcode_svg(taler_pay_uri)
+ check_status_url_enc = urllib.parse.quote(
+ flask.url_for("check_status", instance=receiver, order_id=order_id)
+ )
+ content = flask.render_template(
+ "templates/request_payment.html",
+ taler_pay_uri=taler_pay_uri,
+ qrcode_svg=qrcode_svg,
+ check_status_url_enc=check_status_url_enc
+ )
+ headers = {"Taler": taler_pay_uri}
+ resp = flask.Response(content, status=402, headers=headers)
+ return resp