From 39c3a85bd37887cf1ec9fd7979c0e6a03572a339 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Sun, 5 Jun 2016 20:43:55 -0300 Subject: [PATCH] Fix guideline UI --- public/views/amazon.html | 51 ++++++-------- public/views/buyAmazon.html | 8 +-- public/views/modals/amazon-card-details.html | 70 +++++++++++++++++--- src/js/services/amazonService.js | 4 +- src/sass/amazon.scss | 2 +- 5 files changed, 87 insertions(+), 48 deletions(-) diff --git a/public/views/amazon.html b/public/views/amazon.html index 5c38b0ec4..0b5e2dfbd 100644 --- a/public/views/amazon.html +++ b/public/views/amazon.html @@ -42,30 +42,35 @@
Amazon.com Gift Card +
Only redeemable on www.amazon.com (USA website)
-
+
Amazon.com Gift Cards* never expire and can be redeemed towards millions of items at - www.amazon.com. + www.amazon.com, + www.myhabit.com, and + certain of its affiliated websites. Amazon.com’s huge + selection includes products in Books, Electronics, Music, MP3 Downloads, DVD, Clothing, Video Games, + Software, Sports & Outdoors, Toys, Baby, Computers & Office, Home & Garden, Jewelry, + Beauty, Cell Phones & Accessories, Home Improvement, Office Products, Camera & Photo, + Pet Supplies, and more. Amazon.com is the place to find and discover almost anything you + want to buy online at a great price.
- -
- -
-
- - - - - Your cards +
+
+ +
+
+ +
+

Your cards

@@ -84,20 +89,6 @@
- -
- *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/public/views/buyAmazon.html b/public/views/buyAmazon.html index a65ba4c26..fe2acb31e 100644 --- a/public/views/buyAmazon.html +++ b/public/views/buyAmazon.html @@ -74,7 +74,7 @@
+ type="submit" value="Buy now">
@@ -109,9 +109,9 @@ for easy reference later--you’ll need the gift card claim code below -
- Amazon.com Gift Cards -
+
+ Amazon.com Gift Cards +
Gift Card Amount: {{buy.giftCard.cardInfo.value.amount | currency : '$ ' : 2 }} diff --git a/public/views/modals/amazon-card-details.html b/public/views/modals/amazon-card-details.html index e727ea274..623f0cce1 100644 --- a/public/views/modals/amazon-card-details.html +++ b/public/views/modals/amazon-card-details.html @@ -17,10 +17,32 @@ ng-swipe-right="cancel()">
- Amazon.com Gift Card - -
- {{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 | +
@@ -28,7 +50,7 @@ {{error}} -
+
@@ -44,12 +66,24 @@
+
+
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.

+
+
    -
  • - - Claim code - {{card.gcClaimCode}} -
    • +

    Details

  • Card status Fulfilled @@ -74,7 +108,8 @@
-
+

This action will remove the gift card @@ -102,5 +137,18 @@

+
+ *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/services/amazonService.js b/src/js/services/amazonService.js index 8bc678077..fcedaa6c3 100644 --- a/src/js/services/amazonService.js +++ b/src/js/services/amazonService.js @@ -169,9 +169,9 @@ angular.module('copayApp.services').factory('amazonService', function($http, $lo }; root.createGiftCard = function(dataSrc, cb) { - var sandbox = credentials.AMAZON_SANDBOX ? 'T' : 'P'; // T: test - P: production + var environment = credentials.AMAZON_SANDBOX ? 'T' : 'P'; // T: test - P: production var now = moment().unix(); - var requestId = dataSrc.creationRequestId || credentials.AMAZON_PARTNER_ID + sandbox + now; + var requestId = dataSrc.creationRequestId || credentials.AMAZON_PARTNER_ID + environment + now; var data = { 'creationRequestId': requestId, diff --git a/src/sass/amazon.scss b/src/sass/amazon.scss index bcbae297c..82645b7be 100644 --- a/src/sass/amazon.scss +++ b/src/sass/amazon.scss @@ -15,7 +15,7 @@ display: inline-block; background-color: #E4E8EC; padding: 3px 10px; - width: 60px; + width: 80px; text-align: center; border: 1px solid #ccc; border-radius: 5px;