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

paypro: display ack memo on notification.

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

3
js/controllers/send.js
View file

@ -70,6 +70,7 @@ angular.module('copayApp.controllers').controller('SendController',
message += '\nThis payment protocol transaction' message += '\nThis payment protocol transaction'
+ ' has been verified through ' + merchantData.pr.ca + '.'; + ' has been verified through ' + merchantData.pr.ca + '.';
} }
message += '\nMessage from server: ' + merchantData.ack.memo;
message += '\nFor merchant: ' + merchantData.pr.pd.payment_url; message += '\nFor merchant: ' + merchantData.pr.pd.payment_url;
} }
notification.success('Success!', message); notification.success('Success!', message);
@ -83,6 +84,7 @@ angular.module('copayApp.controllers').controller('SendController',
message += '\nThis payment protocol transaction' message += '\nThis payment protocol transaction'
+ ' has been verified through ' + merchantData.pr.ca + '.'; + ' has been verified through ' + merchantData.pr.ca + '.';
} }
message += '\nMessage from server: ' + merchantData.ack.memo;
message += '\nFor merchant: ' + merchantData.pr.pd.payment_url; message += '\nFor merchant: ' + merchantData.pr.pd.payment_url;
} }
notification.success('Transaction broadcast', message); notification.success('Transaction broadcast', message);
@ -342,6 +344,7 @@ angular.module('copayApp.controllers').controller('SendController',
message += '\nThis payment protocol transaction' message += '\nThis payment protocol transaction'
+ ' has been verified through ' + merchantData.pr.ca + '.'; + ' has been verified through ' + merchantData.pr.ca + '.';
} }
message += '\nMessage from server: ' + merchantData.ack.memo;
message += '\nFor merchant: ' + merchantData.pr.pd.payment_url; message += '\nFor merchant: ' + merchantData.pr.pd.payment_url;
notification.success('Transaction sent', message); notification.success('Transaction sent', message);
} }

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

@ -1082,6 +1082,10 @@ Wallet.prototype.receivePaymentRequestACK = function(tx, txp, ack, cb) {
tx = ptx; tx = ptx;
} }
txp.merchant.ack = {
memo: memo
};
var txid = tx.getHash().toString('hex'); var txid = tx.getHash().toString('hex');
return cb(txid, txp.merchant); return cb(txid, txp.merchant);
}; };