Removes cards. Fix history. New method getInvoiceHistory

src/js/controllers/bitpayCard.js

@@ -6,13 +6,13 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi
   $scope.dateRange = 'last30Days';
   $scope.network = bitpayCardService.getEnvironment();
 
-  var getFromCache = function() {
+  var getFromCache = function(cb) {
     bitpayCardService.getBitpayDebitCardsHistory($scope.cardId, function(err, data) {
-      if (err || lodash.isEmpty(data)) return;
+      if (err || lodash.isEmpty(data)) return cb();
       $scope.historyCached = true;
       self.bitpayCardTransactionHistory = data.transactions;
       self.bitpayCardCurrentBalance = data.balance;
-      $scope.$apply();
+      return cb();
     });
   };
 
@@ -53,7 +53,7 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi
         return;
       }
 
-      self.bitpayCardTransactionHistory = history.transactionList;
+      self.bitpayCardTransactionHistory = history.txs;
       self.bitpayCardCurrentBalance = history.currentCardBalance;
 
       var cacheHistory = {
@@ -102,8 +102,9 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi
       $state.go('tabs.home');
       popupService.showAlert(null, msg);
     } else {
-      getFromCache();
+      getFromCache(function() {
-      self.update();
+        self.update();
+      });
     }
   });
 

src/js/controllers/bitpayCardIntro.js

@@ -1,6 +1,17 @@
 'use strict';
 angular.module('copayApp.controllers').controller('bitpayCardIntroController', function($scope, $state, $timeout, $ionicHistory, storageService, externalLinkService, bitpayCardService, gettextCatalog, popupService) {
 
+  var checkOtp = function(obj, cb) {
+    if (obj.otp) {
+      var msg = gettextCatalog.getString('Enter Two Factor for BitPay Cards');
+      popupService.showPrompt(null, msg, null, function(res) {
+        cb(res);
+      });
+    } else {
+      cb();
+    }
+  };
+
   $scope.$on("$ionicView.beforeEnter", function(event, data) {
 
     if (data.stateParams && data.stateParams.secret) {
@@ -9,28 +20,31 @@ angular.module('copayApp.controllers').controller('bitpayCardIntroController', f
         email: data.stateParams.email,
         otp: data.stateParams.otp
       };
-      bitpayCardService.bitAuthPair(obj, function(err, data) {
+      checkOtp(obj, function(otp) {
-        if (err) {
+        obj.otp = otp;
-          popupService.showAlert(null, err);
+        bitpayCardService.bitAuthPair(obj, function(err, data) {
-          return;
+          if (err) {
-        }
+            popupService.showAlert(null, err);
-        var title = gettextCatalog.getString('Add BitPay Cards?');
+            return;
-        var msg = gettextCatalog.getString('Would you like to add this account ({{email}}) to your wallet?', {email: obj.email});
-        var ok = gettextCatalog.getString('Add cards');
-        var cancel = gettextCatalog.getString('Go back');
-        popupService.showConfirm(title, msg, ok, cancel, function(res) {
-          if (res) {
-            // Set flag for nextStep
-            storageService.setNextStep('BitpayCard', true, function(err) {});
-            // Save data
-            bitpayCardService.setBitpayDebitCards(data, function(err) {
-              if (err) return;
-              $ionicHistory.nextViewOptions({
-                disableAnimate: true
-              });
-              $state.go('tabs.home');
-            });
           }
+          var title = gettextCatalog.getString('Add BitPay Cards?');
+          var msg = gettextCatalog.getString('Would you like to add this account ({{email}}) to your wallet?', {email: obj.email});
+          var ok = gettextCatalog.getString('Add cards');
+          var cancel = gettextCatalog.getString('Go back');
+          popupService.showConfirm(title, msg, ok, cancel, function(res) {
+            if (res) {
+              // Set flag for nextStep
+              storageService.setNextStep('BitpayCard', true, function(err) {});
+              // Save data
+              bitpayCardService.setBitpayDebitCards(data, function(err) {
+                if (err) return;
+                $ionicHistory.nextViewOptions({
+                  disableAnimate: true
+                });
+                $state.go('tabs.home');
+              });
+            }
+          });
         });
       });
     } else {

src/js/controllers/preferencesBitpayCard.js

@@ -1,17 +1,17 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('preferencesBitpayCardController',
-  function($scope, $state, $timeout, $ionicHistory, bitpayCardService, popupService) {
+  function($scope, $state, $timeout, $ionicHistory, bitpayCardService, popupService, gettextCatalog) {
 
-    $scope.logout = function() {
+    $scope.remove = function() {
-      var msg = 'Are you sure you would like to log out of your BitPay Card account?';
+      var msg = gettextCatalog.getString('Are you sure you would like to remove your BitPay Card account from this device?');
       popupService.showConfirm(null, msg, null, null, function(res) {
-        if (res) logout();
+        if (res) remove();
       });
     };
 
-    var logout = function() {
+    var remove = function() {
-      bitpayCardService.logout(function() {
+      bitpayCardService.remove(function() {
         $ionicHistory.removeBackView();
         $timeout(function() {
           $state.go('tabs.home');
@@ -19,4 +19,11 @@ angular.module('copayApp.controllers').controller('preferencesBitpayCardControll
       });
     };
 
+    $scope.$on("$ionicView.beforeEnter", function(event, data) {
+      bitpayCardService.getBitpayDebitCards(function(err, data) {
+        if (err) return;
+        $scope.bitpayCards = data.cards;
+      });
+    });
+
   });

src/js/routes.js

@@ -887,6 +887,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
         url: '/preferences',
         views: {
           'tab-home@tabs': {
+            controller: 'preferencesBitpayCardController',
             templateUrl: 'views/preferencesBitpayCard.html'
           }
         }

src/js/services/bitpayCardService.js

@@ -194,15 +194,17 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http,
   root.getHistory = function(cardId, params, cb) {
     params = params || {};
     var json = {};
-//    json = {
+    json = {
-//      method: 'getInvoiceHistory'
+      method: 'getInvoiceHistory',
-//    };
+      params: JSON.stringify(params)
+    };
     root.getBitpayDebitCards(function(err, data) {
       var card = lodash.find(data.cards, {id : cardId});
       if (!card) return cb(_setError('No card available'));
       // Get invoices
-//      $http(_postBitAuth('/api/v2/' + card.token, json)).then(function(data) {
+      $http(_postBitAuth('/api/v2/' + card.token, json)).then(function(data) {
-//        var invoices = data.data.data;
+        $log.info('BitPay Get Invoices: SUCCESS');
+        var invoices = data.data.data;
         json = {
           method: 'getTransactionHistory',
           params: JSON.stringify(params)
@@ -211,14 +213,14 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http,
         $http(_postBitAuth('/api/v2/' + card.token, json)).then(function(data) {
           $log.info('BitPay Get Transactions: SUCCESS');
           var history = data.data.data || data.data;
-//          history['txs'] = _processTransactions(invoices, history.transactionList);
+          history['txs'] = _processTransactions(invoices, history.transactionList);
           return cb(null, history);
         }, function(data) {
           return cb(_setError('BitPay Card Error: Get Transactions', data));
         });
-//      }, function(data) {
+      }, function(data) {
-//        return cb(_setError('BitPay Card Error: Get Invoices', data));
+        return cb(_setError('BitPay Card Error: Get Invoices', data));
-//      });
+      });
     });
   };
 
@@ -321,10 +323,13 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http,
     });
   };
 
-  root.logout = function(cb) {
+  root.remove = function(cb) {
     _setCredentials();
     storageService.removeBitpayDebitCards(credentials.NETWORK, function(err) {
-      $log.info('BitPay Logout: SUCCESS');
+      storageService.removeBitpayDebitCardsHistory(credentials.NETWORK, function(err) {
+        $log.info('BitPay Debit Cards Removed: SUCCESS');
+        return cb();
+      });
     });
   };
 

www/views/bitpayCard.html

@@ -2,7 +2,7 @@
   <ion-nav-bar class="bar-royal">
     <ion-nav-back-button>
     </ion-nav-back-button>
-    <ion-nav-title>BitPay Card</ion-nav-title>
+    <ion-nav-title>BitPay Visa&reg; Card</ion-nav-title>
     <ion-nav-buttons side="secondary">
       <button class="button back-button" ng-show="!error" ui-sref="tabs.bitpayCard.preferences">
         <i class="icon ion-ios-gear-outline"></i>
@@ -45,7 +45,7 @@
       <h4>Your BitPay Card is ready. Add funds to your card to start using your card at stores and ATMs worldwide.</h4>
     </div>
 
-    <div class="list" ng-show="bitpayCard.bitpayCardTransactionHistory[0]">
+    <div class="list" ng-if="bitpayCard.bitpayCardTransactionHistory[0] && !error" ng-init="cardTxs = bitpayCard.bitpayCardTransactionHistory">
       <div class="item item-divider">
       <select class="select-style" ng-model="dateRange" ng-change="bitpayCard.update(dateRange)">
         <option value="last30Days">Recent Activity</option>
@@ -54,7 +54,7 @@
       </select>
       </div>
       <div
-        ng-repeat="tx in bitpayCard.bitpayCardTransactionHistory | orderBy: ['pending','-timestamp']"
+        ng-repeat="tx in cardTxs | orderBy: ['pending','-timestamp']"
         class="item row"
         ng-init="bitpayCard.getMerchantInfo(tx)">
         <div class="col col-10" ng-init="icon = bitpayCard.getIconName(tx)">

www/views/preferencesBitpayCard.html

@@ -2,14 +2,21 @@
   <ion-nav-bar class="bar-royal">
     <ion-nav-back-button>
     </ion-nav-back-button>
-    <ion-nav-title>Preferences</ion-nav-title>
+    <ion-nav-title>BitPay Visa&reg; Cards</ion-nav-title>
   </ion-nav-bar>
 
-  <ion-content ng-controller="preferencesBitpayCardController">
+  <ion-content>
-    <ul class="list">
+    <div class="list">
-      <li class="item assertive" ng-click="logout()">
+      <div class="item item-divider" translate>
-        Log out
+        Cards
-      </li>
+      </div>
-    </ul>
+      <div class="item" ng-repeat="card in bitpayCards">
+        xxxx-xxxx-xxxx-{{card.lastFourDigits}}
+      </div>
+      <div class="item item-divider"></div>
+      <div class="item assertive" ng-click="remove()">
+        Removes all data from this device
+      </div>
+    </div>
   </ion-content>
 </ion-view>