apply to request specific amount
This commit is contained in:
Javier
parent
01c7c8ff42
commit
87595f54e5
7 changed files with 120 additions and 255 deletions
|
|
@ -1,88 +0,0 @@
|
|||
<ion-modal-view ng-controller="customAmountController">
|
||||
<ion-header-bar align-title="center" class="tab-bar" ng-style="{'background-color':color}">
|
||||
<div class="left-small">
|
||||
<a ng-click="cancel()" class="p10">
|
||||
<span class="text-close" translate>Close</span>
|
||||
</a>
|
||||
</div>
|
||||
<h1 class="title ellipsis" translate>Request a specific amount</h1>
|
||||
</ion-header-bar>
|
||||
|
||||
<ion-content ng-style="{'background-color': '#f6f7f9'}">
|
||||
<div class="modal-content fix-modals-touch">
|
||||
<div class="m20b" ng-show="customizedAmountBtc">
|
||||
<h4 class="title m0" translate>QR Code</h4>
|
||||
<ul class="no-bullet size-14 m0">
|
||||
<li class="line-b p10 oh text-center">
|
||||
<qrcode size="220" data="bitcoin:{{addr + '?amount=' + customizedAmountBtc}}"></qrcode>
|
||||
<div class="m10t text-center" ng-show="isCordova">
|
||||
<span class="button outline dark-gray tiny round"
|
||||
ng-click="shareAddress('bitcoin:' + addr + '?amount=' + customizedAmountBtc)">
|
||||
<i class="fi-share"></i>
|
||||
<span translate>Share address</span>
|
||||
</span>
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<h4 class="title m0" translate>Details</h4>
|
||||
<ul class="no-bullet size-14 m0">
|
||||
<li class="line-b p10 oh">
|
||||
<span class="text-gray" translate>Address</span>:
|
||||
<span class="right">
|
||||
<span class="text-gray enable_text_select">{{addr}}</span>
|
||||
</span>
|
||||
</li>
|
||||
<li class="line-b p10 oh">
|
||||
<span class="text-gray" translate>Amount</span>:
|
||||
<span class="right">
|
||||
{{customizedAmountUnit}}
|
||||
<span class="label gray radius">{{customizedAlternativeUnit}}</span>
|
||||
</span>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div ng-show="!customizedAmountBtc" class="row m20t">
|
||||
<div class="large-12 large-centered columns">
|
||||
<form name="amountForm" ng-submit="submitForm(amountForm)" novalidate>
|
||||
<div class="right" ng-hide="amountForm.amount.$pristine && !amountForm.amount.$modelValue ">
|
||||
<span class="has-error right size-12" ng-if="amountForm.amount.$invalid">
|
||||
<i class="icon-close-circle size-14"></i>
|
||||
<span clas="vm" translate>Not valid</span>
|
||||
</span>
|
||||
<small class="text-primary right" ng-if="!amountForm.amount.$invalid">
|
||||
<i class="icon-checkmark-circle size-14"></i>
|
||||
</small>
|
||||
</div>
|
||||
<div ng-show="!showAlternative">
|
||||
<label for="amount">
|
||||
<span translate>Amount</span>
|
||||
</label>
|
||||
<div class="input">
|
||||
<input type="number" id="amount" name="amount" ng-attr-placeholder="{{'Amount in'|translate}} {{unitName}}" ignore-mouse-wheel
|
||||
ng-model="_customAmount" ng-minlength="0.00000001" ng-maxlength="10000000000" valid-amount required autocomplete="off">
|
||||
<input type="number" id="alternative" name="alternative" ng-model="_customAlternative" style="display:none">
|
||||
<a class="postfix button" ng-style="{'background-color':color}" ng-click="toggleAlternative()">{{unitName}}</a>
|
||||
</div>
|
||||
</div>
|
||||
<div ng-show="showAlternative">
|
||||
<label for="alternative"><span translate>Amount</span> [{{ alternativeIsoCode }}]
|
||||
</label>
|
||||
<div class="input">
|
||||
<input type="number" id="alternative" name="alternative" ng-attr-placeholder="{{'Amount in'|translate}} {{alternativeName}}" ignore-mouse-wheel
|
||||
ng-model="_customAlternative" required autocomplete="off" required>
|
||||
<input type="number" id="amount" name="amount" ng-model="_customAmount" style="display:none">
|
||||
<a class="postfix button black" ng-click="toggleAlternative()"> {{ alternativeIsoCode }}</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<button type="submit" class="button black round expand" ng-disabled="amountForm.$invalid" ng-style="{'background-color':color}" translate>
|
||||
Generate QR Code
|
||||
</button>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</ion-content>
|
||||
</ion-view-modal>
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
<ion-modal-view ng-controller="inputAmountController" ng-init=init()>
|
||||
<ion-modal-view ng-controller="inputAmountController" ng-style="{'background-color':'#F6F7F9'}" ng-init=init()>
|
||||
<ion-header-bar align-title="center" class="tab-bar" ng-style="{'background-color':color}">
|
||||
<div class="left-small">
|
||||
<a ng-click="cancel()" class="p10">
|
||||
|
|
@ -12,42 +12,77 @@
|
|||
</div>
|
||||
</ion-header-bar>
|
||||
|
||||
<div class="content" ng-style="{'background-color':'#E4E8EC'}">
|
||||
<div class="send-amount row" ng-style="{'background-color':index.backgroundColor}">
|
||||
<div class="size-48" ng-show="!showAlternativeAmount">{{amount}}</div>
|
||||
<div class="size-21 text-light" ng-show="!showAlternativeAmount">{{amountResult}} {{alternativeIsoCode}}</div>
|
||||
<div class="size-48" ng-show="showAlternativeAmount">${{alternativeAmount}}</div>
|
||||
<div class="size-21 text-light" ng-show="showAlternativeAmount">{{alternativeResult}} {{unitName}}</div>
|
||||
<ion-content>
|
||||
<div ng-show="!specificAmount">
|
||||
<div class="send-amount row" ng-style="{'background-color':index.backgroundColor}">
|
||||
<div class="size-48" ng-show="!showAlternativeAmount">{{amount}}</div>
|
||||
<div class="size-21 text-light" ng-show="!showAlternativeAmount">{{amountResult}} {{alternativeIsoCode}}</div>
|
||||
<div class="size-48" ng-show="showAlternativeAmount">${{alternativeAmount}}</div>
|
||||
<div class="size-21 text-light" ng-show="showAlternativeAmount">{{alternativeResult}} {{unitName}}</div>
|
||||
</div>
|
||||
|
||||
<div class="button-content text-center size-10 df">
|
||||
<button class="button button-amount expand button-stable" ng-click="pushOperator('x')">x</button>
|
||||
<button class="button expand button-stable" ng-click="pushOperator('/')">/</button>
|
||||
<button class="button expand button-stable" ng-click="pushOperator('+')">+</button>
|
||||
<button class="button expand button-stable" ng-click="pushOperator('-')">-</button>
|
||||
</div>
|
||||
|
||||
<div class="m10b">
|
||||
<div class="button-content text-center df">
|
||||
<button class="button expand button-light" ng-click="pushDigit('1')">1</button>
|
||||
<button class="button expand button-light" ng-click="pushDigit('2')">2</button>
|
||||
<button class="button expand button-light" ng-click="pushDigit('3')">3</button>
|
||||
</div>
|
||||
<div class="button-content text-center df">
|
||||
<button class="button expand button-light" ng-click="pushDigit('4')">4</button>
|
||||
<button class="button expand button-light" ng-click="pushDigit('5')">5</button>
|
||||
<button class="button expand button-light" ng-click="pushDigit('6')">6</button>
|
||||
</div>
|
||||
<div class="button-content text-center df">
|
||||
<button class="button expand button-light" ng-click="pushDigit('7')">7</button>
|
||||
<button class="button expand button-light" ng-click="pushDigit('8')">8</button>
|
||||
<button class="button expand button-light" ng-click="pushDigit('9')">9</button>
|
||||
</div>
|
||||
<div class="button-content text-center df">
|
||||
<button class="button expand button-light" ng-click="pushDigit('.')">.</button>
|
||||
<button class="button expand button-light" ng-click="pushDigit('0')">0</button>
|
||||
<button class="button expand button-light" ng-click="removeDigit()"><</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="button-content text-center size-10 df">
|
||||
<button class="button expand button-stable" ng-click="pushOperator('x')">x</button>
|
||||
<button class="button expand button-stable" ng-click="pushOperator('/')">/</button>
|
||||
<button class="button expand button-stable" ng-click="pushOperator('+')">+</button>
|
||||
<button class="button expand button-stable" ng-click="pushOperator('-')">-</button>
|
||||
</div>
|
||||
<div class="modal-content m20b" ng-show="specificAmount">
|
||||
<h4 class="title m10l" translate>QR Code</h4>
|
||||
<ul class="no-bullet size-14 m0">
|
||||
<li class="line-b p10 oh text-center">
|
||||
<qrcode size="220" data="bitcoin:{{addr + '?amount=' + index.customizedAmountBtc}}"></qrcode>
|
||||
<div class="m10t text-center" ng-show="isCordova">
|
||||
<span class="button outline dark-gray tiny round"
|
||||
ng-click="shareAddress('bitcoin:' + addr + '?amount=' + index.customizedAmountBtc)">
|
||||
<i class="fi-share"></i>
|
||||
<span translate>Share address</span>
|
||||
</span>
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<div class="m10b">
|
||||
<div class="button-content text-center df">
|
||||
<button class="button expand button-light" ng-click="pushDigit('1')">1</button>
|
||||
<button class="button expand button-light" ng-click="pushDigit('2')">2</button>
|
||||
<button class="button expand button-light" ng-click="pushDigit('3')">3</button>
|
||||
</div>
|
||||
<div class="button-content text-center df">
|
||||
<button class="button expand button-light" ng-click="pushDigit('4')">4</button>
|
||||
<button class="button expand button-light" ng-click="pushDigit('5')">5</button>
|
||||
<button class="button expand button-light" ng-click="pushDigit('6')">6</button>
|
||||
</div>
|
||||
<div class="button-content text-center df">
|
||||
<button class="button expand button-light" ng-click="pushDigit('7')">7</button>
|
||||
<button class="button expand button-light" ng-click="pushDigit('8')">8</button>
|
||||
<button class="button expand button-light" ng-click="pushDigit('9')">9</button>
|
||||
</div>
|
||||
<div class="button-content text-center df">
|
||||
<button class="button expand button-light" ng-click="pushDigit('.')">.</button>
|
||||
<button class="button expand button-light" ng-click="pushDigit('0')">0</button>
|
||||
<button class="button expand button-light" ng-click="removeDigit()"><i class="icon ion-backspace-outline"></i></button>
|
||||
</div>
|
||||
<h4 class="title m10l" translate>Details</h4>
|
||||
<ul class="no-bullet size-14 m0">
|
||||
<li class="line-b p10 oh">
|
||||
<span class="text-gray" translate>Address</span>:
|
||||
<span class="right">
|
||||
<span class="text-gray enable_text_select">{{address}}</span>
|
||||
</span>
|
||||
</li>
|
||||
<li class="line-b p10 oh">
|
||||
<span class="text-gray" translate>Amount</span>:
|
||||
<span class="right">
|
||||
{{specificAmount}} {{unitName}}
|
||||
<span class="label gray radius">{{specificAlternativeAmount}} {{alternativeIsoCode}}</span>
|
||||
</span>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="row p20t">
|
||||
|
|
@ -55,9 +90,18 @@
|
|||
<button class="round expand m0"
|
||||
ng-style="{'background-color':index.backgroundColor}"
|
||||
ng-disabled="alternativeResult == 0 && amountResult == 0"
|
||||
ng-click="save()"
|
||||
translate>Save</button>
|
||||
ng-click="finish()"
|
||||
ng-show="!specificAmount">
|
||||
<span translate ng-show="!address">Ok</span>
|
||||
<span translate ng-show="address">Generate QR Code</span>
|
||||
</button>
|
||||
<button class="round expand m0"
|
||||
ng-style="{'background-color':index.backgroundColor}"
|
||||
ng-click="init()"
|
||||
ng-show="specificAmount">
|
||||
<span translate>Cancel</span>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</ion-modal-view>
|
||||
</ion-content>
|
||||
</ion-modal-view>
|
||||
|
|
|
|||
|
|
@ -303,9 +303,9 @@
|
|||
</button>
|
||||
</div>
|
||||
<div class="small-12 columns" ng-show="home.addr">
|
||||
<button class="button expand small round m10b" ng-click="home.openCustomizedAmountModal(home.addr)"
|
||||
ng-style="{'background-color':index.backgroundColor}"
|
||||
ng-disabled="home.generatingAddress">
|
||||
<button class="button expand small round m10b" ng-click="openInputAmountModal(home.addr)"
|
||||
ng-style="{'background-color':index.backgroundColor}"
|
||||
ng-disabled="home.generatingAddress">
|
||||
<span translate>Request a specific amount</span>
|
||||
</button>
|
||||
</div>
|
||||
|
|
@ -407,11 +407,11 @@
|
|||
<div class="row" ng-init="home.hideAlternative()">
|
||||
<div class="large-12 medium-12 columns">
|
||||
<div class="right" ng-hide="sendForm.amount.$pristine && !sendForm.amount.$modelValue ">
|
||||
<span class="has-error right size-12" ng-if="sendForm.amount.$invalid">
|
||||
<span class="has-error right size-12" ng-show="sendForm.amount.$invalid">
|
||||
<i class="icon-close-circle size-14"></i>
|
||||
<span clas="vm" translate>Not valid</span>
|
||||
</span>
|
||||
<small class="text-primary right" ng-if="!sendForm.amount.$invalid && !sendForm.alternative.$invalid">
|
||||
<small class="text-primary right" ng-show="!sendForm.amount.$invalid && !sendForm.alternative.$invalid">
|
||||
<i class="icon-checkmark-circle size-14"></i>
|
||||
</small>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue