aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Soltys <[email protected]>2013-02-28 08:41:24 +0400
committerAdam Soltys <[email protected]>2013-02-28 08:41:24 +0400
commit17643214df029a2c25166bcad0657e97cf90d835 (patch)
tree0ff34baac80389d8a9832553b5a6afe15af142b7
parent64c806e2197cd912c4cdfab7ad623285f34ca360 (diff)
downloadcoinos-server-17643214df029a2c25166bcad0657e97cf90d835.tar.gz
coinos-server-17643214df029a2c25166bcad0657e97cf90d835.zip
Display QR code on deposit page
-rw-r--r--app.coffee1
-rw-r--r--public/js/deposit.coffee4
2 files changed, 2 insertions, 3 deletions
diff --git a/app.coffee b/app.coffee
index 8aac4705..f1bf5037 100644
--- a/app.coffee
+++ b/app.coffee
@@ -64,7 +64,6 @@ app.get('/issue/:amount', (req, res) ->
exec = require('child_process').exec
exec("opentxs writecheque --myacct issuer --args \"memo \\\"Here's some OT-Bitcoins.\\\" amount #{req.params.amount} validfor 2592000\"", (err, out, stderr) ->
- exec("opentxs stat", (err, out, stderr) ->
res.write(out)
res.end()
)
diff --git a/public/js/deposit.coffee b/public/js/deposit.coffee
index a026b7e0..af789ee3 100644
--- a/public/js/deposit.coffee
+++ b/public/js/deposit.coffee
@@ -39,13 +39,13 @@ setupSocket = ->
$.each(results.x.out, (i, v) ->
if (v.addr == g.address)
- received += v.value / 100000000
+ received += v.value
)
$.each(results.x.inputs, (i, v) ->
from_address = v.prev_out.addr
if (v.prev_out.addr == g.address)
- input -= v.prev_out.value / 100000000
+ input -= v.prev_out.value
)
$.get("/issue/#{received}", (data) ->