diff --git a/web/yaamp/modules/site/earning.php b/web/yaamp/modules/site/earning.php index 3b7069d..4952013 100644 --- a/web/yaamp/modules/site/earning.php +++ b/web/yaamp/modules/site/earning.php @@ -6,21 +6,15 @@ if ($coin_id) { $coin = getdbo('db_coins', $coin_id); $this->pageTitle = 'Earnings - '.$coin->symbol; } + +JavascriptFile("/yaamp/ui/js/jquery.metadata.js"); +JavascriptFile("/yaamp/ui/js/jquery.tablesorter.widgets.js"); + ?>
-









-









-









-









- - + end; @@ -48,14 +48,14 @@ echo <<Block Status Sent - +Actions end; $coin_id = getiparam('id'); $sqlFilter = $coin_id ? "AND coinid={$coin_id}": ''; -$limit = $coin_id ? '' : 'LIMIT 1000'; +$limit = $coin_id ? '' : 'LIMIT 1500'; $earnings = getdbolist('db_earnings', "status!=2 $sqlFilter ORDER BY create_time DESC $limit"); @@ -90,10 +90,10 @@ foreach($earnings as $earning) echo ''."$block->category ($block->confirmations)"; echo ''."$t1 $t2"; - echo " - [clear] - [delete] - "; + echo ''; + echo 'clear '; + echo 'delete'; + echo ''; // echo "$earning->tx"; echo ""; @@ -119,7 +119,12 @@ foreach($earnings as $earning) } } -echo ""; +echo ''; +echo ''; +echo count($earnings).' records'; +if (count($earnings) >= 1000) echo " ($limit)"; +echo ''; +echo ''; if ($coin_id) { $coin = getdbo('db_coins', $coin_id); @@ -128,15 +133,26 @@ if ($coin_id) { $feepct = yaamp_fee($coin->algo); $totalfees = ($total / ((100 - $feepct) / 100.)) - $total; + $cleared = dboscalar("SELECT SUM(balance) FROM accounts WHERE coinid={$coin->id}"); + echo '
'; + echo ''; echo '"; - echo '"; + echo '"; //echo '"; echo '"; if ($coin->rpcencoding == 'POS') echo '"; - echo '"; echo '
Immature'.bitcoinvaluetoa($totalimmat)." $symbol
Total'.bitcoinvaluetoa($total)." $symbol
Total owed'.bitcoinvaluetoa($total)." $symbol
Total BTC'.bitcoinvaluetoa($total_btc)." BTC
Pool Fees '.round($feepct,1).'%'.bitcoinvaluetoa($totalfees)." $symbol
Stake'.bitcoinvaluetoa($totalstake)." $symbol
Available'.bitcoinvaluetoa($coin->balance)." $symbol
'; + + echo ''; + echo '"; + echo '"; + $exchange = $total - $totalimmat; + echo ''; + echo '"; + echo '
Balance'.bitcoinvaluetoa($coin->balance)." $symbol
Cleared'.bitcoinvaluetoa($cleared)." $symbol
Available'.bitcoinvaluetoa($coin->balance - $exchange - $cleared)." $symbol
'; + echo '
'; } \ No newline at end of file diff --git a/web/yaamp/modules/site/payments.php b/web/yaamp/modules/site/payments.php index deb2797..2a146a4 100644 --- a/web/yaamp/modules/site/payments.php +++ b/web/yaamp/modules/site/payments.php @@ -6,21 +6,15 @@ if ($coin_id) { $coin = getdbo('db_coins', $coin_id); $this->pageTitle = 'Payments - '.$coin->symbol; } + +JavascriptFile("/yaamp/ui/js/jquery.metadata.js"); +JavascriptFile("/yaamp/ui/js/jquery.tablesorter.widgets.js"); + ?>
-









-









-









-









- - + @@ -11,11 +8,12 @@ echo << end; @@ -25,16 +23,8 @@ $saveSort = $coin_id ? 'false' : 'true'; showTableSorter('maintable', "{ tableClass: 'dataGrid', - headers: { - 0:{sorter:'metadata'}, - 1:{sorter:'text'}, - 2:{sorter:'text'}, - 3:{sorter:'text'}, - 4:{sorter:'currency'}, - 5:{sorter:'currency'}, - 6:{sorter:'currency'}, - 7:{sorter:'currency'}, - 8:{sorter:false} + textExtraction: { + 3: function(node, table, n) { return $(node).attr('data'); } }, widgets: ['zebra','filter','Storage','saveSort'], widgetOptions: { @@ -50,20 +40,21 @@ showTableSorter('maintable', "{ echo << - -Coin -Address -Last block -Pool -Balance -Immature -Failed -Actions + +Coin +Address +Last block +Pool +Balance +Immature +Failed +Actions end; $sqlFilter = $coin_id ? "AND coinid={$coin_id}" : ""; +$limit = $coin_id ? '' : 'LIMIT 100'; $data = dbolist("SELECT coinid, userid, SUM(amount) AS immature FROM earnings WHERE status=0 $sqlFilter GROUP BY coinid, userid"); $immature = array(); @@ -81,7 +72,7 @@ if (!empty($data)) foreach ($data as $row) { $list = getdbolist('db_accounts', "coinid!=6 $sqlFilter AND (". "balance > 0 OR last_earning > (UNIX_TIMESTAMP()-60*60) OR id IN (SELECT DISTINCT account_id FROM payouts WHERE tx IS NULL)". - ") ORDER BY last_earning DESC limit 50"); + ") ORDER BY last_earning DESC $limit"); $total = 0.; $totalimmat = 0.; $totalfailed = 0.; foreach($list as $user) @@ -92,7 +83,7 @@ foreach($list as $user) echo ''; if($coin) { - $coinbalance = $coin->balance ? bitcoinvaluetoa($coin->balance) : '-'; + $coinbalance = $coin->balance ? bitcoinvaluetoa($coin->balance) : ''; echo ''; echo ''.$coin->name.' ('.$coin->symbol_show.')'; $immkey = "{$coin->id}-{$user->id}"; @@ -108,18 +99,18 @@ foreach($list as $user) echo ''.$coinbalance.''; - $balance = $user->balance ? bitcoinvaluetoa($user->balance) : '-'; + $balance = $user->balance ? bitcoinvaluetoa($user->balance) : ''; $total += (double) $user->balance; echo ''.$balance.''; $immbalance = arraySafeVal($immature, $immkey, 0); $totalimmat += (double) $immbalance; - $immbalance = $immbalance ? bitcoinvaluetoa($immbalance) : '-'; + $immbalance = $immbalance ? bitcoinvaluetoa($immbalance) : ''; echo ''.$immbalance.''; $failbalance = arraySafeVal($failed, $user->id, 0); $totalfailed += (double) $failbalance; - $failbalance = $failbalance ? bitcoinvaluetoa($failbalance) : '-'; + $failbalance = $failbalance ? bitcoinvaluetoa($failbalance) : ''; echo ''.$failbalance.''; echo ''; @@ -130,7 +121,12 @@ foreach($list as $user) echo ""; } -echo ""; +echo ''; +echo ''; +echo count($list).' users'; +if (count($list) == 100) echo " ($limit)"; +echo ''; +echo ''; if ($coin_id) { $coin = getdbo('db_coins', $coin_id);