RanchiMall/php-mpos
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix display of fee amount, based on est. block payout

Browse Source
This commit is contained in:
Sebastian Grewe 2013-05-21 22:17:36 +02:00
parent bfff517bc5
commit 2c890d2bd5
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cronjobs/pps_payout.php
View File

@ -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");

4
public/include/smarty_globals.inc.php
View File

@ -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

8
public/templates/mmcFE/global/sidebar.tpl
View File

@ -41,14 +41,14 @@
<td><b>Block</b></td>
<td>{$GLOBAL.userdata.est_block} LTC</td>
</tr>
<tr>
<td><b>Donation</b></td>
<td>{$GLOBAL.userdata.est_donation} LTC</td>
</tr>
<tr>
<td><b>Fees</b></td>
<td>{$GLOBAL.userdata.est_fee} LTC</td>
</tr>
<tr>
<td><b>Donation</b></td>
<td>{$GLOBAL.userdata.est_donation} LTC</td>
</tr>
<tr>
<td><b>Payout</b></td>
<td>{$GLOBAL.userdata.est_payout} LTC</td>