diff --git a/cronjobs/payouts.php b/cronjobs/payouts.php index 43276926..87c6bb6e 100755 --- a/cronjobs/payouts.php +++ b/cronjobs/payouts.php @@ -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']); diff --git a/public/templates/mpos/admin/wallet/default.tpl b/public/templates/mpos/admin/wallet/default.tpl index 31a506ed..033336e8 100644 --- a/public/templates/mpos/admin/wallet/default.tpl +++ b/public/templates/mpos/admin/wallet/default.tpl @@ -19,7 +19,7 @@ Liquid Assets - {($BALANCE - $LOCKED - $UNCONFIRMED)|number_format:"8"} + {($BALANCE - $LOCKED - $UNCONFIRMED + $NEWMINT|default:"0")|number_format:"8"} {if $NEWMINT >= 0} @@ -92,4 +92,3 @@ {/foreach} {/if} -