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

paypro: more merchant data storage. createTx and sendTx work.

Browse source
This commit is contained in:
Christopher Jeffrey 2014-07-28 14:46:08 -07:00 • committed by Manuel Araoz
commit b0dc3fc24d
2 changed files with 40 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
js/controllers/send.js
View file

@ -61,10 +61,14 @@ angular.module('copayApp.controllers').controller('SendController',
var w = $rootScope.wallet;
w.createTx(address, amount, commentText, function(ntxid) {
function done(ntxid, ca) {
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;
}
notification.success('Success!', message);
$scope.loadTxs();
} else {
@ -80,7 +84,13 @@ angular.module('copayApp.controllers').controller('SendController',
});
}
$rootScope.pendingPayment = null;
});
}
if (~address.indexOf('://')) {
w.createTx(address, commentText, done);
} else {
w.createTx(address, amount, commentText, done);
}
// reset fields
$scope.address = $scope.amount = $scope.commentText = null;