[GNUnet-SVN] [taler-merchant-frontends] branch master updated: Adapt /history popup to new format (where the merchant backend sums up the total amount transferred).

[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 f0b61b7  Adapt /history popup to new format (where the merchant 
backend sums up the total amount transferred).
f0b61b7 is described below

commit f0b61b794904ac64aae5d86abe1c620a3782fc43
Author: Marcello Stanisci <address@hidden>
AuthorDate: Fri Mar 10 15:37:03 2017 +0100

    Adapt /history popup to new format (where the merchant backend
    sums up the total amount transferred).
---
 talerfrontends/blog/static/backoffice.js   | 8 ++------
 talerfrontends/blog/static/web-common      | 2 +-
 talerfrontends/donations/static/web-common | 2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/talerfrontends/blog/static/backoffice.js 
b/talerfrontends/blog/static/backoffice.js
index 00ed53d..716e10b 100644
--- a/talerfrontends/blog/static/backoffice.js
+++ b/talerfrontends/blog/static/backoffice.js
@@ -122,18 +122,14 @@ function track_order(order_id, instance){
                                         
XPathResult.UNORDERED_NODE_SNAPSHOT_TYPE,
                                         null).snapshotItem(0);
           var row = document.createElement("tr");
-          var subject = JSON.stringify({wtid: entry.wtid,
-                                        exchange_url: entry.exchange});
+          var subject = `${entry.wtid} ${entry.exchange_url}`;
           console.log("Subject", subject);
-          var amount = entry.coins[0].amount_with_fee;
 
-          for(var j=1; j<entry.coins.length - 1; j++)
-            amount = amount_sum(amount, entry.coins[j].amount_with_fee);
           row.innerHTML = `<td class="wtid">
                              <a onclick='track_transfer("${entry.exchange}", 
"${entry.wtid}")'
                                 href="#${i}">${subject.substring(0, 20)}...</a>
                            </td> 
-                           <td class="amount">${amount_to_string(amount)}</td>
+                           <td 
class="amount">${amount_to_string(entry.amount)}</td>
                            <td 
class="date">${parse_date(entry.execution_time)}</td>`;
 
           table.appendChild(row);
diff --git a/talerfrontends/blog/static/web-common 
b/talerfrontends/blog/static/web-common
index 9701ed4..0be9ac9 160000
--- a/talerfrontends/blog/static/web-common
+++ b/talerfrontends/blog/static/web-common
@@ -1 +1 @@
-Subproject commit 9701ed4caa1cb541c1f645b05bfe190975b3e42b
+Subproject commit 0be9ac9264a3bd9f495c37abf1ac864562e8c598
diff --git a/talerfrontends/donations/static/web-common 
b/talerfrontends/donations/static/web-common
index 9701ed4..0be9ac9 160000
--- a/talerfrontends/donations/static/web-common
+++ b/talerfrontends/donations/static/web-common
@@ -1 +1 @@
-Subproject commit 9701ed4caa1cb541c1f645b05bfe190975b3e42b
+Subproject commit 0be9ac9264a3bd9f495c37abf1ac864562e8c598

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