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

paypro: add fetchPaymentTx, use for form validation. improve css selection.

Browse source
This commit is contained in:
Christopher Jeffrey 2014-07-31 12:08:21 -07:00 • committed by Manuel Araoz
commit 6b6e251511
2 changed files with 53 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

17
js/models/core/Wallet.js
View file

@ -898,6 +898,15 @@ Wallet.prototype.createPaymentTx = function(options, cb) {
});
};
Wallet.prototype.fetchPaymentTx = function(options, cb) {
options = options || {};
if (typeof options === 'string') {
options = { uri: options };
}
options.fetch = true;
return this.createPaymentTx(options, cb);
};
Wallet.prototype.receivePaymentRequest = function(options, pr, cb) {
var self = this;
@ -977,9 +986,13 @@ Wallet.prototype.receivePaymentRequest = function(options, pr, cb) {
ca: ca,
},
request_url: options.uri || options.url,
total: bignum('0').toString(10)
total: bignum('0', 10).toString(10)
};
if (options.fetch) {
return cb(null, merchantData);
}
return this.getUnspent(function(err, unspent) {
var ntxid = self.createPaymentTxSync(options, merchantData, unspent);
if (ntxid) {
@ -1019,7 +1032,7 @@ Wallet.prototype.sendPaymentTx = function(ntxid, options, cb) {
|| self.publicKeyRing.getPubKeys(0, false, this.getMyCopayerId())[0];
if (options.refund_to) {
var total = bignum('0');
var total = bignum('0', 10);
for (var i = 0; i < tx.outs.length - 1; i++) {
total = total.add(bignum.fromBuffer(tx.outs[i].v));
}