Adds remaining values

This commit is contained in:
Gustavo Maximiliano Cortez 2015-09-08 17:36:08 -03:00
parent 886c5013a4
commit 2613897948
No known key found for this signature in database
GPG Key ID: 15EDAD8D9F2EB1AF
4 changed files with 64 additions and 14 deletions

View File

@ -5,7 +5,7 @@
</div>
<div class="content glidera p20v" ng-controller="buyGlideraController as buy">
<div class="content glidera" ng-controller="buyGlideraController as buy">
<div class="onGoingProcess" ng-show="buy.loading">
<div class="onGoingProcess-content" ng-style="{'background-color':index.backgroundColor}">
@ -20,8 +20,32 @@
</div>
</div>
<div class="row">
<div ng-show="index.glideraLimits">
<h4 class="title m0">
<div class="left">
<i class="fi-info size-24 m10r"></i>
</div>
<div class="size-10">
<span class="text-light" translate>Daily buy limit</span>:
${{index.glideraLimits.dailyBuy}}
(remaining ${{index.glideraLimits.dailyBuyRemaining}})
<br>
<span class="text-light" translate>Monthly buy limit</span>:
${{index.glideraLimits.monthlyBuy}}
(remaining ${{index.glideraLimits.monthlyBuyRemaining}})
</div>
</h4>
</div>
<div class="row m20t">
<div class="columns">
<div class="box-notification" ng-show="index.glideraLimits.transactDisabledPendingFirstTransaction">
<span class="text-warning size-14" translate>
This operation was disabled because you have a pending first transaction
</span>
</div>
<div ng-show="!buy.show2faCodeInput && !buy.success">
<form name="buyPriceForm"
ng-submit="buy.get2faCode(index.glideraToken)" novalidate>
@ -50,7 +74,8 @@
<input class="button black expand round"
ng-style="{'background-color':index.backgroundColor}"
type="submit" value="{{'Continue'|translate}}" ng-disabled="!buy.buyPrice.qty || buy.loading">
type="submit" value="{{'Continue'|translate}}"
ng-disabled="index.glideraLimits.transactDisabledPendingFirstTransaction || !buy.buyPrice.qty || buy.loading">
</div>
</form>
</div>

View File

@ -78,12 +78,11 @@
</div>
</div>
<div ng-if="index.glideraStatusLoaded && index.glideraToken && index.glideraPermissions">
<div ng-if="index.glideraToken && index.glideraPermissions">
<div class="text-center m10b">
<div class="size-12" ng-show="index.glideraEmail">
{{index.glideraEmail}}
<span ng-show="!index.glideraStatus.userEmailIsSetup">(<span translate>Unconfirmed</span>)</span>
{{index.glideraEmail}}
</div>
<div ng-show="index.glideraPersonalInfo" class="size-12">
@ -91,9 +90,9 @@
</div>
<div class="text-warning size-12 m20t"
ng-show="!index.glideraStatus.userPhoneIsSetup || (!index.glideraStatus.userBankAccountIsSetup &&
index.glideraStatus.bankAccountState != 'VERIFIED')" translate>
Your Glidera account is not ready to transact. Please, verify it at
ng-show="index.glideraStatus && (!index.glideraStatus.userEmailIsSetup || !index.glideraStatus.userPhoneIsSetup
|| (!index.glideraStatus.userBankAccountIsSetup && index.glideraStatus.bankAccountState != 'VERIFIED'))">
<span translate>Your Glidera account is not ready to transact. Please, verify it at</span>
<a href
ng-init="glideraUrl = index.network == 'testnet' ? 'https://sandbox.glidera.io/login' :
'https://glidera.io/login'"

View File

@ -5,7 +5,7 @@
</div>
<div class="content glidera p20v" ng-controller="sellGlideraController as sell">
<div class="content glidera" ng-controller="sellGlideraController as sell">
<div class="onGoingProcess" ng-show="sell.loading">
<div class="onGoingProcess-content" ng-style="{'background-color':index.backgroundColor}">
@ -20,9 +20,32 @@
</div>
</div>
<div class="row">
<div ng-show="index.glideraLimits">
<h4 class="title m0">
<div class="left">
<i class="fi-info size-24 m10r"></i>
</div>
<div class="size-10">
<span class="text-light" translate>Daily sell limit</span>:
${{index.glideraLimits.dailySell}}
(remaining ${{index.glideraLimits.dailySellRemaining}})
<br>
<span class="text-light" translate>Monthly sell limit</span>:
${{index.glideraLimits.monthlySell}}
(remaining ${{index.glideraLimits.monthlySellRemaining}})
</div>
</h4>
</div>
<div class="row m20t">
<div class="columns">
<div class="box-notification" ng-show="index.glideraLimits.transactDisabledPendingFirstTransaction">
<span class="text-warning size-14" translate>
This operation was disabled because you have a pending first transaction
</span>
</div>
<div ng-show="!sell.show2faCodeInput && !sell.success">
<form name="sellPriceForm"
ng-submit="sell.get2faCode(index.glideraToken)" novalidate>
@ -51,7 +74,8 @@
<input class="button black expand round"
ng-style="{'background-color':index.backgroundColor}"
type="submit" value="{{'Continue'|translate}}" ng-disabled="!sell.sellPrice.qty || sell.loading">
type="submit" value="{{'Continue'|translate}}"
ng-disabled="index.glideraLimits.transactDisabledPendingFirstTransaction || !sell.sellPrice.qty || sell.loading">
</div>
</form>
</div>

View File

@ -871,11 +871,13 @@ console.log('[index.js:395]',txps); //TODO
self.updateGlidera = function(accessToken, permissions) {
if (!accessToken || !permissions) return;
self.glideraStatusLoaded = false;
glideraService.getStatus(accessToken, function(err, data) {
self.glideraStatusLoaded = true;
self.glideraStatus = data;
});
glideraService.getLimits(accessToken, function(err, limits) {
self.glideraLimits = limits;
});
if (permissions.view_email_address) {
self.glideraLoadingEmail = gettext('Getting Glidera Email...');