BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix guideline UI

This commit is contained in:
Gustavo Maximiliano Cortez 2016-06-05 20:43:55 -03:00
parent a8065be63f
commit 39c3a85bd3
No known key found for this signature in database
GPG Key ID: 15EDAD8D9F2EB1AF
5 changed files with 87 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
public/views/amazon.html
View File

@ -42,30 +42,35 @@
<div class="m20t text-center" ng-click="amazon.init()">
<img src="img/GCs-logo-cllb.png" alt="Amazon.com Gift Card" width="200">
<div class="size-10 m5t text-gray"><b>Only</b> redeemable on www.amazon.com (USA website)</div>
</div>
<div class="m20t text-center size-12">
<div ng-if="!amazon.giftCards" class="m20t text-center size-12">
<div class="text-left p10h">
Amazon.com Gift Cards* never expire and can be redeemed towards millions of items at
<a ng-click="$root.openExternalLink('https://www.amazon.com')">www.amazon.com</a>.
<a ng-click="$root.openExternalLink('https://www.amazon.com')">www.amazon.com</a>,
<a ng-click="$root.openExternalLink('https://www.myhabit.com')">www.myhabit.com</a>, and
certain of its affiliated websites. Amazon.com&rsquo;s huge
selection includes products in Books, Electronics, Music, MP3 Downloads, DVD, Clothing, Video Games,
Software, Sports &amp; Outdoors, Toys, Baby, Computers &amp; Office, Home &amp; Garden, Jewelry,
Beauty, Cell Phones &amp; Accessories, Home Improvement, Office Products, Camera &amp; 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.
</div>
<button class="m10t button black round tiny"
ng-click="$root.go('buyAmazon')">
Buy now
</button>
</div>
<div ng-if="amazon.giftCards" ng-init="showCards == false">
<div class="size-16 white p10 pointer" ng-click="showCards = !showCards">
<span class="right m10r text-gray">
<i ng-show="!showCards" class="icon-arrow-down3"></i>
<i ng-show="showCards" class="icon-arrow-up3"></i>
</span>
Your cards
<div class="row">
<div class="columns">
<button class="m20t button black round expand"
ng-click="$root.go('buyAmazon')">
Buy now
</button>
</div>
</div>
</div>
<div ng-if="amazon.giftCards">
<h4 class="title">Your cards</h4>
<div ng-repeat="(id, item) in amazon.giftCards | orderObjectBy:'date':true track by $index"
ng-show="showCards"
ng-click="amazon.openCardModal(item)"
class="row collapse last-transactions-content size-12">
<div class="large-2 medium-2 small-2 columns">
@ -84,20 +89,6 @@
</div>
</div>
</div>
<div class="size-12 white p15 m20t">
*Amazon.com Gift Cards (&quot;GCs&quot;) 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 &ldquo;Your Account&rdquo; at Amazon.com. Amazon is
not responsible if a GC is lost, stolen, destroyed or used without permission. See
<a ng-click="$root.openExternalLink('https://www.amazon.com/gc-legal')">www.amazon.com/gc-legal</a> for complete terms,
restrictions and exceptions. For any other questions, see
<a ng-click="$root.openExternalLink('https://www.amazon.com/gc')">www.amazon.com/gc</a>. GCs are issued
by ACI Gift Cards, Inc., a Washington corporation. All Amazon &reg;, &trade; &amp; &copy; are IP of
Amazon.com, Inc. or its affiliates. No expiration date or service fees.
</div>
</div>
<div class="extra-margin-bottom"></div>

8
public/views/buyAmazon.html
View File

@ -74,7 +74,7 @@
<div class="input m20t">
<input class="button black round expand"
ng-disabled="buy.loading || !fiat"
type="submit" value="Order now">
type="submit" value="Buy now">
</div>
</form>
</div>
@ -109,9 +109,9 @@
for easy reference later--you&rsquo;ll need the gift card claim code below
</div>
<div class="oh m20t size-12">
<img class="left m10h" src="img/a_generic.jpg" alt="Amazon.com Gift Cards" width="130">
<div>
<div class="oh m20t size-12 text-center">
<img class="m10h" src="img/a_generic.jpg" alt="Amazon.com Gift Cards" width="230">
<div class="m10t">
Gift Card Amount:
<span class="text-bold">
{{buy.giftCard.cardInfo.value.amount | currency : '$ ' : 2 }}

70
public/views/modals/amazon-card-details.html
View File

@ -17,10 +17,32 @@
ng-swipe-right="cancel()">
<div class="header-modal bg-gray text-center">
<img src="img/a_generic.jpg" alt="Amazon.com Gift Card" width="200" ng-click="refreshGiftCard()">
<div class="size-24 text-bold m10t">
{{card.cardInfo.value.amount | currency : '$ ' : 2}}
<img src="img/a_generic.jpg" alt="Amazon.com Gift Card" width="230" ng-click="refreshGiftCard()">
<div ng-show="card.gcClaimCode">
<div class="m10t">
Gift Card Amount:
<span class="text-bold">
{{card.cardInfo.value.amount | currency : '$ ' : 2}}
</span>
</div>
<div>
Claim code: <span class="text-bold enable_text_select">{{card.gcClaimCode}}</span>
</div>
<div class="m10t">
<button class="button black round tiny"
ng-click="$root.openExternalLink('https://www.amazon.com/gc/redeem?claimCode=' + card.gcClaimCode)">
Redeem Now
</button>
</div>
<div class="size-12 m10t text-center">
| <a
ng-click="$root.openExternalLink('https://www.amazon.com/gp/css/gc/payment/view-gc-balance?claimCode=' + card.gcClaimCode)">
Apply to Account
</a> |
<a ng-click="$root.openExternalLink('http://www.amazon.com/gc-redeem')">How to Use</a> |
</div>
</div>
</div>
@ -28,7 +50,7 @@
<span class="text-warning">
{{error}}
</span>
</div>
</div>
<div class="text-center size-12" ng-show="card.status != 'SUCCESS' && !loading">
<div ng-show="card.status == 'RESEND'">
@ -44,12 +66,24 @@
</div>
</div>
<div class="m10t size-12 white line-t p10" ng-show="card.gcClaimCode">
<div class="text-bold m10b">To redeem your gift card, follow these steps:</div>
<ol class="size-12">
<li>Visit <a ng-click="$root.openExternalLink('https://www.amazon.com/gc')">www.amazon.com/gc</a>.</li>
<li>Click Apply to Account and enter the claim code when prompted.</li>
<li>Gift card funds will be applied automatically to eligible orders during the checkout process.</li>
<li>You must pay for any remaining balance on your order with another payment method.</li>
</ol>
<p class="size-12">Your gift card claim code may also be entered when prompted during checkout.
To redeem your gift card using the Amazon.com 1-Click&reg; service, first add the gift card
funds to Your Account.</p>
<p class="size-12">If you have questions about redeeming your gift card, please visit
<a ng-click="$root.openExternalLink('https://www.amazon.com/gc-redeem')">www.amazon.com/gc-redeem</a>.
If you have questions regarding the BitPay offer, please contact BitPay.</p>
</div>
<ul class="no-bullet size-14">
<li class="line-b p10 oh pointer" ng-show="card.gcClaimCode" 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>
<h4 class="title">Details</h4>
<li class="line-b p10 oh">
<span class="text-gray">Card status</span>
<span class="text-success right" ng-if="card.cardInfo.cardStatus == 'Fulfilled'">Fulfilled</span>
@ -74,7 +108,8 @@
</li>
</ul>
<div class="row m20t" ng-show="card.status == 'FAILURE'">
<div class="row m20t"
ng-show="card.status == 'FAILURE' || card.cardInfo.cardStatus == 'RefundedToPurchaser' || card.cardInfo.cardStatus == 'Expired'">
<div class="columns text-center">
<p class="size-12 text-gray">
This action will remove the gift card
@ -102,5 +137,18 @@
</div>
</div>
<div class="size-12 white p15 m20t">
*Amazon.com Gift Cards (&quot;GCs&quot;) 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 &ldquo;Your Account&rdquo; at Amazon.com. Amazon is
not responsible if a GC is lost, stolen, destroyed or used without permission. See
<a ng-click="$root.openExternalLink('https://www.amazon.com/gc-legal')">www.amazon.com/gc-legal</a> for complete terms,
restrictions and exceptions. For any other questions, see
<a ng-click="$root.openExternalLink('https://www.amazon.com/gc')">www.amazon.com/gc</a>. GCs are issued
by ACI Gift Cards, Inc., a Washington corporation. All Amazon &reg;, &trade; &amp; &copy; are IP of
Amazon.com, Inc. or its affiliates. No expiration date or service fees.
</div>
<div class="extra-margin-bottom"></div>
</div>

4
src/js/services/amazonService.js
View File

@ -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,

2
src/sass/amazon.scss
View File

@ -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;