From 05e57983c66fbcc2a223a9f4cd71fbefc3cb196f Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Mon, 16 May 2016 17:51:26 -0300
Subject: [PATCH] Improves datetime. Adds invoice URL

---
 public/views/amazon.html                     |  2 +-
 public/views/buyAmazon.html                  |  2 +-
 public/views/modals/amazon-card-details.html | 12 +++++++++---
 src/js/controllers/buyAmazon.js              |  3 ++-
 src/js/services/amazonService.js             | 20 ++++++++++++++++----
 5 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/public/views/amazon.html b/public/views/amazon.html
index d8ba2f0d9..5f14bd234 100644
--- a/public/views/amazon.html
+++ b/public/views/amazon.html
@@ -61,7 +61,7 @@
         </div>
         <div class="large-5 medium-5 small-5 columns text-right">
           <span class="text-warning" ng-if="item.status == 'ERROR'">Error</span>
-          <span class="text-light" ng-if="item.status != 'ERROR'">{{item.date * 1000 | amCalendar}}</span>
+          <span class="text-light" ng-if="item.status != 'ERROR'">{{item.date * 1000 | amTimeAgo}}</span>
         </div>
         <div class="large-1 medium-1 small-1 columns text-right">
           <i class="icon-arrow-right3 size-18"></i>
diff --git a/public/views/buyAmazon.html b/public/views/buyAmazon.html
index 57dfd0323..d049109ec 100644
--- a/public/views/buyAmazon.html
+++ b/public/views/buyAmazon.html
@@ -108,7 +108,7 @@
         <div class="tu text-gray size-12 text-left">BitPay invoice</div>
         <div class="text-bold size-16 m5t text-left">{{buy.giftCard.bitpayInvoiceId}}</div>
         <button class="m20t button outline round dark-gray tiny" 
-          ng-click="$root.openExternalLink('https://bitpay.com/invoice/' + buy.giftCard.bitpayInvoiceId)">
+          ng-click="$root.openExternalLink(buy.giftCard.bitpayInvoiceUrl)">
           <span class="text-gray">View invoice</span>
         </button>
       </div>
diff --git a/public/views/modals/amazon-card-details.html b/public/views/modals/amazon-card-details.html
index 4bb94b945..ddf25724f 100644
--- a/public/views/modals/amazon-card-details.html
+++ b/public/views/modals/amazon-card-details.html
@@ -25,18 +25,24 @@
   </div>
 
   <ul class="no-bullet size-14">
-    <li class="line-b p10 oh">
+    <li class="line-b p10 oh pointer" ng-click="$root.openExternalLink()">
+      <i class="icon-arrow-right3 size-24 right text-bold"></i>  
       <span class="text-gray">Claim code</span>
       <span class="text-bold right enable_text_select">{{card.gcClaimCode}}</span>
     </li>
+    <li class="line-b p10 oh">
+      <span class="text-gray">Created at</span>
+      <span class="test-gray right enable_text_select">{{card.date * 1000 | amDateFormat:'MM/DD/YYYY HH:mm a'}}</span>
+    </li>
     <li class="line-b p10 oh">
       <span class="text-gray">Status</span>
       <span class="text-success right" ng-if="card.status == 'SUCCESS'">Completed</span>
       <span class="text-info right" ng-if="card.status == 'PENDING'">Pending</span>
       <span class="text-warning right" ng-if="card.status == 'ERROR'">Error</span>
     </li>
-    <li class="line-b p10 oh">
-      <span class="text-gray">BitPay Invoice ID</span>
+    <li class="line-b p10 oh pointer" ng-click="$root.openExternalLink(card.bitpayInvoiceUrl)">
+      <i class="icon-arrow-right3 size-24 right text-gray"></i>  
+      <span class="text-gray">BitPay Invoice</span>
       <span class="text-gray right enable_text_select">{{card.bitpayInvoiceId}}</span>
     </li>
   </ul>
diff --git a/src/js/controllers/buyAmazon.js b/src/js/controllers/buyAmazon.js
index 6d49eb5d1..4735eb94c 100644
--- a/src/js/controllers/buyAmazon.js
+++ b/src/js/controllers/buyAmazon.js
@@ -169,7 +169,8 @@ angular.module('copayApp.controllers').controller('buyAmazonController',
                   var gift = {
                     amount: dataSrc.price,
                     currencyCode: dataSrc.currency,
-                    bitpayInvoiceId: data.data.id
+                    bitpayInvoiceId: data.data.id,
+                    bitpayInvoiceUrl: data.data.url
                   };
                   self.loading = 'Buying gift card...';
                   amazonService.buyGiftCard(gift, function(err, giftCard) {
diff --git a/src/js/services/amazonService.js b/src/js/services/amazonService.js
index c7dc3ef6f..ff6435e54 100644
--- a/src/js/services/amazonService.js
+++ b/src/js/services/amazonService.js
@@ -19,7 +19,8 @@ angular.module('copayApp.services').factory('amazonService', function($http, $lo
     "gcExpirationDate":null,
     "gcId":"A2GCN9BRX5QS76",
     "status":"SUCCESS",
-    "bitpayInvoiceId":"NJtevvEponHbQVmYoL7FYp" 
+    "bitpayInvoiceId":"NJtevvEponHbQVmYoL7FYp",
+    "bitpayInvoiceUrl":"http://test.bitpay.com/invoice?id=XwrLryQEypTKg4nq37t3bN" 
   };
 
   root.setCredentials = function(network) {
@@ -36,7 +37,7 @@ angular.module('copayApp.services').factory('amazonService', function($http, $lo
     };
   };
 
-  var _getBitPay = function(endpoint, token) {
+  var _getBitPay = function(endpoint) {
     return {
       method: 'GET',
       url: credentials.BITPAY_API + endpoint,
@@ -67,8 +68,18 @@ angular.module('copayApp.services').factory('amazonService', function($http, $lo
       $log.info('BitPay Create Invoice: SUCCESS');
       return cb(null, data.data); 
     }, function(data) {
-      $log.error('BitPay Create Invoice: ERROR ' + data.statusText);
-      return cb(data);
+      $log.error('BitPay Create Invoice: ERROR ' + data.data.error);
+      return cb(data.data.error);
+    });
+  };
+
+  root.getBitPayInvoice = function(id, cb) {
+    $http(_getBitPay('/invoices/' + id)).then(function(data) {
+      $log.info('BitPay Get Invoice: SUCCESS');
+      return cb(null, data.data);
+    }, function(data) {
+      $log.error('BitPay Get Invoice: ERROR ' + data.data.error);
+      return cb(data.data.error);
     });
   };
 
@@ -112,6 +123,7 @@ angular.module('copayApp.services').factory('amazonService', function($http, $lo
     saveData.cardInfo.value.amount = gift.amount;
     saveData.cardInfo.value.currencyCode = gift.currencyCode;
     saveData['bitpayInvoiceId'] = gift.bitpayInvoiceId;
+    saveData['bitpayInvoiceUrl'] = gift.bitpayInvoiceUrl;
     saveData['date'] = newId;
     root.saveGiftCard(saveData, null, function(err) {
       return cb(null, fakeData);