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

Merge pull request #2005 from iAmShorty/getbalance-config

Browse Source 
[UPDATE] Getbalance config
This commit is contained in:
Sebastian Grewe 2014-03-25 09:32:09 +01:00
commit e26533fecc
4 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cronjobs/payouts.php
View File

@ -46,12 +46,12 @@ if (!$dWalletBalance = $bitcoin->getrealbalance())
// Fetch unconfirmed amount from blocks table // Fetch unconfirmed amount from blocks table
empty($config['network_confirmations']) ? $confirmations = 120 : $confirmations = $config['network_confirmations']; empty($config['network_confirmations']) ? $confirmations = 120 : $confirmations = $config['network_confirmations'];
$aBlocksUnconfirmed = $block->getAllUnconfirmed($confirmations); if ($config['getbalancewithunconfirmed']) {
$dBlocksUnconfirmedBalance = 0; $aBlocksUnconfirmed = $block->getAllUnconfirmed($confirmations);
$dBlocksUnconfirmedBalance = 0;
if (!empty($aBlocksUnconfirmed))foreach ($aBlocksUnconfirmed as $aData) $dBlocksUnconfirmedBalance += $aData['amount']; if (!empty($aBlocksUnconfirmed))foreach ($aBlocksUnconfirmed as $aData) $dBlocksUnconfirmedBalance += $aData['amount'];
$dWalletBalance -= $dBlocksUnconfirmedBalance;
$dWalletBalance -= $dBlocksUnconfirmedBalance; }
// Fetch Newmint // Fetch Newmint
$aGetInfo = $bitcoin->getinfo(); $aGetInfo = $bitcoin->getinfo();
if (is_array($aGetInfo) && array_key_exists('newmint', $aGetInfo)) { if (is_array($aGetInfo) && array_key_exists('newmint', $aGetInfo)) {
@ -133,12 +133,12 @@ if (!$dWalletBalance = $bitcoin->getrealbalance())
// Fetch unconfirmed amount from blocks table // Fetch unconfirmed amount from blocks table
empty($config['network_confirmations']) ? $confirmations = 120 : $confirmations = $config['network_confirmations']; empty($config['network_confirmations']) ? $confirmations = 120 : $confirmations = $config['network_confirmations'];
$aBlocksUnconfirmed = $block->getAllUnconfirmed($confirmations); if ($config['getbalancewithunconfirmed']) {
$dBlocksUnconfirmedBalance = 0; $aBlocksUnconfirmed = $block->getAllUnconfirmed($confirmations);
$dBlocksUnconfirmedBalance = 0;
if (!empty($aBlocksUnconfirmed))foreach ($aBlocksUnconfirmed as $aData) $dBlocksUnconfirmedBalance += $aData['amount']; if (!empty($aBlocksUnconfirmed))foreach ($aBlocksUnconfirmed as $aData) $dBlocksUnconfirmedBalance += $aData['amount'];
$dWalletBalance -= $dBlocksUnconfirmedBalance;
$dWalletBalance -= $dBlocksUnconfirmedBalance; }
// Fetch Newmint // Fetch Newmint
$aGetInfo = $bitcoin->getinfo(); $aGetInfo = $bitcoin->getinfo();
if (is_array($aGetInfo) && array_key_exists('newmint', $aGetInfo)) { if (is_array($aGetInfo) && array_key_exists('newmint', $aGetInfo)) {

7
public/include/config/global.inc.dist.php
View File

@ -29,6 +29,13 @@ $config['SALTY'] = 'THISSHOULDALSOBERRAANNDDOOM';
**/ **/
$config['algorithm'] = 'scrypt'; $config['algorithm'] = 'scrypt';
/**
* Getbalance API Calls
* System used for getting actual Balance from Wallet
* https://github.com/MPOS/php-mpos/wiki/Config-Setup#getbalance-api-calls
**/
$config['getbalancewithunconfirmed'] = true;
/** /**
* Database configuration * Database configuration
* MySQL database configuration * MySQL database configuration

1
public/include/smarty_globals.inc.php
View File

@ -75,6 +75,7 @@ $aGlobal = array(
'disable_contactform' => $setting->getValue('disable_contactform'), 'disable_contactform' => $setting->getValue('disable_contactform'),
'disable_contactform_guest' => $setting->getValue('disable_contactform_guest'), 'disable_contactform_guest' => $setting->getValue('disable_contactform_guest'),
'algorithm' => $config['algorithm'], 'algorithm' => $config['algorithm'],
'getbalancewithunconfirmed' => $config['getbalancewithunconfirmed'],
'target_bits' => $coin->getTargetBits(), 'target_bits' => $coin->getTargetBits(),
'accounts' => $config['accounts'], 'accounts' => $config['accounts'],
'disable_invitations' => $setting->getValue('disable_invitations'), 'disable_invitations' => $setting->getValue('disable_invitations'),

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

@ -20,7 +20,11 @@
{if $NEWMINT >= 0} {if $NEWMINT >= 0}
<tr> <tr>
<td align="left">Liquid Assets</td> <td align="left">Liquid Assets</td>
{if $GLOBAL.config.getbalancewithunconfirmed}
<td align="left">{($BALANCE - $LOCKED - $UNCONFIRMED + $NEWMINT|default:"0")|number_format:"8"}</td> <td align="left">{($BALANCE - $LOCKED - $UNCONFIRMED + $NEWMINT|default:"0")|number_format:"8"}</td>
{else}
<td align="left">{($BALANCE - $LOCKED + $NEWMINT|default:"0")|number_format:"8"}</td>
{/if}
</tr> </tr>
<tr> <tr>
<td align="left">PoS New Mint</td> <td align="left">PoS New Mint</td>