RanchiMall/php-mpos
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #913 from TheSerapher/issue-912

Browse Source 
[ADDED] getInfo output to wallet information
This commit is contained in:
Sebastian Grewe 2013-12-07 05:00:35 -08:00
commit 53b94f7aef
2 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
public/include/pages/admin/wallet.inc.php
View File

@ -13,13 +13,14 @@ if (!$smarty->isCached('master.tpl', $smarty_cache_key)) {
$debug->append('No cached version available, fetching from backend', 3); $debug->append('No cached version available, fetching from backend', 3);
if ($bitcoin->can_connect() === true){ if ($bitcoin->can_connect() === true){
$dBalance = $bitcoin->query('getbalance'); $dBalance = $bitcoin->query('getbalance');
$dGetInfo = $bitcoin->query('getinfo'); $aGetInfo = $bitcoin->query('getinfo');
if (is_array($dGetInfo) && array_key_exists('newmint', $dGetInfo)) { if (is_array($aGetInfo) && array_key_exists('newmint', $aGetInfo)) {
$dNewmint = $dGetInfo['newmint']; $dNewmint = $aGetInfo['newmint'];
} else { } else {
$dNewmint = -1; $dNewmint = -1;
} }
} else { } else {
$aGetInfo = array('errors' => 'Unable to connect');
$dBalance = 0; $dBalance = 0;
$dNewmint = -1; $dNewmint = -1;
$_SESSION['POPUP'][] = array('CONTENT' => 'Unable to connect to wallet RPC service: ' . $bitcoin->can_connect(), 'TYPE' => 'errormsg'); $_SESSION['POPUP'][] = array('CONTENT' => 'Unable to connect to wallet RPC service: ' . $bitcoin->can_connect(), 'TYPE' => 'errormsg');
@ -45,6 +46,7 @@ $smarty->assign("BALANCE", $dBalance);
$smarty->assign("COLDCOINS", $dColdCoins); $smarty->assign("COLDCOINS", $dColdCoins);
$smarty->assign("LOCKED", $dLockedBalance); $smarty->assign("LOCKED", $dLockedBalance);
$smarty->assign("NEWMINT", $dNewmint); $smarty->assign("NEWMINT", $dNewmint);
$smarty->assign("COININFO", $aGetInfo);
// Tempalte specifics // Tempalte specifics
$smarty->assign("CONTENT", "default.tpl"); $smarty->assign("CONTENT", "default.tpl");

26
public/templates/mpos/admin/wallet/default.tpl
View File

@ -1,6 +1,6 @@
<article class="module width_quarter"> <article class="module width_quarter">
<header><h3>Wallet Information</h3></header> <header><h3>Balance Summary</h3></header>
<table width="25%" class="tablesorter"> <table width="25%" class="tablesorter" cellspacing="0">
<tr> <tr>
<td align="left">Wallet Balance</td> <td align="left">Wallet Balance</td>
<td align="left">{$BALANCE|number_format:"8"}</td> <td align="left">{$BALANCE|number_format:"8"}</td>
@ -25,3 +25,25 @@
{/if} {/if}
</table> </table>
</article> </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>