[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-merchant-frontends] branch master updated: Managing
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-merchant-frontends] branch master updated: Managing 202 status code from the JS. |
Date: |
Tue, 28 Feb 2017 13:49:26 +0100 |
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 f7bd534 Managing 202 status code from the JS.
f7bd534 is described below
commit f7bd5340f81eeaa0dc6270db32ca332821c8a308
Author: Marcello Stanisci <address@hidden>
AuthorDate: Tue Feb 28 13:49:17 2017 +0100
Managing 202 status code from the JS.
---
talerfrontends/blog/blog.py | 3 +--
talerfrontends/blog/static/backoffice.js | 15 +++++++++++++--
talerfrontends/blog/static/web-common | 2 +-
talerfrontends/donations/static/web-common | 2 +-
4 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/talerfrontends/blog/blog.py b/talerfrontends/blog/blog.py
index 0eace7c..118e3d4 100644
--- a/talerfrontends/blog/blog.py
+++ b/talerfrontends/blog/blog.py
@@ -193,9 +193,8 @@ def track_order():
if r.status_code not in [200, 202, 424]:
logger.error("failed to GET to '%s'", url)
raise BackendError(r.status_code, r.text)
- track_resp = r.json()
if 202 == r.status_code:
- raise TrackNotReadyError(r.status_code, track_resp["code"], order_id)
+ return flask.jsonify(r.json()), 202
if 404 == r.status_code:
raise CustomError(r.code, "Unknown order_id", s.status_code)
if 424 == r.status_code:
diff --git a/talerfrontends/blog/static/backoffice.js
b/talerfrontends/blog/static/backoffice.js
index a65dfa3..30fdc43 100644
--- a/talerfrontends/blog/static/backoffice.js
+++ b/talerfrontends/blog/static/backoffice.js
@@ -47,6 +47,11 @@ function parse_date(date){
return d.toDateString();
}
+function toggle_visible(overlay){
+ overlay.style.visibility = "visible";
+ overlay.style.opacity = 1;
+}
+
function track_order(order_id, instance){
var req = new XMLHttpRequest();
req.open("GET", `/track/order?order_id=${order_id}&instance=${instance}`,
true);
@@ -70,8 +75,7 @@ function track_order(order_id, instance){
var table = document.evaluate("/table", track_content, null,
XPathResult.ANY_TYPE,null);
console.log(track_content.childNodes);
console.log("table?", table);
- overlay.style.visibility = "visible";
- overlay.style.opacity = 1;
+ toggle_visible(overlay);
for(var j=0; j<entry.coins.length; j++){
var coin = entry.coins[j];
var row = document.createElement("tr");
@@ -84,6 +88,13 @@ function track_order(order_id, instance){
}
}
}
+ if (req.readyState == 4 && req.status == 202){
+ console.log("Pending order.");
+ var overlay = document.getElementsByClassName("overlay")[0];
+ var track_content = document.getElementsByClassName("track-content")[0];
+ track_content.innerHTML = "This order is still waiting to be paid back.";
+ toggle_visible(overlay);
+ }
// Manage here 202 case (tracks not ready).
}
req.send();
diff --git a/talerfrontends/blog/static/web-common
b/talerfrontends/blog/static/web-common
index aae7c0a..0be9ac9 160000
--- a/talerfrontends/blog/static/web-common
+++ b/talerfrontends/blog/static/web-common
@@ -1 +1 @@
-Subproject commit aae7c0a87a9ff1640c3cd72dd4df0ac590f8b0e4
+Subproject commit 0be9ac9264a3bd9f495c37abf1ac864562e8c598
diff --git a/talerfrontends/donations/static/web-common
b/talerfrontends/donations/static/web-common
index aae7c0a..0be9ac9 160000
--- a/talerfrontends/donations/static/web-common
+++ b/talerfrontends/donations/static/web-common
@@ -1 +1 @@
-Subproject commit aae7c0a87a9ff1640c3cd72dd4df0ac590f8b0e4
+Subproject commit 0be9ac9264a3bd9f495c37abf1ac864562e8c598
--
To stop receiving notification emails like this one, please contact
address@hidden
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [taler-merchant-frontends] branch master updated: Managing 202 status code from the JS.,
gnunet <=