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

Revert "paypro: temporarily disable, with comments." 

This reverts commit b6fa32dcfa.
This commit is contained in:
Christopher Jeffrey 2014-08-28 19:42:11 -07:00
parent 6a1cd3b688
commit 4ce1c113e5
1 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
js/controllers/send.js
View File

@ -169,26 +169,23 @@ angular.module('copayApp.controllers').controller('SendController',
$rootScope.pendingPayment = null;
}
// XXX Payment Protocol is temporarily disabled.
// var uri;
// if (address.indexOf('bitcoin:') === 0) {
// uri = new bitcore.BIP21(address).data;
// } else if (/^https?:\/\//.test(address)) {
// uri = {
// merchant: address
// };
// }
//
// if (uri && uri.merchant) {
// w.createPaymentTx({
// uri: uri.merchant,
// memo: commentText
// }, done);
// } else {
// w.createTx(address, amount, commentText, done);
// }
var uri;
if (address.indexOf('bitcoin:') === 0) {
uri = new bitcore.BIP21(address).data;
} else if (/^https?:\/\//.test(address)) {
uri = {
merchant: address
};
}
w.createTx(address, amount, commentText, done);
if (uri && uri.merchant) {
w.createPaymentTx({
uri: uri.merchant,
memo: commentText
}, done);
} else {
w.createTx(address, amount, commentText, done);
}
// reset fields
$scope.address = $scope.amount = $scope.commentText = null;
@ -564,9 +561,4 @@ angular.module('copayApp.controllers').controller('SendController',
});
};
// XXX Payment Protocol is temporarily disabled.
$scope.onChanged = function() {
;
};
});