Skip to content

[UPDATE] Getbalance config #2005

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TheSerapher merged 2 commits into from
Mar 25, 2014
Merged

[UPDATE] Getbalance config #2005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22b6901
[FIX] getbalance fix for coins with getbalance problems
iAmShorty Mar 25, 2014
25323f3
[FIX] file rights
iAmShorty Mar 25, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions cronjobs/payouts.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@

// Fetch unconfirmed amount from blocks table
empty($config['network_confirmations']) ? $confirmations = 120 : $confirmations = $config['network_confirmations'];
$aBlocksUnconfirmed = $block->getAllUnconfirmed($confirmations);
$dBlocksUnconfirmedBalance = 0;
if ($config['getbalancewithunconfirmed']) {
$aBlocksUnconfirmed = $block->getAllUnconfirmed($confirmations);
$dBlocksUnconfirmedBalance = 0;
if (!empty($aBlocksUnconfirmed))foreach ($aBlocksUnconfirmed as $aData) $dBlocksUnconfirmedBalance += $aData['amount'];

$dWalletBalance -= $dBlocksUnconfirmedBalance;

$dWalletBalance -= $dBlocksUnconfirmedBalance;
}
// Fetch Newmint
$aGetInfo = $bitcoin->getinfo();
if (is_array($aGetInfo) && array_key_exists('newmint', $aGetInfo)) {
Expand Down Expand Up @@ -133,12 +133,12 @@

// Fetch unconfirmed amount from blocks table
empty($config['network_confirmations']) ? $confirmations = 120 : $confirmations = $config['network_confirmations'];
$aBlocksUnconfirmed = $block->getAllUnconfirmed($confirmations);
$dBlocksUnconfirmedBalance = 0;
if ($config['getbalancewithunconfirmed']) {
$aBlocksUnconfirmed = $block->getAllUnconfirmed($confirmations);
$dBlocksUnconfirmedBalance = 0;
if (!empty($aBlocksUnconfirmed))foreach ($aBlocksUnconfirmed as $aData) $dBlocksUnconfirmedBalance += $aData['amount'];

$dWalletBalance -= $dBlocksUnconfirmedBalance;

$dWalletBalance -= $dBlocksUnconfirmedBalance;
}
// Fetch Newmint
$aGetInfo = $bitcoin->getinfo();
if (is_array($aGetInfo) && array_key_exists('newmint', $aGetInfo)) {
Expand Down
7 changes: 7 additions & 0 deletions public/include/config/global.inc.dist.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,13 @@
**/
$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
* MySQL database configuration
Expand Down
1 change: 1 addition & 0 deletions public/include/smarty_globals.inc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
'disable_contactform' => $setting->getValue('disable_contactform'),
'disable_contactform_guest' => $setting->getValue('disable_contactform_guest'),
'algorithm' => $config['algorithm'],
'getbalancewithunconfirmed' => $config['getbalancewithunconfirmed'],
'target_bits' => $coin->getTargetBits(),
'accounts' => $config['accounts'],
'disable_invitations' => $setting->getValue('disable_invitations'),
Expand Down
4 changes: 4 additions & 0 deletions public/templates/mpos/admin/wallet/default.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,11 @@
{if $NEWMINT >= 0}
<tr>
<td align="left">Liquid Assets</td>
{if $GLOBAL.config.getbalancewithunconfirmed}
<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>
<td align="left">PoS New Mint</td>
Expand Down