BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

paypro: fix more payment protocol errors.

This commit is contained in:
Christopher Jeffrey 2014-07-28 18:45:18 -07:00 committed by Manuel Araoz
parent 58b9345f59
commit e06fda5128
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
js/models/core/Wallet.js
View File

@ -911,7 +911,8 @@ Wallet.prototype.sendPaymentTx = function(ntxid, options, cb) {
var refund_outputs = [];
options.refund_to = options.refund_to || self.getPubKeys()[0];
options.refund_to = options.refund_to
|| self.publicKeyRing.getPubKeys(0, false, this.getMyCopayerId())[0];
if (options.refund_to) {
var total = 0;
@ -942,7 +943,7 @@ Wallet.prototype.sendPaymentTx = function(ntxid, options, cb) {
// We send this to the serve after receiving a PaymentRequest
var pay = new PayPro();
pay = pay.makePayment();
var merchant_data = txp.merchant.pd.merchant_data;
var merchant_data = txp.merchant.pr.pd.merchant_data;
if (typeof merchant_data === 'string') {
merchant_data = new Buffer(merchant_data, 'hex');
}