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

paypro: return merchantData in createTx and sendTx.

Browse source
This commit is contained in:
Christopher Jeffrey 2014-08-04 10:47:04 -07:00 • committed by Manuel Araoz
commit c940cb25b5
2 changed files with 17 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -943,7 +943,7 @@ Wallet.prototype.receivePaymentRequest = function(options, pr, cb) {
self.log('The server sent you a message:');
self.log(memo);
return cb(ntxid, ca);
return cb(ntxid, merchantData);
});
};
@ -1083,7 +1083,7 @@ Wallet.prototype.receivePaymentRequestACK = function(tx, txp, ack, cb) {
}
var txid = tx.getHash().toString('hex');
return cb(txid, txp.merchant.pr.ca);
return cb(txid, txp.merchant);
};
Wallet.prototype.createPaymentTxSync = function(options, merchantData, unspent) {