From a8f212474a4aedfdca1165b722a4942b6a6e4016 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 14 Sep 2016 12:39:27 -0300 Subject: [PATCH] Amazon: not allow to buy gift card for amounts with more than 2 decimal places. Adds a confirmation before to purchase --- public/views/buyAmazon.html | 10 +++++----- public/views/includes/wallets.html | 4 ++-- src/js/controllers/buyAmazon.js | 8 ++++++++ src/sass/main.scss | 2 +- src/sass/views/includes/wallets.scss | 6 +----- 5 files changed, 17 insertions(+), 13 deletions(-) diff --git a/public/views/buyAmazon.html b/public/views/buyAmazon.html index 92bdbdf46..cd5adc9c1 100644 --- a/public/views/buyAmazon.html +++ b/public/views/buyAmazon.html @@ -33,7 +33,7 @@
@@ -46,17 +46,17 @@ min="0.01" max="500" ng-model="fiat" + ng-pattern="/^[0-9]+(\.[0-9]{1,2})?$/" autocomplete="off" ignore-mouse-wheel required> USD - -
+ +
diff --git a/public/views/includes/wallets.html b/public/views/includes/wallets.html index 3fa2178ff..9a1e6649f 100644 --- a/public/views/includes/wallets.html +++ b/public/views/includes/wallets.html @@ -4,8 +4,8 @@
- {{wallet.name || wallet.id}} - + {{wallet.name || wallet.id}} + {{wallet.m}}-of-{{wallet.n}} diff --git a/src/js/controllers/buyAmazon.js b/src/js/controllers/buyAmazon.js index b0b2d948d..0a57242e5 100644 --- a/src/js/controllers/buyAmazon.js +++ b/src/js/controllers/buyAmazon.js @@ -27,6 +27,14 @@ angular.module('copayApp.controllers').controller('buyAmazonController', }); }; + this.confirm = function() { + var title = gettextCatalog.getString('Confirm Amazon.com Gift Card purchase for ${{amount}} USD', {amount: $scope.fiat}); + var ok = gettextCatalog.getString('Buy'); + popupService.showConfirm(title, null, ok, null, function(res) { + if (res) self.createTx(); + }); + }; + this.createTx = function() { self.errorInfo = null; diff --git a/src/sass/main.scss b/src/sass/main.scss index ca2086550..4b06bd3a4 100644 --- a/src/sass/main.scss +++ b/src/sass/main.scss @@ -889,7 +889,7 @@ input[type=file] { } .wallets { - height: 90px; + height: 110px; } .bar .button.back-button { diff --git a/src/sass/views/includes/wallets.scss b/src/sass/views/includes/wallets.scss index 4f73f3ce6..4bd619f48 100644 --- a/src/sass/views/includes/wallets.scss +++ b/src/sass/views/includes/wallets.scss @@ -21,13 +21,9 @@ &.swiper-slide-next{ left:4%; } - span{ - float:right; - clear:both; - } } } .swiper-pagination{ visibility: hidden; } -} \ No newline at end of file +}