Merchant page

2 files changed, 46 insertions, 1 deletions

diff --git a/js/TxUtils.js b/js/TxUtils.js
index a6cca114..c78436d7 100644
--- a/js/TxUtils.js
+++ b/js/TxUtils.js
@@ -64,3 +64,14 @@ function isValidOpenAliasAddress(address) {
     // we can get an awful lot of valid domains, including non ASCII chars... accept anything
     return true
 }
+
+function makeQRCodeString(addr, amount) {
+    var XMR_URI_SCHEME = "monero:"
+    var XMR_AMOUNT = "tx_amount"
+    var qrCodeString =""
+    qrCodeString += (XMR_URI_SCHEME + addr)
+    if (amount !== undefined && amount !== ""){
+      qrCodeString += ("?" + XMR_AMOUNT + "=" + amount)
+    }
+    return qrCodeString
+}
diff --git a/js/Utils.js b/js/Utils.js
index dad1f143..8ba7fa85 100644
--- a/js/Utils.js
+++ b/js/Utils.js
@@ -48,4 +48,38 @@ function showSeedPage() {
     passwordDialog.open();
     if(isMobile) hideMenu();
     updateBalance();
-}
\ No newline at end of file
+}
+
+function ago(epoch) {
+    // Returns '<delta> [seconds|minutes|hours|days] ago' string given an epoch
+
+    var now = new Date().getTime() / 1000;
+    var delta = now - epoch;
+
+    if(delta < 60) {
+        return delta + " " + qsTr("seconds ago")
+    } else if (delta >= 60 && delta <= 3600) {
+        if(delta >= 60 && delta < 120){
+            return 1 + " " + qsTr("minute ago")
+        } else {
+            return parseInt(Math.floor(delta / 60)) + " " + qsTr("minutes ago")
+        }
+    } else if (delta >= 3600 && delta <= 86400) {
+        if(delta >= 3600 && delta < 7200) {
+            return 1 + " " + qsTr("hour ago")
+        } else {
+            return parseInt(Math.floor(delta / 60 / 60)) + " " + qsTr("hours ago")
+        }
+    } else if (delta >= 86400){
+        if(delta >= 86400 && delta < 172800) {
+            return 1 + " " + qsTr("day ago")
+        } else {
+            var _delta = parseInt(Math.floor(delta / 24 / 60 / 60));
+            if(_delta === 1) {
+                return 1 + " " + qsTr("day ago")
+            } else {
+                return _delta + " " + qsTr("days ago")
+            }
+        }
+    }
+}