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

Merge pull request #1826 from iAmShorty/PoS-Balance-Fix

Browse Source 
[FIX] Newmint Payout Fix
This commit is contained in:
Sebastian Grewe 2014-02-26 09:53:17 +01:00
commit 858c2cb24c
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cronjobs/payouts.php
View File

@ -50,7 +50,13 @@ $aBlocksUnconfirmed = $block->getAllUnconfirmed($confirmations);
$dBlocksUnconfirmedBalance = 0;
if (!empty($aBlocksUnconfirmed))foreach ($aBlocksUnconfirmed as $aData) $dBlocksUnconfirmedBalance += $aData['amount'];
$dWalletBalance = $dWalletBalance - $dBlocksUnconfirmedBalance;
$dWalletBalance -= $dBlocksUnconfirmedBalance;
// Fetch Newmint
$aGetInfo = $bitcoin->getinfo();
if (is_array($aGetInfo) && array_key_exists('newmint', $aGetInfo)) {
$dWalletBalance += $aGetInfo['newmint'];
}
// Fetch outstanding manual-payouts
$aManualPayouts = $transaction->getMPQueue($config['payout']['txlimit_manual']);
@ -131,7 +137,13 @@ $aBlocksUnconfirmed = $block->getAllUnconfirmed($confirmations);
$dBlocksUnconfirmedBalance = 0;
if (!empty($aBlocksUnconfirmed))foreach ($aBlocksUnconfirmed as $aData) $dBlocksUnconfirmedBalance += $aData['amount'];
$dWalletBalance = $dWalletBalance - $dBlocksUnconfirmedBalance;
$dWalletBalance -= $dBlocksUnconfirmedBalance;
// Fetch Newmint
$aGetInfo = $bitcoin->getinfo();
if (is_array($aGetInfo) && array_key_exists('newmint', $aGetInfo)) {
$dWalletBalance += $aGetInfo['newmint'];
}
// Fetch outstanding auto-payouts
$aAutoPayouts = $transaction->getAPQueue($config['payout']['txlimit_auto']);

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

@ -19,7 +19,7 @@
</tr>
<tr>
<td align="left">Liquid Assets</td>
<td align="left">{($BALANCE - $LOCKED - $UNCONFIRMED)|number_format:"8"}</td>
<td align="left">{($BALANCE - $LOCKED - $UNCONFIRMED + $NEWMINT|default:"0")|number_format:"8"}</td>
</tr>
{if $NEWMINT >= 0}
<tr>
@ -92,4 +92,3 @@
{/foreach}
</article>
{/if}