[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-backoffice] branch master updated (6548176 -> 13009f
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-backoffice] branch master updated (6548176 -> 13009ff) |
Date: |
Wed, 06 Jun 2018 12:40:04 +0200 |
This is an automated email from the git hooks/post-receive script.
marcello pushed a change to branch master
in repository backoffice.
from 6548176 Adapt tests.
new f7e7583 Minor fixes.
new 13009ff UI/UX.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
js/backoffice.js | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/js/backoffice.js b/js/backoffice.js
index 8ce913c..82b0ae6 100644
--- a/js/backoffice.js
+++ b/js/backoffice.js
@@ -162,7 +162,7 @@ var track_transfer = function(exchange, wtid, cb){
switch(req.status){
case 200:
var tracks = JSON.parse(req.responseText);
- cb(true,
+ cb(false,
tracks.deposits_sums,
tracks.execution_time,
wtid);
@@ -181,8 +181,6 @@ var track_transfer = function(exchange, wtid, cb){
var show_error = function(response_text, keep_history){
toggle_loader();
- if (!keep_history)
- clean_results();
close_popup();
var msg = response_text;
@@ -259,6 +257,7 @@ function fill_box(tracks, http_code)
.getElementsByClassName("track-content")[0];
track_content.innerHTML = "This order is still" +
"waiting to be paid back.";
+ toggle_overlay();
return;
}
@@ -289,12 +288,13 @@ function fill_box(tracks, http_code)
XPathResult.UNORDERED_NODE_SNAPSHOT_TYPE,
null).snapshotItem(0);
var row = document.createElement("tr");
- var subject = `${entry.wtid} ${entry.exchange_url}`;
+ var subject = `${entry.wtid} ${entry.exchange}`;
console.log("Subject", subject);
row.innerHTML = `` +
`<td class="wtid">` +
- `<a onclick="track_transfer(\'${entry.exchange_url}\', ` +
- `\'${entry.wtid}\')"` +
+ `<a onclick="track_transfer(\'${entry.exchange}\', ` +
+ `\'${entry.wtid}\', ` +
+ `fill_table)"` +
`href="#${i}">${subject.substring(0, 20)}...` +
`</a>` +
`</td>` +
@@ -395,8 +395,9 @@ function fill_table(scroll, data, execution_time,
wtid_marker){
onclick="track_order('${entry.order_id}', fill_box);">
${entry.order_id}</a>`;
td_summary.className = "summary";
- td_summary.innerHTML = entry.summary;
- td_amount.innerHTML = amount_to_string(entry.amount);
+ td_summary.innerHTML = entry.summary || "deposited";
+ td_amount.innerHTML = amount_to_string(
+ entry.amount || entry.deposit_value);
td_date.innerHTML = parse_date
(entry.timestamp || execution_time);
row.appendChild(td_order_id);
@@ -450,7 +451,7 @@ function track_cherry_pick(form){
if ("order" == type){
var order_id = xpath_get("address@hidden'order']", form)
.snapshotItem(0);
- track_order(order_id.value);
+ track_order(order_id.value, fill_box);
}
else{
var data = xpath_get("address@hidden'transfer']", form);
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [taler-backoffice] branch master updated (6548176 -> 13009ff),
gnunet <=