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

use ui-router non-url params for paypro

Browse source
This commit is contained in:
Marty Alcala 2016-10-21 11:53:04 -04:00
commit 2fb99dd7c1
4 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/js/controllers/amount.js
View file

@ -188,6 +188,7 @@ angular.module('copayApp.controllers').controller('amountController', function($
};
$scope.finish = function() {
console.log('in finish');
var _amount = evaluate(format($scope.amount));
if ($scope.cardId) {
@ -225,13 +226,15 @@ angular.module('copayApp.controllers').controller('amountController', function($
});
} else {
console.log('about to transitionTo');
var amount = $scope.showAlternativeAmount ? fromFiat(_amount).toFixed(unitDecimals) : _amount.toFixed(unitDecimals);
$state.transitionTo('tabs.send.confirm', {
isWallet: $scope.isWallet,
toAmount: amount * unitToSatoshi,
toAddress: $scope.toAddress,
toName: $scope.toName,
toEmail: $scope.toEmail
toEmail: $scope.toEmail//,
//paypro: {hi: 'there'}
});
}
};

4
src/js/controllers/confirm.js
View file

@ -261,7 +261,9 @@ angular.module('copayApp.controllers').controller('confirmController', function(
txp.outputs = outputs;
txp.message = description;
txp.payProUrl = paypro.url;
if(paypro) {
txp.payProUrl = paypro.url;
}
txp.excludeUnconfirmedUtxos = config.spendUnconfirmed ? false : true;
txp.feeLevel = config.settings && config.settings.feeLevel ? config.settings.feeLevel : 'normal';
txp.dryRun = dryRun;