diff --git a/cronjobs/pps_payout.php b/cronjobs/pps_payout.php index 848b9d5c..8040c0f5 100755 --- a/cronjobs/pps_payout.php +++ b/cronjobs/pps_payout.php @@ -89,13 +89,14 @@ foreach ($aAllBlocks as $iIndex => $aBlock) { // Add new credit transaction if (!$transaction->addTransaction($aData['id'], $aData['payout'], 'Credit', $aBlock['id'])) $strStatus = "Transaction Failed"; + // Add new fee debit for this block + if ($aData['fee'] > 0 && $config['fees'] > 0) + if (!$transaction->addTransaction($aData['id'], $aData['fee'], 'Fee', $aBlock['id'])) + $strStatus = "Fee Failed"; // Add new donation debit if ($aData['donation'] > 0) if (!$transaction->addTransaction($aData['id'], $aData['donation'], 'Donation', $aBlock['id'])) $strStatus = "Donation Failed"; - if ($aData['fee'] > 0 && $config['fees'] > 0) - if (!$transaction->addTransaction($aData['id'], $aData['fee'], 'Fee', $aBlock['id'])) - $strStatus = "Fee Failed"; verbose("\t$strStatus\n"); } verbose("------------------------------------------------------------------------\n\n"); diff --git a/public/include/smarty_globals.inc.php b/public/include/smarty_globals.inc.php index 4d55829e..e17f82be 100644 --- a/public/include/smarty_globals.inc.php +++ b/public/include/smarty_globals.inc.php @@ -35,8 +35,8 @@ $aGlobal['userdata']['hashrate'] = $statistics->getUserHashrate($_SESSION['USERD // Some estimations $aGlobal['userdata']['est_block'] = round(( (int)$aGlobal['userdata']['shares']['valid'] / (int)$aRoundShares['valid'] ) * (int)$config['reward'], 3); -$aGlobal['userdata']['est_donation'] = round((( $aGlobal['userdata']['donate_percent'] / 100) * $aGlobal['userdata']['est_block']), 3); -$aGlobal['userdata']['est_fee'] = round((($config['fees'] / 100) * ($aGlobal['userdata']['est_block'] - $aGlobal['userdata']['est_donation'])), 3); +$aGlobal['userdata']['est_fee'] = round(($config['fees'] / 100) * $aGlobal['userdata']['est_block'], 3); +$aGlobal['userdata']['est_donation'] = round((( $aGlobal['userdata']['donate_percent'] / 100) * ($aGlobal['userdata']['est_block'] - $aGlobal['userdata']['est_fee'])), 3); $aGlobal['userdata']['est_payout'] = round($aGlobal['userdata']['est_block'] - $aGlobal['userdata']['est_donation'] - $aGlobal['userdata']['est_fee'], 3); // Make it available in Smarty diff --git a/public/templates/mmcFE/global/sidebar.tpl b/public/templates/mmcFE/global/sidebar.tpl index 3845d42d..b19710a2 100644 --- a/public/templates/mmcFE/global/sidebar.tpl +++ b/public/templates/mmcFE/global/sidebar.tpl @@ -41,14 +41,14 @@ Block {$GLOBAL.userdata.est_block} LTC - - Donation - {$GLOBAL.userdata.est_donation} LTC - Fees {$GLOBAL.userdata.est_fee} LTC + + Donation + {$GLOBAL.userdata.est_donation} LTC + Payout {$GLOBAL.userdata.est_payout} LTC