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

paypro: create real paypro txs. start potentially adding more merchant data to notifications.

This commit is contained in:
Christopher Jeffrey 2014-07-31 11:39:46 -07:00 committed by Manuel Araoz
parent 035070b78b
commit b7b7b2e38e
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
js/controllers/send.js
View File

@ -62,12 +62,14 @@ angular.module('copayApp.controllers').controller('SendController',
var w = $rootScope.wallet;
function done(ntxid, ca) {
var txp = w.txProposals.txps[ntxid];
var merchantData = txp.merchant;
if (w.isShared()) {
$scope.loading = false;
var message = 'The transaction proposal has been created';
if (ca) {
message += '.\nThis payment protocol transaction'
+ 'has been verified through ' + ca;
+ 'has been verified through ' + ca + '.';
}
notification.success('Success!', message);
$scope.loadTxs();
@ -75,7 +77,9 @@ angular.module('copayApp.controllers').controller('SendController',
w.sendTx(ntxid, function(txid, ca) {
if (txid) {
notification.success('Transaction broadcast', 'Transaction id: ' + txid);
if (ca) notification.success('Root Certificate', ca);
if (ca) {
notification.success('Root Certificate', ca);
}
} else {
notification.error('Error', 'There was an error sending the transaction.');
}
@ -88,8 +92,12 @@ angular.module('copayApp.controllers').controller('SendController',
var uri = address.indexOf('bitcoin:') === 0
&& copay.HDPath.parseBitcoinURI(address);
if (uri.merchant) {
w.createTx(uri.merchant, commentText, done);
if (uri && uri.merchant) {
w.createPaymentTx({
uri: uri.merchant,
memo: commentText
}, done);
} else {
w.createTx(address, amount, commentText, done);
}