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

Fixes paypro if amount has comma as decimal separator

This commit is contained in:
Gustavo Maximiliano Cortez 2014-12-19 12:26:57 -03:00
parent 877412844c
commit 0be9ee9231
3 changed files with 7 additions and 3 deletions
Show Stats 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;}
.p10 {padding:10px;}
.p10b {padding-bottom:10px;}
.p45li {padding-left: 45px !important;}
.m30v {margin: 30px 0;}
.m10h {margin:0 10px;}
.m10v {margin:10px 0;}

3
js/controllers/send.js
View File

@ -444,6 +444,9 @@ angular.module('copayApp.controllers').controller('SendController',
$scope.error = $scope.success = null;
if (!value) return '';
// Fixes when a region uses comma to separate decimals
value = value.replace(',', '.');
if (value.indexOf('bitcoin:') === 0) {
return $scope.setFromUri(value);
} else if (/^https?:\/\//.test(value)) {

6
views/send.html
View File

@ -4,7 +4,7 @@
<div class="large-10 medium-10 small-9 columns">
<h1>{{$root.title}}</h1>
</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">
<a class="button right m10b radius tiny black" ng-click="openScanner()"><i class="fi-camera size-18"></i></a>
</div>
@ -87,7 +87,7 @@
</label>
<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>
</div>
</div>
@ -138,7 +138,7 @@
<div class="row">
<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">
<a class="button radius black size-12" ng-click="openScanner()"><i class="fi-camera size-18 vm m5r"></i> Scan QR </a>
</div>