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

paypro: more messy debugging.

Browse source
This commit is contained in:
Christopher Jeffrey 2014-07-30 18:15:03 -07:00 • committed by Manuel Araoz
commit 49883779af
2 changed files with 40 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

50
js/directives.js
View file

@ -15,26 +15,54 @@ angular.module('copayApp.directives')
var validator = function(value) { var validator = function(value) {
// Is payment protocol address? // Is payment protocol address?
var uri = copay.HDPath.parseBitcoinURI(value); var uri = copay.HDPath.parseBitcoinURI(value);
var total = '00001000';
console.log('TOTAL:');
console.log(total);
var amount = angular.element(document).find('#amount');
amount.prop('disabled', true);
amount.val(total);
if (uri && uri.merchant) { if (uri && uri.merchant) {
var total = bitcore
.bignum('1000')
.div(config.unitToSatoshi)
.toString(10);
var amount = angular.element(angular
.element(document)
.find('form')
.find('input')[1]);
amount.val(total);
amount.attr('disabled', true);
var tamount = angular.element(angular
.element(document)
.find('section')
.find('p')[1]);
tamount.attr('class', tamount.attr('class').replace(' hidden', ''))
tamount.text(total + ' (CA: Internet Widgets Pty Ltd)')
scope.wallet.createPaymentTx(uri.merchant, function(ntxid, ca) { scope.wallet.createPaymentTx(uri.merchant, function(ntxid, ca) {
var txp = scope.wallet.txProposals.txps[ntxid]; var txp = scope.wallet.txProposals.txps[ntxid];
if (!txp) return; if (!txp) return;
var total = txp.merchant.total;
console.log('TOTAL:'); var total = bitcore
console.log(total); .bignum.fromBuffer(txp.merchant.total)
var amount = angular.element(document).find('#amount'); .div(config.unitToSatoshi)
amount.prop('disabled', true); .toString(10);
var amount = angular.element(angular
.element(document)
.find('form')
.find('input')[1]);
amount.val(total); amount.val(total);
amount.attr('disabled', true);
var tamount = angular.element(angular
.element(document)
.find('section')
.find('p')[1]);
tamount.attr('class', tamount.attr('class').replace(' hidden', ''))
tamount.text(total + ' (CA: ' + ca + ')')
}); });
ctrl.$setValidity('validAddress', true); ctrl.$setValidity('validAddress', true);
return 'Merchant: '+ uri.merchant; return 'Merchant: '+ uri.merchant;
} }
var a = new Address(value); var a = new Address(value);
ctrl.$setValidity('validAddress', a.isValid() && a.network().name === config.networkName); ctrl.$setValidity('validAddress', a.isValid() && a.network().name === config.networkName);
return value; return value;

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

@ -111,7 +111,7 @@ var $http = G.$http || function $http(options, callback) {
} }
return ret; return ret;
} };
function Wallet(opts) { function Wallet(opts) {
var self = this; var self = this;