From c6b060dbd515d92e8d550cd686338c6e15951dd4 Mon Sep 17 00:00:00 2001
From: iAmShorty <rafta@gmx.net>
Date: Mon, 24 Feb 2014 20:31:53 +0100
Subject: [PATCH] [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 @@
       <td align="left">Unconfirmed</td>
       <td align="left">{$UNCONFIRMED|number_format:"8"}</td>
     </tr>
+{if $NEWMINT >= 0}
     <tr>
       <td align="left">Liquid Assets</td>
-      <td align="left">{($BALANCE - $LOCKED - $UNCONFIRMED)|number_format:"8"}</td>
+      <td align="left">{($BALANCE - $LOCKED - $UNCONFIRMED + $NEWMMINT)|number_format:"8"}</td>
     </tr>
-{if $NEWMINT >= 0}
     <tr>
       <td align="left">PoS New Mint</td>
       <td align="left">{$NEWMINT|number_format:"8"}</td>
     </tr>
+{else}
+    <tr>
+      <td align="left">Liquid Assets</td>
+      <td align="left">{($BALANCE - $LOCKED - $UNCONFIRMED)|number_format:"8"}</td>
+    </tr>
 {/if}
   </table>
   </article>
@@ -92,4 +97,3 @@
 {/foreach}
 </article>
 {/if}
-