Merge branch 'development' of https://github.com/MPOS/php-mpos into development
This commit is contained in:
commit
166c44fd89
@ -46,10 +46,10 @@ 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);
|
||||||
|
$dBlocksUnconfirmedBalance = 0;
|
||||||
|
if (!empty($aBlocksUnconfirmed))foreach ($aBlocksUnconfirmed as $aData) $dBlocksUnconfirmedBalance += $aData['amount'];
|
||||||
if ($config['getbalancewithunconfirmed']) {
|
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
|
// Fetch Newmint
|
||||||
@ -133,10 +133,10 @@ 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);
|
||||||
|
$dBlocksUnconfirmedBalance = 0;
|
||||||
|
if (!empty($aBlocksUnconfirmed))foreach ($aBlocksUnconfirmed as $aData) $dBlocksUnconfirmedBalance += $aData['amount'];
|
||||||
if ($config['getbalancewithunconfirmed']) {
|
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
|
// Fetch Newmint
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user