Skip to content

Commit

Permalink
Merge pull request #1750 from iAmShorty/wallet-info-adminpanel
Browse files Browse the repository at this point in the history 
[ENHANCEMENT] Wallet info adminpanel
  • Loading branch information
@TheSerapher
TheSerapher committed Feb 16, 2014
2 parents 5dd13d4 + 45d79d0 commit e6a396c
Show file tree
Hide file tree
Showing 2 changed files with 103 additions and 44 deletions.
13 changes: 13 additions & 0 deletions public/include/pages/admin/wallet.inc.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,16 @@
$debug->append('No cached version available, fetching from backend', 3);
if ($bitcoin->can_connect() === true){
$dBalance = $bitcoin->getbalance();

$dWalletAccounts = $bitcoin->listaccounts();
$dAddressCount = count($dWalletAccounts);

$dAccountAddresses = array();
foreach($dWalletAccounts as $key => $value)
{
$dAccountAddresses[$key] = $bitcoin->getaddressesbyaccount($key);
}

$aGetInfo = $bitcoin->getinfo();
if (is_array($aGetInfo) && array_key_exists('newmint', $aGetInfo)) {
$dNewmint = $aGetInfo['newmint'];
Expand All @@ -37,6 +47,9 @@
if (! $dColdCoins = $setting->getValue('wallet_cold_coins')) $dColdCoins = 0;
$smarty->assign("UNCONFIRMED", $dBlocksUnconfirmedBalance);
$smarty->assign("BALANCE", $dBalance);
$smarty->assign("ADDRESSCOUNT", $dAddressCount);
$smarty->assign("ACCOUNTADDRESSES", $dAccountAddresses);
$smarty->assign("ACCOUNTS", $dWalletAccounts);
$smarty->assign("COLDCOINS", $dColdCoins);
$smarty->assign("LOCKED", $dLockedBalance);
$smarty->assign("NEWMINT", $dNewmint);
Expand Down
134 changes: 90 additions & 44 deletions public/templates/mpos/admin/wallet/default.tpl
View file
Original file line number Diff line number Diff line change
@@ -1,49 +1,95 @@
<article class="module width_quarter">
<header><h3>Balance Summary</h3></header>
<table width="25%" class="tablesorter" cellspacing="0">
<tr>
<td align="left">Wallet Balance</td>
<td align="left">{$BALANCE|number_format:"8"}</td>
</tr>
<tr>
<td align="left">Locked for users</td>
<td align="left">{$LOCKED|number_format:"8"}</td>
</tr>
<tr>
<td align="left">Unconfirmed</td>
<td align="left">{$UNCONFIRMED|number_format:"8"}</td>
</tr>
<tr>
<td align="left">Liquid Assets</td>
<td align="left">{($BALANCE - $LOCKED)|number_format:"8"}</td>
</tr>
{if $ADDRESSCOUNT > 1}
<article class="module width_full">
<header><h3>Wallet Information</h3></header>
{/if}
<article class="module width_quarter">
<header><h3>Balance Summary</h3></header>
<table width="25%" class="tablesorter" cellspacing="0">
<tr>
<td align="left">Wallet Balance</td>
<td align="left">{$BALANCE|number_format:"8"}</td>
</tr>
<tr>
<td align="left">Locked for users</td>
<td align="left">{$LOCKED|number_format:"8"}</td>
</tr>
<tr>
<td align="left">Unconfirmed</td>
<td align="left">{$UNCONFIRMED|number_format:"8"}</td>
</tr>
<tr>
<td align="left">Liquid Assets</td>
<td align="left">{($BALANCE - $LOCKED)|number_format:"8"}</td>
</tr>
{if $NEWMINT >= 0}
<tr>
<td align="left">PoS New Mint</td>
<td align="left">{$NEWMINT|number_format:"8"}</td>
</tr>
<tr>
<td align="left">PoS New Mint</td>
<td align="left">{$NEWMINT|number_format:"8"}</td>
</tr>
{/if}
</table>
</table>
</article>

<article class="module width_3_quarter">
<header><h3>Wallet Status</h3></header>
<table class="tablesorter" cellspacing="0">
<thead>
<th align="center">Version</th>
<th align="center">Protocol Version</th>
<th align="center">Wallet Version</th>
<th align="center">Connections</th>
<th align="center">Errors</th>
</thead>
<tbody>
<tr>
<td align="center">{$COININFO.version|default:""}</td>
<td align="center">{$COININFO.protocolversion|default:""}</td>
<td align="center">{$COININFO.walletversion|default:""}</td>
<td align="center">{$COININFO.connections|default:""}</td>
<td align="center"><font color="{if $COININFO.errors}red{else}green{/if}">{$COININFO.errors|default:"OK"}</font></td>
</tr>
</tbody>
</table>
</article>
{if $ADDRESSCOUNT > 1}
</article>

<article class="module width_3_quarter">
<header><h3>Wallet Information</h3></header>
<table class="tablesorter" cellspacing="0">
<thead>
<th align="center">Version</th>
<th align="center">Protocol Version</th>
<th align="center">Wallet Version</th>
<th align="center">Connections</th>
<th align="center">Errors</th>
</thead>
<tbody>
<tr>
<td align="center">{$COININFO.version|default:""}</td>
<td align="center">{$COININFO.protocolversion|default:""}</td>
<td align="center">{$COININFO.walletversion|default:""}</td>
<td align="center">{$COININFO.connections|default:""}</td>
<td align="center"><font color="{if $COININFO.errors}red{else}green{/if}">{$COININFO.errors|default:"OK"}</font></td>
</tr>
</tbody>
</table>
<article class="module width_full">
<header><h3>Number of Accounts in Wallet: {$ADDRESSCOUNT|default:"0"}</h3></header>
{foreach key=NAME item=VALUE from=$ACCOUNTS}
<article class="module width_full">
<header><h3>Account: {$NAME|default:"Default"}</h3></header>
<article class="module width_quarter">
<header><h3>Balance Info</h3></header>
<table width="40%" class="tablesorter" cellspacing="0">
<tr>
<td align="left">Balance</td>
<td align="left">{$VALUE|number_format:"8"}</td>
</tr>
</table>
</article>
{foreach key=ACCOUNT item=ADDRESS from=$ACCOUNTADDRESSES}
{if $ACCOUNT == $NAME}
<article class="module width_3_quarter">
<header><h3>Addresses assigned to Account {$ACCOUNT|default:"Default"}</h3></header>
<table class="tablesorter" cellspacing="0">
<tbody>
{foreach from=$ACCOUNTADDRESSES[$ACCOUNT] key=ACCOUNT1 item=ADDRESS1}
{if $ADDRESS1@iteration is even by 1}
<td align="left" style="padding-right: 25px;">{$ADDRESS1}</td>
</tr>
{else}
<tr>
<td align="left" style="padding-right: 25px;">{$ADDRESS1}</td>
{/if}
{/foreach}
</tbody>
</table>
</article>
{/if}
{/foreach}
</article>
{/foreach}
</article>
{/if}

0 comments on commit e6a396c

Please sign in to comment.