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

Merge pull request #2206 from cmgustavo/bug/paypro-url-invalid

Browse source 
Fixes paypro if amount has comma as decimal separator
This commit is contained in:
Ivan Socolsky 2014-12-19 19:06:26 -03:00
commit 4d72438e8e
3 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
css/src/main.css
View file

@ -558,6 +558,7 @@ a.button-setup {
.p20 {padding:20px;} .p20 {padding:20px;}
.p10 {padding:10px;} .p10 {padding:10px;}
.p10b {padding-bottom:10px;} .p10b {padding-bottom:10px;}
.p45li {padding-left: 45px !important;}
.m30v {margin: 30px 0;} .m30v {margin: 30px 0;}
.m10h {margin:0 10px;} .m10h {margin:0 10px;}
.m10v {margin:10px 0;} .m10v {margin:10px 0;}

14
js/controllers/send.js
View file

@ -420,8 +420,22 @@ angular.module('copayApp.controllers').controller('SendController',
}; };
$scope.setFromUri = function(uri) { $scope.setFromUri = function(uri) {
function sanitizeUri(uri) {
// Fixes when a region uses comma to separate decimals
var regex = /[\?\&]amount=(\d+([\,\.]\d+)?)/i;
var match = regex.exec(uri);
if (!match || match.length === 0) {
return uri;
}
var value = match[0].replace(',', '.');
var newUri = uri.replace(regex, value);
return newUri;
};
var form = $scope.sendForm; var form = $scope.sendForm;
uri = sanitizeUri(uri);
var parsed = new bitcore.BIP21(uri); var parsed = new bitcore.BIP21(uri);
if (!parsed.isValid() || !parsed.address.isValid()) { if (!parsed.isValid() || !parsed.address.isValid()) {
$scope.error = 'Invalid bitcoin URL'; $scope.error = 'Invalid bitcoin URL';

6
views/send.html
View file

@ -4,7 +4,7 @@
<div class="large-10 medium-10 small-9 columns"> <div class="large-10 medium-10 small-9 columns">
<h1>{{$root.title}}</h1> <h1>{{$root.title}}</h1>
</div> </div>
<div class="large-2 medium-2 small-3 columns"> <div class="large-2 medium-2 small-3 columns" ng-show="!lockAddress && !_merchantData">
<div ng-hide="showScanner || disableScanner"> <div ng-hide="showScanner || disableScanner">
<a class="button right m10b radius tiny black" ng-click="openScanner()"><i class="fi-camera size-18"></i></a> <a class="button right m10b radius tiny black" ng-click="openScanner()"><i class="fi-camera size-18"></i></a>
</div> </div>
@ -87,7 +87,7 @@
</label> </label>
<div class="input block"> <div class="input block">
<input type="text" id="domain" name="domain" ng-model="_domain" ng-disabled="1"> <input class="p45li" type="text" id="domain" name="domain" ng-model="_domain" ng-disabled="1">
<i class="fi-lock color-greeni"></i> <i class="fi-lock color-greeni"></i>
</div> </div>
</div> </div>
@ -138,7 +138,7 @@
<div class="row"> <div class="row">
<div class="large-4 medium-4 small-12 columns text-left"> <div class="large-4 medium-4 small-12 columns text-left">
<div class="show-for-large-up"> <div class="show-for-large-up" ng-show="!lockAddress && !_merchantData">
<div ng-hide="showScanner || disableScanner"> <div ng-hide="showScanner || disableScanner">
<a class="button radius black size-12" ng-click="openScanner()"><i class="fi-camera size-18 vm m5r"></i> Scan QR </a> <a class="button radius black size-12" ng-click="openScanner()"><i class="fi-camera size-18 vm m5r"></i> Scan QR </a>
</div> </div>