anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

send working. Refactor paypro and payment intents

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-12-08 18:26:18 -03:00
commit 2fe6ec4c6a
21 changed files with 426 additions and 493 deletions
Download patch file Download diff file Expand all files Collapse all files

20
views/send.html
View file

@ -48,7 +48,7 @@
</div>
<div class="input">
<input type="text" id="address" name="address" ng-disabled="loading || !!$root.merchant || isPayUri"
<input type="text" id="address" name="address" ng-disabled="loading || isPayUri"
placeholder="{{'Bitcoin address'|translate}}" ng-model="address" valid-address required>
<i class="fi-address-book"></i>
<div ng-hide="showScanner || disableScanner">
@ -87,7 +87,7 @@
<div class="small-9 columns">
<div class="input">
<input type="number" id="amount"
ng-disabled="loading || ($root.merchant && +$root.merchant.total > 0) || isPayUri"
ng-disabled="loading || isPayUri.fixedAmount"
name="amount" placeholder="{{'Amount'|translate}}" ng-model="amount"
ng-minlength="0.00000001" ng-maxlength="10000000000" valid-amount required
autocomplete="off">
@ -112,8 +112,7 @@
<div class="small-9 columns">
<div class="input">
<input type="number" id="alternative"
ng-disabled="loading || !isRateAvailable || ($root.merchant && +$root.merchant.total > 0) ||
isPayUri"
ng-disabled="loading || !isRateAvailable ||isPayUri"
name="alternative" placeholder="{{'Amount'|translate}}" ng-model="alternative" requiredautocomplete="off">
<i class="icon-usd"></i>
</div>
@ -136,10 +135,13 @@
</div>
<div class="large-12 columns" ng-show="!!$root.merchant">
<h3 >This is a payment protocol transaction</h3>
<div class="send-note">
<h3 >Payment Protocol Request</h3>
<div class="send-note" ng-click="openPPModal(btx)">
<p>
<b>{{$root.merchant.pr.pd.memo || address}}</b>
<span ng-show="!!$root.merchant.pr.ca"><i class="fi-lock green"></i> {{$root.merchant.pr.ca}}</span>
<span ng-show="!$root.merchant.pr.ca"><i class="fi-unlock red"></i> Untrusted</span>
{{$root.merchant.pr.pd.memo || address}}
</p>
<p>
@ -150,9 +152,7 @@
<p ng-show="!!$root.merchant">
Expires {{$root.merchant.expiration | amTimeAgo }}
[{{$root.merchant.domain}}]
<span ng-show="!!$root.merchant.pr.ca"><i class="fi-lock"></i> {{$root.merchant.pr.ca}}</span>
<span ng-show="!$root.merchant.pr.ca" style="color:red;weight:bold;"><i class="fi-unlock"></i> Untrusted</span>
</p>
</p>
</div>
</div>
</div>