summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcello Stanisci <stanisci.m@gmail.com>2018-06-05 18:23:22 +0200
committerMarcello Stanisci <stanisci.m@gmail.com>2018-06-05 18:23:22 +0200
commita092f8b05572625c4485090da885e2ac41c0c398 (patch)
tree3609398a5f1ce4ecb4d6248e19ab86e006dbe6b1
parent439864cf7208857c3e90096bbfa134bffd3e4db2 (diff)
downloadbackoffice-a092f8b05572625c4485090da885e2ac41c0c398.tar.gz
backoffice-a092f8b05572625c4485090da885e2ac41c0c398.tar.bz2
backoffice-a092f8b05572625c4485090da885e2ac41c0c398.zip
Parse amounts.
String-amounts also get parsed.
-rw-r--r--js/backoffice.js11
1 files changed, 10 insertions, 1 deletions
diff --git a/js/backoffice.js b/js/backoffice.js
index 205a3bd..8ce913c 100644
--- a/js/backoffice.js
+++ b/js/backoffice.js
@@ -39,6 +39,15 @@ var LAST = 0;
* it wrong.
*/
function amount_to_string(amount){
+ if (typeof amount === 'string' || amount instanceof String)
+ {
+ var split = amount.match(/([A-Z]+):([0-9]+)\.?([0-9]+)?/);
+ if (!split)
+ return "Bad amount given: " + amount;
+ if (split[3])
+ return `${split[2]}.${split[3]} ${split[1]}`;
+ return `${split[2]}.00 ${split[1]}`;
+ }
var number = Number(amount.value) +
(Number(amount.fraction)/FRACTION);
return `${number.toFixed(2)} ${amount.currency}`;
@@ -387,7 +396,7 @@ function fill_table(scroll, data, execution_time, wtid_marker){
${entry.order_id}</a>`;
td_summary.className = "summary";
td_summary.innerHTML = entry.summary;
- td_amount.innerHTML = entry.amount;
+ td_amount.innerHTML = amount_to_string(entry.amount);
td_date.innerHTML = parse_date
(entry.timestamp || execution_time);
row.appendChild(td_order_id);