diff --git a/src/js/controllers/amazon.js b/src/js/controllers/amazon.js
index 6bc4a4108..9e1787f57 100644
--- a/src/js/controllers/amazon.js
+++ b/src/js/controllers/amazon.js
@@ -1,7 +1,7 @@
'use strict';
angular.module('copayApp.controllers').controller('amazonController',
- function($scope, $timeout, $ionicModal, $log, lodash, bwcError, amazonService, platformInfo, externalLinkService, popupService) {
+ function($scope, $timeout, $ionicModal, $log, lodash, amazonService, platformInfo, externalLinkService, popupService, gettextCatalog) {
$scope.network = amazonService.getEnvironment();
@@ -19,6 +19,14 @@ angular.module('copayApp.controllers').controller('amazonController',
$timeout(function() {
$scope.$digest();
});
+ if ($scope.cardClaimCode) {
+ var card = lodash.find($scope.giftCards, { claimCode: $scope.cardClaimCode });
+ if (lodash.isEmpty(card)) {
+ popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Card not found'));
+ return;
+ }
+ $scope.openCardModal(card);
+ }
});
$scope.updatePendingGiftCards();
};
@@ -26,12 +34,16 @@ angular.module('copayApp.controllers').controller('amazonController',
$scope.updatePendingGiftCards = lodash.debounce(function() {
amazonService.getPendingGiftCards(function(err, gcds) {
+ $timeout(function() {
+ $scope.giftCards = gcds;
+ $scope.$digest();
+ });
lodash.forEach(gcds, function(dataFromStorage) {
if (dataFromStorage.status == 'PENDING') {
$log.debug("creating gift card");
amazonService.createGiftCard(dataFromStorage, function(err, giftCard) {
if (err) {
- popupService.showAlert(gettextCatalog.getString('Error'), bwcError.msg(err));
+ popupService.showAlert(gettextCatalog.getString('Error'), err);
return;
}
if (giftCard.status != 'PENDING') {
@@ -84,6 +96,7 @@ angular.module('copayApp.controllers').controller('amazonController',
};
$scope.$on("$ionicView.beforeEnter", function(event, data) {
+ $scope.cardClaimCode = data.stateParams.cardClaimCode;
initAmazon();
});
});
diff --git a/src/js/controllers/amount.js b/src/js/controllers/amount.js
index 73c53515d..589269b27 100644
--- a/src/js/controllers/amount.js
+++ b/src/js/controllers/amount.js
@@ -1,6 +1,6 @@
'use strict';
-angular.module('copayApp.controllers').controller('amountController', function($rootScope, $scope, $filter, $timeout, $ionicScrollDelegate, gettextCatalog, platformInfo, lodash, configService, rateService, $stateParams, $window, $state, $log, txFormatService, ongoingProcess, bitpayCardService, popupService, bwcError, payproService) {
+angular.module('copayApp.controllers').controller('amountController', function($rootScope, $scope, $filter, $timeout, $ionicScrollDelegate, gettextCatalog, platformInfo, lodash, configService, rateService, $stateParams, $window, $state, $log, txFormatService, ongoingProcess, bitpayCardService, popupService, bwcError, payproService, amazonService) {
var unitToSatoshi;
var satToUnit;
@@ -16,17 +16,18 @@ angular.module('copayApp.controllers').controller('amountController', function($
$scope.$on("$ionicView.beforeEnter", function(event, data) {
+ $scope.buyAmazon = data.stateParams.buyAmazon;
$scope.isWallet = data.stateParams.isWallet;
$scope.cardId = data.stateParams.cardId;
$scope.toAddress = data.stateParams.toAddress;
$scope.toName = data.stateParams.toName;
$scope.toEmail = data.stateParams.toEmail;
- $scope.showAlternativeAmount = !!$scope.cardId;
+ $scope.showAlternativeAmount = !!$scope.cardId || !!$scope.buyAmazon;
$scope.toColor = data.stateParams.toColor;
$scope.customAmount = data.stateParams.customAmount;
- if (!$scope.cardId && !data.stateParams.toAddress) {
+ if (!$scope.cardId && !$scope.buyAmazon && !data.stateParams.toAddress) {
$log.error('Bad params at amount')
throw ('bad params');
}
@@ -201,6 +202,7 @@ angular.module('copayApp.controllers').controller('amountController', function($
amount: amountUSD,
currency: 'USD'
};
+
ongoingProcess.set('Preparing transaction...', true);
$timeout(function() {
@@ -240,6 +242,51 @@ angular.module('copayApp.controllers').controller('amountController', function($
});
});
+ } else if ($scope.buyAmazon) {
+ ongoingProcess.set('Preparing transaction...', true);
+ var amountUSD = $scope.showAlternativeAmount ? _amount : $filter('formatFiatAmount')(toFiat(_amount));
+ var dataSrc = {
+ currency: 'USD',
+ amount: amountUSD,
+ uuid: moment().unix() * 1000
+ };
+
+ amazonService.createBitPayInvoice(dataSrc, function(err, dataInvoice) {
+ if (err) {
+ ongoingProcess.set('Preparing transaction...', false);
+ popupService.showAlert(gettextCatalog.getString('Error'), bwcError.msg(err));
+ return;
+ }
+
+ amazonService.getBitPayInvoice(dataInvoice.invoiceId, function(err, invoice) {
+ if (err) {
+ popupService.showAlert(gettextCatalog.getString('Error'), bwcError.msg(err));
+ return;
+ }
+
+ var payProUrl = invoice.paymentUrls.BIP73;
+
+ payproService.getPayProDetails(payProUrl, function(err, payProDetails) {
+ ongoingProcess.set('Preparing transaction...', false);
+ if (err) {
+ popupService.showAlert(gettextCatalog.getString('Error'), bwcError.msg(err));
+ return;
+ }
+ var stateParams = {
+ giftAmountUSD: amountUSD,
+ giftAccessKey: dataInvoice.accessKey,
+ giftInvoiceTime: invoice.invoiceTime,
+ giftUUID: dataSrc.uuid,
+ toAmount: payProDetails.amount,
+ toAddress: payProDetails.toAddress,
+ description: payProDetails.memo,
+ paypro: payProDetails
+ };
+
+ $state.transitionTo('tabs.giftcards.amazon.confirm', stateParams);
+ }, true);
+ });
+ });
} else {
var amount = $scope.showAlternativeAmount ? fromFiat(_amount) : _amount;
if ($scope.customAmount) {
diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js
index 3c8ac591d..386934ee8 100644
--- a/src/js/controllers/confirm.js
+++ b/src/js/controllers/confirm.js
@@ -1,6 +1,6 @@
'use strict';
-angular.module('copayApp.controllers').controller('confirmController', function($rootScope, $scope, $interval, $filter, $timeout, $ionicScrollDelegate, gettextCatalog, walletService, platformInfo, lodash, configService, rateService, $stateParams, $window, $state, $log, profileService, bitcore, gettext, txFormatService, ongoingProcess, $ionicModal, popupService, $ionicHistory, $ionicConfig, payproService) {
+angular.module('copayApp.controllers').controller('confirmController', function($rootScope, $scope, $interval, $filter, $timeout, $ionicScrollDelegate, gettextCatalog, walletService, platformInfo, lodash, configService, rateService, $stateParams, $window, $state, $log, profileService, bitcore, gettext, txFormatService, ongoingProcess, $ionicModal, popupService, $ionicHistory, $ionicConfig, payproService, amazonService) {
var cachedTxp = {};
var isChromeApp = platformInfo.isChromeApp;
var countDown = null;
@@ -8,6 +8,11 @@ angular.module('copayApp.controllers').controller('confirmController', function(
$ionicConfig.views.swipeBackEnabled(false);
$scope.$on("$ionicView.beforeEnter", function(event, data) {
+ $scope.buyAmazon = data.stateParams.buyAmazon;
+ $scope.giftAmountUSD = data.stateParams.giftAmountUSD;
+ $scope.giftAccessKey = data.stateParams.giftAccessKey;
+ $scope.giftInvoiceTime = data.stateParams.giftInvoiceTime;
+ $scope.giftUUID = data.stateParams.giftUUID;
$scope.isWallet = data.stateParams.isWallet;
$scope.cardId = data.stateParams.cardId;
$scope.toAmount = data.stateParams.toAmount;
@@ -373,6 +378,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
$scope.onSuccessConfirm = function() {
var previousView = $ionicHistory.viewHistory().backView && $ionicHistory.viewHistory().backView.stateName;
var fromBitPayCard = previousView.match(/tabs.bitpayCard/) ? true : false;
+ var fromAmazon = previousView.match(/tabs.giftcards.amazon/) ? true : false;
$ionicHistory.nextViewOptions({
disableAnimate: true
@@ -386,6 +392,17 @@ angular.module('copayApp.controllers').controller('confirmController', function(
id: $stateParams.cardId
});
}, 100);
+ } else if (fromAmazon) {
+ $ionicHistory.nextViewOptions({
+ disableAnimate: true,
+ historyRoot: true
+ });
+ $ionicHistory.clearHistory();
+ $state.go('tabs.home').then(function() {
+ $state.transitionTo('tabs.giftcards.amazon', {
+ cardClaimCode: $scope.amazonGiftCard ? $scope.amazonGiftCard.claimCode : null
+ });
+ });
} else {
$state.go('tabs.send');
}
@@ -394,6 +411,71 @@ angular.module('copayApp.controllers').controller('confirmController', function(
function publishAndSign(wallet, txp, onSendStatusChange) {
walletService.publishAndSign(wallet, txp, function(err, txp) {
if (err) return setSendError(err);
+
+ var previousView = $ionicHistory.viewHistory().backView && $ionicHistory.viewHistory().backView.stateName;
+ var fromAmazon = previousView.match(/tabs.giftcards.amazon/) ? true : false;
+ if (fromAmazon) {
+ var count = 0;
+ var invoiceId = JSON.parse($scope.paypro.merchant_data).invoiceId;
+ var dataSrc = {
+ currency: 'USD',
+ amount: $scope.giftAmountUSD,
+ uuid: $scope.giftUUID,
+ accessKey: $scope.giftAccessKey,
+ invoiceId: invoiceId,
+ invoiceUrl: $scope.paypro.url,
+ invoiceTime: $scope.giftInvoiceTime
+ };
+ debounceCreate(count, dataSrc, onSendStatusChange);
+ }
}, onSendStatusChange);
}
+
+ var debounceCreate = lodash.throttle(function(count, dataSrc) {
+ debounceCreateGiftCard(count, dataSrc);
+ }, 8000, {
+ 'leading': true
+ });
+
+ var debounceCreateGiftCard = function(count, dataSrc, onSendStatusChange) {
+
+ amazonService.createGiftCard(dataSrc, function(err, giftCard) {
+ $log.debug("creating gift card " + count);
+ if (err) {
+ giftCard = {};
+ giftCard.status = 'FAILURE';
+ popupService.showAlert(gettextCatalog.getString('Error'), err);
+ }
+
+ if (giftCard.status == 'PENDING' && count < 3) {
+ $log.debug("pending gift card not available yet");
+ debounceCreate(count + 1, dataSrc);
+ return;
+ }
+
+ var now = moment().unix() * 1000;
+
+ var newData = giftCard;
+ newData['invoiceId'] = dataSrc.invoiceId;
+ newData['accessKey'] = dataSrc.accessKey;
+ newData['invoiceUrl'] = dataSrc.invoiceUrl;
+ newData['amount'] = dataSrc.amount;
+ newData['date'] = dataSrc.invoiceTime || now;
+ newData['uuid'] = dataSrc.uuid;
+
+ if (newData.status == 'expired') {
+ amazonService.savePendingGiftCard(newData, {
+ remove: true
+ }, function(err) {
+ $log.error(err);
+ return;
+ });
+ }
+
+ amazonService.savePendingGiftCard(newData, null, function(err) {
+ $log.debug("Saving new gift card with status: " + newData.status);
+ $scope.amazonGiftCard = newData;
+ });
+ });
+ };
});
diff --git a/src/js/routes.js b/src/js/routes.js
index 6aa16fa48..43c3c4fc4 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -965,6 +965,9 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
controller: 'amazonController',
templateUrl: 'views/amazon.html'
}
+ },
+ params: {
+ cardClaimCode: null
}
})
.state('tabs.giftcards.amazon.buy', {
@@ -977,6 +980,33 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
}
}
})
+ .state('tabs.giftcards.amazon.amount', {
+ url: '/amount',
+ views: {
+ 'tab-home@tabs': {
+ controller: 'amountController',
+ templateUrl: 'views/amount.html'
+ }
+ },
+ params: {
+ buyAmazon: true,
+ toName: 'Amazon.com Gift Card'
+ }
+ })
+ .state('tabs.giftcards.amazon.confirm', {
+ url: '/confirm/:toAmount/:toAddress/:description/:giftAmountUSD/:giftAccessKey/:giftInvoiceTime/:giftUUID',
+ views: {
+ 'tab-home@tabs': {
+ controller: 'confirmController',
+ templateUrl: 'views/confirm.html'
+ }
+ },
+ params: {
+ buyAmazon: true,
+ toName: 'Amazon.com Gift Card',
+ paypro: null
+ }
+ })
/*
*
diff --git a/src/js/services/bitpayCardService.js b/src/js/services/bitpayCardService.js
index 1d6d52983..656078fd7 100644
--- a/src/js/services/bitpayCardService.js
+++ b/src/js/services/bitpayCardService.js
@@ -136,7 +136,7 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http,
};
root.bitAuthPair = function(obj, cb) {
- var deviceName = 'Unknow device';
+ var deviceName = 'Unknown device';
if (platformInfo.isNW) {
deviceName = require('os').platform();
} else if (platformInfo.isCordova) {
diff --git a/src/sass/views/amount.scss b/src/sass/views/amount.scss
index 0933f08ad..7c4c1681e 100644
--- a/src/sass/views/amount.scss
+++ b/src/sass/views/amount.scss
@@ -11,6 +11,9 @@
.icon-bitpay-card {
background-image: url("../img/icon-bitpay.svg");
}
+ .icon-amazon {
+ background-image: url("../img/icon-amazon.svg");
+ }
@media(max-width: 480px) {
.bitcoin-address {
.icon {
diff --git a/src/sass/views/confirm.scss b/src/sass/views/confirm.scss
index 4f6cbc0af..2372290ce 100644
--- a/src/sass/views/confirm.scss
+++ b/src/sass/views/confirm.scss
@@ -1,5 +1,8 @@
#view-confirm {
@extend .deflash-blue;
+ .icon-amazon {
+ background-image: url("../img/icon-amazon.svg");
+ }
.tx-details-content > .scroll {
padding-bottom: .25rem;
}
diff --git a/www/views/amazon.html b/www/views/amazon.html
index 8e17d5559..f3f45af49 100644
--- a/www/views/amazon.html
+++ b/www/views/amazon.html
@@ -30,7 +30,8 @@
diff --git a/www/views/confirm.html b/www/views/confirm.html
index 500a79671..e84ed5b93 100644
--- a/www/views/confirm.html
+++ b/www/views/confirm.html
@@ -28,8 +28,11 @@
+ 
+
+
+
-