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

Merge pull request #3860 from JDonadio/fix/payment-expired

Browse source 
Expiry time - paypro
This commit is contained in:
Matias Alejo Garcia 2016-02-19 17:36:28 -03:00
commit fe2c02ccc6
3 changed files with 87 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

18
public/views/modals/txp-details.html
View file

@ -11,7 +11,7 @@
</h1>
</section>
</nav>
<div class="modal-content fix-modals-touch"
<div class="modal-content fix-modals-touch"
ng-swipe-disable-mouse
ng-swipe-right="cancel()"
ng-init="updateCopayerList()">
@ -29,7 +29,7 @@
</span>
</span>
</div>
<div class="oh">
<div class="box-notification" ng-show="error">
<span class="text-warning size-14">
@ -54,7 +54,7 @@
<div class="large-6 medium-6 small-6 columns text-right" ng-show="canSign">
<button class="button primary round expand" ng-click="sign(tx)"
ng-style="{'background-color':color}"
ng-disabled="loading">
ng-disabled="loading || (paymentExpired && usePaypro)">
<i class="fi-check"></i>
<span translate>Accept</span>
</button>
@ -140,10 +140,16 @@
<contact address="{{tx.toAddress}}" ng-hide="tx.merchant"></contact>
</span>
</li>
<li class="line-b p10">
<li class="line-b p10" ng-if="paymentExpired">
<span class="text-gray" translate>Expired</span>
<span class="right text-alert">
<time>{{tx.paypro.expires * 1000 | amTimeAgo }}</time>
</span>
</li>
<li class="line-b p10" ng-if="!paymentExpired">
<span class="text-gray" translate>Expires</span>
<span class="right">
<time>{{tx.paypro.expirationDate | amTimeAgo }}</time>
<time>{{expires * 1000 | amTimeAgo }}</time>
</span>
</li>
<li class="line-b p10">
@ -170,7 +176,7 @@
{{ac.copayerName}} <span ng-if="ac.copayerId == copayerId">({{'Me'|translate}})</span>
</li>
</ul>
</div>
</div>
<div class="columns text-center m20t" ng-if="tx.canBeRemoved || (tx.status == 'accepted' && !tx.broadcastedOn)">
<div class="text-gray size-12 m20b" ng-show="!tx.isGlidera && isShared" translate>

14
public/views/walletHome.html
View file

@ -175,7 +175,7 @@
<div translate>Updating transaction history. Please stand by.</div>
</div>
</div>
</div>
</div>
<div class="oh pr" ng-show="index.txHistory[0]">
<h4 class="title m0">
@ -361,12 +361,14 @@
<div class="pr p25b">
<h4 class="title m0">
<available-balance></available-balance>
<a
ng-show="!home.lockedCurrentFeePerKb && index.feeToSendMaxStr && index.availableBalanceSat > 0 && !home.blockUx && !home.lockAmount"
ng-click="home.sendAll()"
class="p10"
<a ng-show="!home.lockedCurrentFeePerKb && index.feeToSendMaxStr && index.availableBalanceSat > 0 && !home.blockUx && !home.lockAmount"
ng-click="home.sendAll()"
translate> Send All
</a>
<div ng-show="!home.paymentExpired && home._paypro">
<span translate>Payment expires</span>
<time> {{home.timeToExpire * 1000 | amTimeAgo}}</time>
</div>
</h4>
<div class="camera-icon" ng-show="index.isComplete">
<qr-scanner on-scan="home.onQrCodeScanned(data)"></qr-scanner>
@ -475,7 +477,7 @@
<a ng-click="home.resetForm(sendForm)" class="button expand outline dark-gray round" translate>Cancel</a>
</div>
<div class="columns" ng-class="{'small-6 medium-6 large-6':(home._paypro || home.lockAddress || home.lockAmount)}">
<button type="submit" class="button black round expand" ng-disabled="sendForm.$invalid || home.blockUx || index.isOffline"
<button type="submit" class="button black round expand" ng-disabled="sendForm.$invalid || home.blockUx || index.isOffline || (home.paymentExpired && home._paypro)"
ng-style="{'background-color':index.backgroundColor}" translate>
Send
</button>