[GNUnet-SVN] [taler-merchant-frontends] branch master updated: /track/transfer, + fix hours/minutes format.

[gnunet]

This is an automated email from the git hooks/post-receive script.

marcello pushed a commit to branch master
in repository merchant-frontends.

The following commit(s) were added to refs/heads/master by this push:
     new 422323a  /track/transfer, + fix hours/minutes format.
422323a is described below

commit 422323a7ba9f90b6637d4c1e4af510f03c8b42f2
Author: Marcello Stanisci <address@hidden>
AuthorDate: Thu Mar 2 18:28:36 2017 +0100

    /track/transfer, + fix hours/minutes format.
---
 talerfrontends/blog/blog.py              | 21 +++++++++++++++------
 talerfrontends/blog/static/backoffice.js |  8 ++++++--
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/talerfrontends/blog/blog.py b/talerfrontends/blog/blog.py
index 8a0e6c7..e161bdf 100644
--- a/talerfrontends/blog/blog.py
+++ b/talerfrontends/blog/blog.py
@@ -176,18 +176,28 @@ def track():
     response = 
flask.make_response(flask.render_template("templates/backoffice.html"))
     return response
 
address@hidden("/track/transfer")
+def track_transfer():
+    qs = get_query_string().decode("utf-8")
+    url = urljoin(BACKEND_URL, 'track/transfer')
+    r = requests.get(url, params=dict(parse_qsl(qs)))
+    if r.status_code not in [200, 424]:
+        raise BackendError(r.status_code, r.text)
+    if 404 == r.status_code:
+        raise CustomError(r.code, "Unknown WTID", s.status_code)
+    if 424 == r.status_code:
+        raise TrackTransactionConflictError(r.status_code, order_id, r.text)
+    return flask.jsonify(r.json())
+
 
 @app.route("/track/order")
 def track_order():
 
-    instance = expect_parameter("instance")
-    order_id = expect_parameter("order_id")
-
+    qs = get_query_string().decode("utf-8")
     url = urljoin(BACKEND_URL, 'track/transaction')
-    r = requests.get(url, params=dict(order_id=order_id, instance=instance))
+    r = requests.get(url, params=dict(parse_qsl(qs)))
 
     if r.status_code not in [200, 202, 424]:
-        logger.error("failed to GET to '%s'", url)
         raise BackendError(r.status_code, r.text)
     if 202 == r.status_code:
         return flask.jsonify(r.json()), 202
@@ -195,5 +205,4 @@ def track_order():
         raise CustomError(r.code, "Unknown order_id", s.status_code)
     if 424 == r.status_code:
         raise TrackTransactionConflictError(r.status_code, order_id, r.text)
-
     return flask.jsonify(r.json())
diff --git a/talerfrontends/blog/static/backoffice.js 
b/talerfrontends/blog/static/backoffice.js
index 62686fe..50abc1b 100644
--- a/talerfrontends/blog/static/backoffice.js
+++ b/talerfrontends/blog/static/backoffice.js
@@ -58,7 +58,9 @@ function parse_date(date){
                 "Oct",
                 "Nov",
                 "Dec"];
-  return `${d.getUTCDate()} ${months[d.getUTCMonth()]} ${d.getUTCFullYear()}, 
${d.getUTCHours()}:${d.getUTCMinutes()}`;
+  var hours = ("0" + d.getUTCHours()).slice(-2);
+  var minutes = ("0" + d.getUTCMinutes()).slice(-2);
+  return `${d.getUTCDate()} ${months[d.getUTCMonth()]} ${d.getUTCFullYear()}, 
${hours}:${minutes}`;
 }
 
 function toggle_visible(overlay){
@@ -67,8 +69,10 @@ function toggle_visible(overlay){
 }
 
 function track_transfer(wtid){
-  // Extract Exchange and WTID from 'wtid'
   console.log("Tracking", wtid);
+  var req = new XMLHttpRequest();
+  req.open("GET", `/track/transfer?qs=${wtid}&instance=FSF`, true);
+  // TBD
 }
 
 function track_order(order_id, instance){

-- 
To stop receiving notification emails like this one, please contact
address@hidden