diff --git a/Gruntfile.js b/Gruntfile.js index 188cb81b8..3fd51b784 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -52,7 +52,7 @@ module.exports = function(grunt) { }, }, css: { - files: ['src/css/*.css'], + files: ['src/sass/*.css', 'src/css/*.css'], tasks: ['concat:css'] }, sass: { diff --git a/public/img/GCs-logo-cllb.png b/public/img/GCs-logo-cllb.png new file mode 100644 index 000000000..2ad1c7aba Binary files /dev/null and b/public/img/GCs-logo-cllb.png differ diff --git a/public/img/a-smile_color_btn.png b/public/img/a-smile_color_btn.png new file mode 100644 index 000000000..c5282761e Binary files /dev/null and b/public/img/a-smile_color_btn.png differ diff --git a/public/img/a_generic.jpg b/public/img/a_generic.jpg new file mode 100644 index 000000000..5690b2a1c Binary files /dev/null and b/public/img/a_generic.jpg differ diff --git a/public/views/amazon.html b/public/views/amazon.html new file mode 100644 index 000000000..45f2af249 --- /dev/null +++ b/public/views/amazon.html @@ -0,0 +1,88 @@ + +
+ +
+ +
+ +
+ +
+ + Sandbox version. Only for testing purpose +
+ +
+ 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 +
+
+ +
+
    +
  • + + Buy Gift Card + + + +
    • +
+

Your cards

+
+
+ {{id}} +
+
+ {{item.amount | currency : '$ ' : 2}} +
+
+ - +
+
+ Error + Pending to confirmation + Canceled + {{item.date | amTimeAgo}} +
+
+ +
+
+
+
+ +
+
diff --git a/public/views/buyAmazon.html b/public/views/buyAmazon.html new file mode 100644 index 000000000..e0949249a --- /dev/null +++ b/public/views/buyAmazon.html @@ -0,0 +1,166 @@ +
+
+ + +
+ +
+
+ +
+ + {{buy.error}} + +
+ There was an error when trying to buy gift card, but the funds were sent to BitPay Invoice. Please, contact + BitPay to refund your bitcoin +
+ Amount: {{buy.errorInfo.amount}} {{buy.errorInfo.currency}}
+ BitPay Invoice ID: {{buy.errorInfo.invoiceId}}. +
+
+ Open invoice +
+
+
+ +
+ Amazon.com Gift Card +
+ Use your Amazon.com Gift Card* to shop from a huge selection of books, electronics, music, movies, software, apparel, toys, and more. +
+
+
+ + +
+ + + USD +
+ +
+ +
+ + + + +
+
+ +
+ +
+ Purchase Amount is limited to USD 500 per day +
+
+
+
+
+ +
+
+

Gift card could not be created

+
+ + There was an error when trying to create the Amazon.com Gift Card. Status: {{buy.giftCard.status}} + +
+
+ + This is a temporary/recoverable system failure that can be + resolved retrying the request from your list of cards + + + This failure could not be recoverable. Request your refund from your list of cards + + +
+
+
+
+ Thank you for participating in the BitPay offer. It is our pleasure to send + you this Amazon.com Gift Card* that can be redeemed towards millions of items at + www.amazon.com. + You may want to print this screen for easy reference later you will need the gift card claim code below. +
+ +
+ Amazon.com Gift Cards +
+ Gift Card Amount: + + {{buy.giftCard.amount | currency : '$ ' : 2 }} + +
+
+ Claim code: {{buy.giftCard.claimCode}} +
+
+ +
+
+ See invoice +
+
+
+ To redeem your gift card, follow these steps: + +
    +
  1. 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. +
+ +

+ 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 Introductory offer, please contact BitPay. +

+ +
+
+
+ +
+ * Amazon.com is not a sponsor of this promotion. + Except as required by law, Amazon.com + Gift Cards ("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. For complete terms and conditions, see + www.amazon.com/gc-legal. + 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/includes/confirm-tx.html b/public/views/includes/confirm-tx.html index 594790af9..c4d8ce64a 100644 --- a/public/views/includes/confirm-tx.html +++ b/public/views/includes/confirm-tx.html @@ -31,7 +31,7 @@
-
diff --git a/public/views/includes/sidebar.html b/public/views/includes/sidebar.html index 4b67781da..21d6ca123 100644 --- a/public/views/includes/sidebar.html +++ b/public/views/includes/sidebar.html @@ -30,6 +30,13 @@ Buy and Sell +
  • + + +
    + Gift Cards +
    +
  • diff --git a/public/views/modals/amazon-card-details.html b/public/views/modals/amazon-card-details.html new file mode 100644 index 000000000..07668def6 --- /dev/null +++ b/public/views/modals/amazon-card-details.html @@ -0,0 +1,119 @@ + + +
    + + Close + +
    +

    + Details +

    +     + + + +
    +
    + + Amazon.com Gift Card + +
    +
    + Gift Card Amount: + + {{card.amount | currency : '$ ' : 2}} + +
    +
    + Claim code: {{card.claimCode}} +
    +
    + +
    +
    +
    + Status: + + CANCELED + +
    +
    +
    +
    +
    + Status: + + PENDING + + + FAILURE + +
    +
    +
    + See invoice +
    +
    + +
    + + {{error}} + +
    + +
    + There was a failure to the create gift card. Please, contact BitPay support. +
    + +
    + To redeem your gift card, follow these steps: + +
      +
    1. 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. +
    + +

    + 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 Introductory offer, please contact BitPay. +

    + +
    + +
    + * Amazon.com is not a sponsor of this promotion. + Except as required by law, Amazon.com + Gift Cards ("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. For complete terms and conditions, see + www.amazon.com/gc-legal. + 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. +
    + +
      +
    • + Cancel +
      • +
    • + Remove +
      • +
    + +
    +
    +     +     diff --git a/public/views/modals/wallets.html b/public/views/modals/wallets.html index 74ed6d011..8d05a90f4 100644 --- a/public/views/modals/wallets.html +++ b/public/views/modals/wallets.html @@ -11,7 +11,8 @@ - + +
    {{error}} diff --git a/public/views/walletHome.html b/public/views/walletHome.html index 81c68d5d4..0ee21524f 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -25,7 +25,6 @@
    -