Merge pull request #64 from cmgustavo/ref/design-19

Fix amazon buttons and forms
This commit is contained in:
Matias Alejo Garcia 2016-09-06 15:00:59 -03:00 committed by GitHub
commit a9e66cf259
3 changed files with 19 additions and 28 deletions

View File

@ -1,8 +1,8 @@
<ion-view>
<ion-nav-bar class="bar-royal">
<ion-nav-buttons side="primary">
<button class="button back-button" ui-sref="tabs.home">
<i class="icon ion-ios-arrow-thin-left"></i>
<button class="button button-clear" ui-sref="tabs.home">
Close
</button>
</ion-nav-buttons>
<ion-nav-title>Gift cards</ion-nav-title>
@ -21,7 +21,7 @@
<div ng-if="!giftCards" class="m20t padding text-center">
<button class="button" ui-sref="amazon.buy">
<button class="button button-block button-positive" ui-sref="amazon.buy">
Buy now
</button>
@ -41,7 +41,7 @@
</div>
<div class="card">
<div class="item item-divider">
<div class="item item-heading">
Your cards
</div>
<div ng-repeat="(id, item) in giftCards | orderObjectBy:'date':true track by $index"

View File

@ -36,7 +36,7 @@
ng-submit="buy.createTx()"
novalidate>
<div class="list">
<div class="card list">
<label class="item item-input item-stacked-label">
<span class="input-label">Amount</span>
<input type="number"
@ -53,7 +53,7 @@
<wallets ng-if="wallets[0]" wallets="wallets"></wallets>
</div>
<button class="button button-block"
<button class="button button-block button-positive"
ng-disabled="!fiat"
type="submit"
value="Buy now">
@ -68,10 +68,8 @@
<div class="m10t" ng-show="buy.giftCard">
<div class="m10h" ng-show="buy.giftCard.status != 'SUCCESS' && buy.giftCard.status != 'PENDING'">
<h1 class="text-center">Gift card could not be created</h1>
<div class="box-notification m20b">
<span class="text-warning">
There was an error when trying to create the Amazon.com Gift Card. Status: {{buy.giftCard.status}}
</span>
<div class="box-notification error">
There was an error when trying to create the Amazon.com Gift Card. Status: {{buy.giftCard.status}}
</div>
<div class="text-gray size-12 m20t">
<span ng-show="buy.giftCard.status == 'RESEND'">
@ -81,7 +79,7 @@
<span ng-show="buy.giftCard.status == 'FAILURE'">
This failure could not be recoverable. Request your refund from your list of cards
</span>
<button class="m20t button outline round dark-gray expand" ng-click="$root.go('amazon')">
<button class="button button-block button-positive" ng-click="$root.go('amazon')">
Back
</button>
</div>
@ -106,13 +104,13 @@
Claim code: <span class="text-bold" copy-to-clipboard="buy.giftCard.claimCode">{{buy.giftCard.claimCode}}</span>
</div>
<div class="m10t">
<button class="button black round tiny"
<button class="button button-positive"
ng-click="openExternalLink('https://www.amazon.com/gc/redeem?claimCode=' + buy.giftCard.claimCode, '_system')">
Redeem Now
</button>
</div>
<div class="size-12 m10t text-center">
<a ng-click="openExternalLink(buy.giftCard.invoiceUrl)">See invoice</a>
<div class="m10t text-center">
<a class="button button-clear button-calm" ng-click="openExternalLink(buy.giftCard.invoiceUrl)">See invoice</a>
</div>
</div>
<div class="oh m20t p15h size-12">

View File

@ -1,7 +1,6 @@
<ion-modal-view ng-controller="amazonCardDetailsController">
<ion-header-bar align-title="center" class="tab-bar">
<button class="button button-clear button-positive"
ng-click="cancel()">
<ion-header-bar align-title="center" class="bar-royal">
<button class="button button-clear" ng-click="cancel()">
Close
</button>
<h1 class="title">Details</h1>
@ -23,7 +22,7 @@
Claim code: <span class="text-bold" copy-to-clipboard="card.claimCode">{{card.claimCode}}</span>
</div>
<div class="m10t" ng-show="card.cardStatus == 'Fulfilled'">
<button class="button black round tiny"
<button class="button button-positive"
ng-click="openExternalLink('https://www.amazon.com/gc/redeem?claimCode=' + card.claimCode, '_system')">
Redeem Now
</button>
@ -48,18 +47,12 @@
</span>
</div>
</div>
<div class="size-12 m10t text-center">
<a ng-click="openExternalLink(card.invoiceUrl)">See invoice</a>
<div class="m10t text-center">
<a class="button button-clear button-calm" ng-click="openExternalLink(card.invoiceUrl)">See invoice</a>
</div>
</div>
<div class="box-notification m20b" ng-show="error" ng-click="error = null">
<span class="text-warning">
{{error}}
</span>
</div>
<div class="text-center size-12 text-warning m10" ng-show="card.status == 'FAILURE' || card.status == 'RESEND'">
<div class="box-notification warning" ng-show="card.status == 'FAILURE' || card.status == 'RESEND'">
There was a failure to the create gift card. Please, contact BitPay support.
</div>
@ -86,7 +79,7 @@
</div>
<div class="size-12 white p15 m30v">
<div class="size-12 p15 m30v">
* <a ng-click="openExternalLink('http://amazon.com')">Amazon.com</a> is not a sponsor of this promotion.
Except as required by law, <a ng-click="openExternalLink('http://amazon.com')">Amazon.com</a>
Gift Cards ("GCs") cannot be transferred for value or redeemed for cash. GCs may be used only for purchases of