From c6b060dbd515d92e8d550cd686338c6e15951dd4 Mon Sep 17 00:00:00 2001 From: iAmShorty Date: Mon, 24 Feb 2014 20:31:53 +0100 Subject: [PATCH 1/4] [FIX] Newmint Payout Fix --- cronjobs/payouts.php | 16 ++++++++++++++-- public/templates/mpos/admin/wallet/default.tpl | 10 +++++++--- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/cronjobs/payouts.php b/cronjobs/payouts.php index 43276926..9b2f689a 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; +// Fetch Newmint +$aGetInfo = $bitcoin->getinfo(); +if (is_array($aGetInfo) && array_key_exists('newmint', $aGetInfo)) { + $dWalletBalance = $dWalletBalance - $dBlocksUnconfirmedBalance + $aGetInfo['newmint']; +} else { + $dWalletBalance = $dWalletBalance - $dBlocksUnconfirmedBalance; +} // 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; +// Fetch Newmint +$aGetInfo = $bitcoin->getinfo(); +if (is_array($aGetInfo) && array_key_exists('newmint', $aGetInfo)) { + $dWalletBalance = $dWalletBalance - $dBlocksUnconfirmedBalance + $aGetInfo['newmint']; +} else { + $dWalletBalance = $dWalletBalance - $dBlocksUnconfirmedBalance; +} // 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..24069853 100644 --- a/public/templates/mpos/admin/wallet/default.tpl +++ b/public/templates/mpos/admin/wallet/default.tpl @@ -17,15 +17,20 @@ Unconfirmed {$UNCONFIRMED|number_format:"8"} +{if $NEWMINT >= 0} Liquid Assets - {($BALANCE - $LOCKED - $UNCONFIRMED)|number_format:"8"} + {($BALANCE - $LOCKED - $UNCONFIRMED + $NEWMMINT)|number_format:"8"} -{if $NEWMINT >= 0} PoS New Mint {$NEWMINT|number_format:"8"} +{else} + + Liquid Assets + {($BALANCE - $LOCKED - $UNCONFIRMED)|number_format:"8"} + {/if} @@ -92,4 +97,3 @@ {/foreach} {/if} - From 15f7300195b000805525a0046fe52df57d491d0c Mon Sep 17 00:00:00 2001 From: iAmShorty Date: Mon, 24 Feb 2014 20:49:07 +0100 Subject: [PATCH 2/4] [UPDATE] cleanup --- cronjobs/payouts.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cronjobs/payouts.php b/cronjobs/payouts.php index 9b2f689a..87c6bb6e 100755 --- a/cronjobs/payouts.php +++ b/cronjobs/payouts.php @@ -50,12 +50,12 @@ $aBlocksUnconfirmed = $block->getAllUnconfirmed($confirmations); $dBlocksUnconfirmedBalance = 0; if (!empty($aBlocksUnconfirmed))foreach ($aBlocksUnconfirmed as $aData) $dBlocksUnconfirmedBalance += $aData['amount']; +$dWalletBalance -= $dBlocksUnconfirmedBalance; + // Fetch Newmint $aGetInfo = $bitcoin->getinfo(); if (is_array($aGetInfo) && array_key_exists('newmint', $aGetInfo)) { - $dWalletBalance = $dWalletBalance - $dBlocksUnconfirmedBalance + $aGetInfo['newmint']; -} else { - $dWalletBalance = $dWalletBalance - $dBlocksUnconfirmedBalance; + $dWalletBalance += $aGetInfo['newmint']; } // Fetch outstanding manual-payouts @@ -137,12 +137,12 @@ $aBlocksUnconfirmed = $block->getAllUnconfirmed($confirmations); $dBlocksUnconfirmedBalance = 0; if (!empty($aBlocksUnconfirmed))foreach ($aBlocksUnconfirmed as $aData) $dBlocksUnconfirmedBalance += $aData['amount']; +$dWalletBalance -= $dBlocksUnconfirmedBalance; + // Fetch Newmint $aGetInfo = $bitcoin->getinfo(); if (is_array($aGetInfo) && array_key_exists('newmint', $aGetInfo)) { - $dWalletBalance = $dWalletBalance - $dBlocksUnconfirmedBalance + $aGetInfo['newmint']; -} else { - $dWalletBalance = $dWalletBalance - $dBlocksUnconfirmedBalance; + $dWalletBalance += $aGetInfo['newmint']; } // Fetch outstanding auto-payouts From 3381b0e60aeaa3ac2c9fb8b7c7ea6c772e1a45e1 Mon Sep 17 00:00:00 2001 From: iAmShorty Date: Mon, 24 Feb 2014 21:24:03 +0100 Subject: [PATCH 3/4] [FIX] Typo --- public/templates/mpos/admin/wallet/default.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/templates/mpos/admin/wallet/default.tpl b/public/templates/mpos/admin/wallet/default.tpl index 24069853..7662d68f 100644 --- a/public/templates/mpos/admin/wallet/default.tpl +++ b/public/templates/mpos/admin/wallet/default.tpl @@ -20,7 +20,7 @@ {if $NEWMINT >= 0} Liquid Assets - {($BALANCE - $LOCKED - $UNCONFIRMED + $NEWMMINT)|number_format:"8"} + {($BALANCE - $LOCKED - $UNCONFIRMED + $NEWMINT)|number_format:"8"} PoS New Mint From 20374a1eac2b13bafdf74a02a44b1cdde0b026fc Mon Sep 17 00:00:00 2001 From: iAmShorty Date: Wed, 26 Feb 2014 09:35:50 +0100 Subject: [PATCH 4/4] [UPDATE] changed template --- public/templates/mpos/admin/wallet/default.tpl | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/public/templates/mpos/admin/wallet/default.tpl b/public/templates/mpos/admin/wallet/default.tpl index 7662d68f..033336e8 100644 --- a/public/templates/mpos/admin/wallet/default.tpl +++ b/public/templates/mpos/admin/wallet/default.tpl @@ -17,20 +17,15 @@ Unconfirmed {$UNCONFIRMED|number_format:"8"} -{if $NEWMINT >= 0} Liquid Assets - {($BALANCE - $LOCKED - $UNCONFIRMED + $NEWMINT)|number_format:"8"} + {($BALANCE - $LOCKED - $UNCONFIRMED + $NEWMINT|default:"0")|number_format:"8"} +{if $NEWMINT >= 0} PoS New Mint {$NEWMINT|number_format:"8"} -{else} - - Liquid Assets - {($BALANCE - $LOCKED - $UNCONFIRMED)|number_format:"8"} - {/if}