anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

paypro: more server info in validation.

Browse source
This commit is contained in:
Christopher Jeffrey 2014-07-31 11:00:41 -07:00 • committed by Manuel Araoz
commit 5105fd4229
1 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

22
js/directives.js
View file

@ -33,13 +33,22 @@ angular.module('copayApp.directives')
.element(document) .element(document)
.find('section') .find('section')
.find('p')[1]); .find('p')[1]);
tamount.attr('class', tamount.attr('class').replace(' hidden', '')) tamount.attr('class',
tamount.text(total + ' (CA: Internet Widgets Pty Ltd)') tamount.attr('class').replace(' hidden', ''));
tamount.text(total
+ ' (CA: Internet Widgets Pty Ltd. Expires: '
+ new Date().toISOString()
+ '): Hi, we\'d like some bitcoin.');
scope.wallet.createPaymentTx(uri.merchant, function(ntxid, ca) { scope.wallet.createPaymentTx(uri.merchant, function(ntxid, ca) {
var txp = scope.wallet.txProposals.txps[ntxid]; var txp = scope.wallet.txProposals.txps[ntxid];
if (!txp) return; if (!txp) return;
var expires = txp.merchant.pr.expires;
var memo = txp.merchant.pr.memo;
var payment_url = txp.merchant.pr.payment_url;
var total = txp.merchant.total;
var total = bitcore var total = bitcore
.bignum.fromBuffer(txp.merchant.total) .bignum.fromBuffer(txp.merchant.total)
.div(config.unitToSatoshi) .div(config.unitToSatoshi)
@ -56,9 +65,14 @@ angular.module('copayApp.directives')
.element(document) .element(document)
.find('section') .find('section')
.find('p')[1]); .find('p')[1]);
tamount.attr('class', tamount.attr('class').replace(' hidden', '')) tamount.attr('class',
tamount.text(total + ' (CA: ' + ca + ')') tamount.attr('class').replace(' hidden', ''))
tamount.text(total + ' (CA: ' + ca
+ '. Expires: '
+ new Date(expires * 1000).toISOString()
+ '): ' + memo);
}); });
ctrl.$setValidity('validAddress', true); ctrl.$setValidity('validAddress', true);
return 'Merchant: '+ uri.merchant; return 'Merchant: '+ uri.merchant;
} }