diff --git a/src/js/controllers/amazonCards.js b/src/js/controllers/amazonCards.js
index 329c620fc..1d09f51e1 100644
--- a/src/js/controllers/amazonCards.js
+++ b/src/js/controllers/amazonCards.js
@@ -9,6 +9,7 @@ angular.module('copayApp.controllers').controller('amazonCardsController',
var updateGiftCards = function(cb) {
amazonService.getPendingGiftCards(function(err, gcds) {
+console.log('[amazonCards.js.11:gcds:]',gcds); //TODO
if (err) {
popupService.showAlert('Could not get gift cards', err);
if (cb) return cb();
@@ -28,16 +29,24 @@ angular.module('copayApp.controllers').controller('amazonCardsController',
updateGiftCards(function() {
var index = 0;
var gcds = $scope.giftCards;
+console.log('[amazonCards.js.31:gcds:]',gcds); //TODO
lodash.forEach(gcds, function(dataFromStorage) {
- if (dataFromStorage.status == 'PENDING') {
- $log.debug("creating gift card");
+console.log('[amazonCards.js.33:dataFromStorage:]',dataFromStorage); //TODO
+ if (dataFromStorage.status == 'PENDING' || dataFromStorage.status == 'invalid') {
+ $log.debug("Creating / Updating gift card");
$scope.updatingPending[dataFromStorage.invoiceId] = true;
+
+console.log('[amazonCards.js.38]'); //TODO
amazonService.createGiftCard(dataFromStorage, function(err, giftCard) {
+
+console.log('[amazonCards.js.41]'); //TODO
$scope.updatingPending[dataFromStorage.invoiceId] = false;
if (err) {
popupService.showAlert('Error creating gift card', err);
return;
}
+
+console.log('[amazonCards.js.48]', giftCard); //TODO
if (giftCard.status != 'PENDING') {
var newData = {};
diff --git a/src/js/services/amazonService.js b/src/js/services/amazonService.js
index cfd990f1e..8c3ba581d 100644
--- a/src/js/services/amazonService.js
+++ b/src/js/services/amazonService.js
@@ -72,8 +72,10 @@ angular.module('copayApp.services').factory('amazonService', function($http, $lo
if (opts && opts.remove) {
delete(inv[gc.invoiceId]);
}
+
inv = JSON.stringify(inv);
+
storageService.setAmazonGiftCards(network, inv, function(err) {
homeIntegrationsService.register(homeItem);
@@ -125,8 +127,10 @@ angular.module('copayApp.services').factory('amazonService', function($http, $lo
"invoiceId": data.invoiceId,
"accessKey": data.accessKey
};
+console.log('[amazonService.js.129:dataSrc:]',dataSrc); //TODO
$http(_postBitPay('/amazon-gift/redeem', dataSrc)).then(function(data) {
+console.log('[amazonService.js.130:data:]',data); //TODO
var status = data.data.status == 'new' ? 'PENDING' : (data.data.status == 'paid') ? 'PENDING' : data.data.status;
data.data.status = status;
$log.info('Amazon.com Gift Card Create/Update: ' + status);
diff --git a/www/views/amazonCards.html b/www/views/amazonCards.html
index a50aa1454..03a989e06 100644
--- a/www/views/amazonCards.html
+++ b/www/views/amazonCards.html
@@ -14,16 +14,16 @@
Error
Expired
+ Still waiting confirmation
(Use higher fees setting to faster delivery)
Pending to confirmation
Canceled
- {{item.date | amTimeAgo}}
+ {{item.date | amTimeAgo}}