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

paypro: fix - check for merchant_data existence.

This commit is contained in:
Christopher Jeffrey 2014-09-15 16:37:36 -07:00
parent 20bc1ecbb5
commit aa5e90786b
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1408,7 +1408,10 @@ Wallet.prototype.receivePaymentRequest = function(options, pr, cb) {
expires: expires,
memo: memo || 'This server would like some BTC from you.',
payment_url: payment_url,
merchant_data: merchant_data.toString('hex')
merchant_data: merchant_data
? merchant_data.toString('hex')
// : new Buffer('none', 'utf8').toString('hex')
: '00'
},
signature: sig.toString('hex'),
ca: trust.caName,