From 2b60bc30665ebde8dce021edf6cb1b293a8f6918 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Mon, 13 Jun 2016 15:00:17 -0300 Subject: [PATCH] Ionic modals. Fix select wallet to buy/sell --- public/views/buyAmazon.html | 8 +- public/views/includes/sidebar.html | 3 +- public/views/modals/amazon-card-details.html | 289 +++++++++--------- src/js/controllers/amazon.js | 93 +----- src/js/controllers/buyAmazon.js | 97 ++---- .../controllers/modals/amazonCardDetails.js | 57 ++++ 6 files changed, 246 insertions(+), 301 deletions(-) create mode 100644 src/js/controllers/modals/amazonCardDetails.js diff --git a/public/views/buyAmazon.html b/public/views/buyAmazon.html index fe2acb31e..245ca07e0 100644 --- a/public/views/buyAmazon.html +++ b/public/views/buyAmazon.html @@ -59,7 +59,7 @@
+ ng-click="openWalletsModal(buy.allWallets)">
@@ -111,13 +111,13 @@
Amazon.com Gift Cards -
+
Gift Card Amount: {{buy.giftCard.cardInfo.value.amount | currency : '$ ' : 2 }}
-
+
Claim code: {{buy.giftCard.gcClaimCode}}
diff --git a/public/views/includes/sidebar.html b/public/views/includes/sidebar.html index 72e3f1a10..9088e4885 100644 --- a/public/views/includes/sidebar.html +++ b/public/views/includes/sidebar.html @@ -32,9 +32,8 @@
  • - -
    +
    Gift Cards
    • diff --git a/public/views/modals/amazon-card-details.html b/public/views/modals/amazon-card-details.html index 623f0cce1..0fcbd4446 100644 --- a/public/views/modals/amazon-card-details.html +++ b/public/views/modals/amazon-card-details.html @@ -1,154 +1,157 @@ - + + -
    -
    + - Amazon.com Gift Card +
    +
    -
    -
    - Gift Card Amount: - - {{card.cardInfo.value.amount | currency : '$ ' : 2}} + Amazon.com Gift Card + +
    +
    + Gift Card Amount: + + {{card.cardInfo.value.amount | currency : '$ ' : 2}} + +
    +
    + Claim code: {{card.gcClaimCode}} +
    +
    + +
    + +
    + | + Apply to Account + | + How to Use | +
    +
    +
    + +
    + + {{error}} -
    -
    - Claim code: {{card.gcClaimCode}} -
    -
    - +
    + +
    +
    +
    + There was a temporary/recoverable system failure that can be resolved by retrying the request +
    + +
    +
    + There was a failure to the create gift card that could not be recoverable. Please, contact BitPay to refund your bitcoin +
    -
    - | - Apply to Account - | - How to Use | +
    +
    To redeem your gift card, follow these steps:
    +
      +
    1. Visit www.amazon.com/gc.
      2. +
    2. Click Apply to Account and enter the claim code when prompted.
      3. +
    3. Gift card funds will be applied automatically to eligible orders during the checkout process.
      4. +
    4. You must pay for any remaining balance on your order with another payment method.
      5. +
    +

    Your gift card claim code may also be entered when prompted during checkout. + To redeem your gift card using the Amazon.com 1-Click® service, first add the gift card + funds to Your Account.

    +

    If you have questions about redeeming your gift card, please visit + www.amazon.com/gc-redeem. + If you have questions regarding the BitPay offer, please contact BitPay.

    -
    -
    -
    - - {{error}} - -
    +
      +

      Details

      +
    • + Card status + Fulfilled + Refunded to purchaser + Expired +
      • +
    • + Created at + {{card.date * 1000 | amDateFormat:'MM/DD/YYYY HH:mm a'}} +
      • +
    • + Creation status + Success + Resend is required + Error + Refunded +
      • +
    • + + BitPay Invoice + {{card.bitpayInvoiceId}} +
      • +
    -
    -
    -
    - There was a temporary/recoverable system failure that can be resolved by retrying the request +
    +
    +

    + This action will remove the gift card +

    + +
    - + +
    +
    +

    + This action will cancel the gift card +

    + +
    +
    + +
    + *Amazon.com Gift Cards ("GCs") sold by BitPay, Inc., an authorized and independent + reseller of Amazon.com Gift Cards. Except as required by law, GCs cannot be transferred for value or redeemed for cash. + GCs may be used only for purchases of eligible goods at Amazon.com or certain of its affiliated websites. Purchases are + deducted from the GC balance. To redeem or view a GC balance, visit “Your Account” at Amazon.com. Amazon is + not responsible if a GC is lost, stolen, destroyed or used without permission. See + www.amazon.com/gc-legal for complete terms, + restrictions and exceptions. For any other questions, see + www.amazon.com/gc. GCs are issued + by ACI Gift Cards, Inc., a Washington corporation. All Amazon ®, ™ & © are IP of + Amazon.com, Inc. or its affiliates. No expiration date or service fees. +
    + +
    -
    - There was a failure to the create gift card that could not be recoverable. Please, contact BitPay to refund your bitcoin -
    -
    - -
    -
    To redeem your gift card, follow these steps:
    -
      -
    1. Visit www.amazon.com/gc.
      2. -
    2. Click Apply to Account and enter the claim code when prompted.
      3. -
    3. Gift card funds will be applied automatically to eligible orders during the checkout process.
      4. -
    4. You must pay for any remaining balance on your order with another payment method.
      5. -
    -

    Your gift card claim code may also be entered when prompted during checkout. - To redeem your gift card using the Amazon.com 1-Click® service, first add the gift card - funds to Your Account.

    -

    If you have questions about redeeming your gift card, please visit - www.amazon.com/gc-redeem. - If you have questions regarding the BitPay offer, please contact BitPay.

    -
    - -
      -

      Details

      -
    • - Card status - Fulfilled - Refunded to purchaser - Expired -
      • -
    • - Created at - {{card.date * 1000 | amDateFormat:'MM/DD/YYYY HH:mm a'}} -
      • -
    • - Creation status - Success - Resend is required - Error - Refunded -
      • -
    • - - BitPay Invoice - {{card.bitpayInvoiceId}} -
      • -
    - -
    -
    -

    - This action will remove the gift card -

    - -
    -
    - -
    -
    -

    - This action will cancel the gift card -

    - -
    -
    - -
    - *Amazon.com Gift Cards ("GCs") sold by BitPay, Inc., an authorized and independent - reseller of Amazon.com Gift Cards. Except as required by law, GCs cannot be transferred for value or redeemed for cash. - GCs may be used only for purchases of eligible goods at Amazon.com or certain of its affiliated websites. Purchases are - deducted from the GC balance. To redeem or view a GC balance, visit “Your Account” at Amazon.com. Amazon is - not responsible if a GC is lost, stolen, destroyed or used without permission. See - www.amazon.com/gc-legal for complete terms, - restrictions and exceptions. For any other questions, see - www.amazon.com/gc. GCs are issued - by ACI Gift Cards, Inc., a Washington corporation. All Amazon ®, ™ & © are IP of - Amazon.com, Inc. or its affiliates. No expiration date or service fees. -
    - -
    -
    + + diff --git a/src/js/controllers/amazon.js b/src/js/controllers/amazon.js index cc288175c..cfe419c5c 100644 --- a/src/js/controllers/amazon.js +++ b/src/js/controllers/amazon.js @@ -1,9 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('amazonController', - function($rootScope, $scope, $timeout, $modal, profileService, configService, amazonService, animationService, lodash) { - - window.ignoreMobilePause = true; + function($scope, $timeout, $ionicModal, configService, amazonService) { this.init = function() { var self = this; @@ -21,90 +19,15 @@ angular.module('copayApp.controllers').controller('amazonController', }); }); }; - + this.openCardModal = function(card) { - $rootScope.modalOpened = true; - var self = this; - var fc = profileService.focusedClient; - var ModalInstanceCtrl = function($scope, $modalInstance) { - $scope.card = card; + $scope.card = card; - $scope.cancelGiftCard = function() { - $scope.refresh = true; - var dataSrc = { - creationRequestId: $scope.card.creationRequestId, - gcId: $scope.card.gcId, - bitpayInvoiceId: $scope.card.bitpayInvoiceId, - bitpayInvoiceUrl: $scope.card.bitpayInvoiceUrl, - date: $scope.card.date - }; - $scope.loading = true; - amazonService.cancelGiftCard(dataSrc, function(err, data) { - $scope.loading = null; - if (err || data.status != 'SUCCESS') { - $scope.error = err || data.status; - return; - } - $scope.refreshGiftCard(); - }); - }; - - $scope.remove = function() { - amazonService.saveGiftCard($scope.card, {remove: true}, function(err) { - $modalInstance.close(true); - }); - }; - - $scope.refreshGiftCard = function() { - $scope.refresh = true; - var dataSrc = { - creationRequestId: $scope.card.creationRequestId, - amount: $scope.card.cardInfo.value.amount, - currencyCode: $scope.card.cardInfo.value.currencyCode, - bitpayInvoiceId: $scope.card.bitpayInvoiceId, - bitpayInvoiceUrl: $scope.card.bitpayInvoiceUrl, - date: $scope.card.date - }; - $scope.loading = true; - amazonService.createGiftCard(dataSrc, function(err, data) { - $scope.loading = null; - if (err) { - $scope.error = err; - return; - } - $scope.card = data; - $timeout(function() { - $scope.$digest(); - }); - }); - }; - - $scope.cancel = lodash.debounce(function() { - $modalInstance.close($scope.refresh); - }, 0, 1000); - - }; - - var modalInstance = $modal.open({ - templateUrl: 'views/modals/amazon-card-details.html', - windowClass: animationService.modalAnimated.slideRight, - controller: ModalInstanceCtrl, + $ionicModal.fromTemplateUrl('views/modals/amazon-card-details.html', { + scope: $scope + }).then(function(modal) { + $scope.amazonCardDetailsModal = modal; + $scope.amazonCardDetailsModal.show(); }); - - var disableCloseModal = $rootScope.$on('closeModal', function() { - modalInstance.close($scope.refresh); - }); - - modalInstance.result.finally(function() { - $rootScope.modalOpened = false; - disableCloseModal(); - var m = angular.element(document.getElementsByClassName('reveal-modal')); - m.addClass(animationService.modalAnimated.slideOutRight); - }); - - modalInstance.result.then(function(refresh) { - if (refresh) self.init(); - }, function() {}); }; - }); diff --git a/src/js/controllers/buyAmazon.js b/src/js/controllers/buyAmazon.js index 084713c86..c0b5a9d78 100644 --- a/src/js/controllers/buyAmazon.js +++ b/src/js/controllers/buyAmazon.js @@ -1,22 +1,15 @@ 'use strict'; angular.module('copayApp.controllers').controller('buyAmazonController', - function($rootScope, $scope, $modal, $log, $timeout, lodash, profileService, animationService, bwsError, configService, walletService, fingerprintService, amazonService) { + function($rootScope, $scope, $ionicModal, $log, $timeout, lodash, profileService, bwsError, configService, walletService, fingerprintService, amazonService) { - window.ignoreMobilePause = true; var self = this; - var fc; + var client; var minimumAmount = 5; var stepAmount = 1; var multiplierAmount = 5; var maximumAmount = 500; - var otherWallets = function(network) { - return lodash.filter(profileService.getWallets(network), function(w) { - return w.network == network && w.m == 1; - }); - }; - var handleEncryptedWallet = function(client, cb) { if (!walletService.isEncrypted(client)) return cb(); $rootScope.$emit('Local/NeedsPassword', false, function(err, password) { @@ -31,68 +24,38 @@ angular.module('copayApp.controllers').controller('buyAmazonController', amazonService.setCredentials(network); amazonService.healthCheckRequest(); amazonService.initUuid(); - self.otherWallets = otherWallets(network); - // Choose focused wallet - try { - var currentWalletId = profileService.focusedClient.credentials.walletId; - lodash.find(self.otherWallets, function(w) { - if (w.id == currentWalletId) { - $timeout(function() { - self.selectedWalletId = w.id; - self.selectedWalletName = w.name; - fc = profileService.getClient(w.id); - $scope.$apply(); - }, 100); - } - }); - } catch (e) { - $log.debug(e); - }; + self.allWallets = profileService.getWallets(network, 1); + client = profileService.focusedClient; + if (client && client.credentials.m == 1) { + $timeout(function() { + self.selectedWalletId = client.credentials.walletId; + self.selectedWalletName = client.credentials.walletName; + $scope.$apply(); + }, 100); + } }; $scope.openWalletsModal = function(wallets) { - if (self.loading) return; self.error = null; - self.errorInfo = null; - var ModalInstanceCtrl = function($scope, $modalInstance) { - $scope.type = 'SELL'; - $scope.wallets = wallets; - $scope.noColor = true; - $scope.cancel = function() { - $modalInstance.dismiss('cancel'); - }; - $scope.selectWallet = function(walletId, walletName) { - if (!profileService.getClient(walletId).isComplete()) { - self.error = bwsError.msg('WALLET_NOT_COMPLETE'); - $modalInstance.dismiss('cancel'); - return; - } - $modalInstance.close({ - 'walletId': walletId, - 'walletName': walletName, - }); - }; - }; + $scope.type = 'SELL'; + $scope.wallets = wallets; - var modalInstance = $modal.open({ - templateUrl: 'views/modals/wallets.html', - windowClass: animationService.modalAnimated.slideUp, - controller: ModalInstanceCtrl, + $ionicModal.fromTemplateUrl('views/modals/wallets.html', { + scope: $scope + }).then(function(modal) { + $scope.walletsModal = modal; + $scope.walletsModal.show(); }); - modalInstance.result.finally(function() { - var m = angular.element(document.getElementsByClassName('reveal-modal')); - m.addClass(animationService.modalAnimated.slideOutDown); - }); - - modalInstance.result.then(function(obj) { + $scope.$on('walletSelected', function(ev, obj) { $timeout(function() { self.selectedWalletId = obj.walletId; self.selectedWalletName = obj.walletName; - fc = profileService.getClient(obj.walletId); + client = obj.client; $scope.$apply(); }, 100); + $scope.walletsModal.hide(); }); }; @@ -156,7 +119,7 @@ angular.module('copayApp.controllers').controller('buyAmazonController', }; self.loading = 'Creating transaction...'; - walletService.createTx(fc, txp, function(err, createdTxp) { + walletService.createTx(client, txp, function(err, createdTxp) { self.loading = null; if (err) { self.loading = null; @@ -204,38 +167,38 @@ angular.module('copayApp.controllers').controller('buyAmazonController', this.confirmTx = function(txp, cb) { - fingerprintService.check(fc, function(err) { + fingerprintService.check(client, function(err) { if (err) { $log.debug(err); return cb(err); } - handleEncryptedWallet(fc, function(err) { + handleEncryptedWallet(client, function(err) { if (err) { $log.debug(err); return bwsError.cb(err, null, cb); } - walletService.publishTx(fc, txp, function(err, publishedTxp) { + walletService.publishTx(client, txp, function(err, publishedTxp) { if (err) { $log.debug(err); return bwsError.cb(err, null, cb); } - walletService.signTx(fc, publishedTxp, function(err, signedTxp) { - walletService.lock(fc); + walletService.signTx(client, publishedTxp, function(err, signedTxp) { + walletService.lock(client); if (err) { $log.debug(err); - walletService.removeTx(fc, signedTxp, function(err) { + walletService.removeTx(client, signedTxp, function(err) { if (err) $log.debug(err); }); return bwsError.cb(err, null, cb); } - walletService.broadcastTx(fc, signedTxp, function(err, broadcastedTxp) { + walletService.broadcastTx(client, signedTxp, function(err, broadcastedTxp) { if (err) { $log.debug(err); - walletService.removeTx(fc, broadcastedTxp, function(err) { + walletService.removeTx(client, broadcastedTxp, function(err) { if (err) $log.debug(err); }); return bwsError.cb(err, null, cb); diff --git a/src/js/controllers/modals/amazonCardDetails.js b/src/js/controllers/modals/amazonCardDetails.js new file mode 100644 index 000000000..5426bcd06 --- /dev/null +++ b/src/js/controllers/modals/amazonCardDetails.js @@ -0,0 +1,57 @@ +'use strict'; + +angular.module('copayApp.controllers').controller('amazonCardDetailsController', function($scope, $timeout, amazonService) { + + $scope.cancelGiftCard = function() { + var dataSrc = { + creationRequestId: $scope.card.creationRequestId, + gcId: $scope.card.gcId, + bitpayInvoiceId: $scope.card.bitpayInvoiceId, + bitpayInvoiceUrl: $scope.card.bitpayInvoiceUrl, + date: $scope.card.date + }; + $scope.loading = true; + amazonService.cancelGiftCard(dataSrc, function(err, data) { + $scope.loading = null; + if (err || data.status != 'SUCCESS') { + $scope.error = err || data.status; + return; + } + $scope.refreshGiftCard(); + }); + }; + + $scope.remove = function() { + amazonService.saveGiftCard($scope.card, {remove: true}, function(err) { + $scope.cancel(); + }); + }; + + $scope.refreshGiftCard = function() { + var dataSrc = { + creationRequestId: $scope.card.creationRequestId, + amount: $scope.card.cardInfo.value.amount, + currencyCode: $scope.card.cardInfo.value.currencyCode, + bitpayInvoiceId: $scope.card.bitpayInvoiceId, + bitpayInvoiceUrl: $scope.card.bitpayInvoiceUrl, + date: $scope.card.date + }; + $scope.loading = true; + amazonService.createGiftCard(dataSrc, function(err, data) { + $scope.loading = null; + if (err) { + $scope.error = err; + return; + } + $scope.card = data; + $timeout(function() { + $scope.$digest(); + }); + }); + }; + + $scope.cancel = function() { + $scope.amazonCardDetailsModal.hide(); + }; + +});