taler-merchant-demos

commit f10bf09ad96b8bab7eff07af8d89c7cc0c0656fb
parent 56945d4d5516988b7842d4de65736c3d28da9cc3
Author: MS <ms@taler.net>
Date:   Thu, 23 Jul 2020 19:13:29 +0200

remove the old check-payment

Diffstat:
M
talermerchantdemos/blog/blog.py
 | 
6
+++++-
M
talermerchantdemos/donations/donations.py
 | 
6
+++++-
M
talermerchantdemos/httpcommon/__init__.py
 | 
4
+++-

3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/talermerchantdemos/blog/blog.py b/talermerchantdemos/blog/blog.py
@@ -292,8 +292,12 @@ def article(article_name, data=None):
     # Prepare data for the upcoming payment check.
     #
     pay_params = dict(order_id=order_id, session_id=session_id)
+    pay_status = backend_get(
+        BACKEND_URL,
+        "private/orders/{}".format(order_id),
+        params=dict()
+    )
 
-    pay_status = backend_get(BACKEND_URL, "private/orders/{}".format(order_id), params=dict())
     if pay_status.get("paid"):
         # Checks to do:
         #
diff --git a/talermerchantdemos/donations/donations.py b/talermerchantdemos/donations/donations.py
@@ -217,7 +217,11 @@ def donate():
 @app.route("/check-status/<instance>/<order_id>")
 def check_status(instance, order_id):
     pay_params = dict(order_id=order_id)
-    pay_status = backend_instanced_get(instance, "check-payment", pay_params)
+    pay_status = backend_instanced_get(
+        instance,
+        f"private/orders/{order_id}",
+        params=dict()
+    )
     return flask.jsonify(paid=pay_status["paid"])
 
 
diff --git a/talermerchantdemos/httpcommon/__init__.py b/talermerchantdemos/httpcommon/__init__.py
@@ -56,9 +56,11 @@ def backend_post(backend_url, endpoint, json):
 #         if something unexpected happens.
 def backend_get(backend_url, endpoint, params):
     headers = {"Authorization": "ApiKey sandbox"}
+    final_url = urljoin(backend_url, endpoint)
+    print("GETting: " + final_url)
     try:
         resp = requests.get(
-            urljoin(backend_url, endpoint), params=params, headers=headers
+            final_url, params=params, headers=headers
         )
     except requests.ConnectionError:
         err_abort(500, message="Could not establish connection to backend")