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

[ADDED] Bonus to earnings page

Browse Source
This commit is contained in:
Sebastian Grewe 2014-03-28 15:25:35 +01:00
parent 3089d0729f
commit ed517ed74c
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/include/classes/transaction.class.php
View File

@ -112,6 +112,7 @@ class Transaction extends Base {
$stmt = $this->mysqli->prepare(" $stmt = $this->mysqli->prepare("
SELECT SELECT
IFNULL(SUM(IF(t.type = 'Credit' AND timestamp >= DATE_SUB(now(), INTERVAL 3600 SECOND), t.amount, 0)), 0) AS 1HourCredit, IFNULL(SUM(IF(t.type = 'Credit' AND timestamp >= DATE_SUB(now(), INTERVAL 3600 SECOND), t.amount, 0)), 0) AS 1HourCredit,
IFNULL(SUM(IF(t.type = 'Bonus' AND timestamp >= DATE_SUB(now(), INTERVAL 3600 SECOND), t.amount, 0)), 0) AS 1HourBonus,
IFNULL(SUM(IF(t.type = 'Debit_MP' AND timestamp >= DATE_SUB(now(), INTERVAL 3600 SECOND), t.amount, 0)), 0) AS 1HourDebitMP, IFNULL(SUM(IF(t.type = 'Debit_MP' AND timestamp >= DATE_SUB(now(), INTERVAL 3600 SECOND), t.amount, 0)), 0) AS 1HourDebitMP,
IFNULL(SUM(IF(t.type = 'Debit_AP' AND timestamp >= DATE_SUB(now(), INTERVAL 3600 SECOND), t.amount, 0)), 0) AS 1HourDebitAP, IFNULL(SUM(IF(t.type = 'Debit_AP' AND timestamp >= DATE_SUB(now(), INTERVAL 3600 SECOND), t.amount, 0)), 0) AS 1HourDebitAP,
IFNULL(SUM(IF(t.type = 'TXFee' AND timestamp >= DATE_SUB(now(), INTERVAL 3600 SECOND), t.amount, 0)), 0) AS 1HourTXFee, IFNULL(SUM(IF(t.type = 'TXFee' AND timestamp >= DATE_SUB(now(), INTERVAL 3600 SECOND), t.amount, 0)), 0) AS 1HourTXFee,
@ -119,6 +120,7 @@ class Transaction extends Base {
IFNULL(SUM(IF(t.type = 'Donation' AND timestamp >= DATE_SUB(now(), INTERVAL 3600 SECOND), t.amount, 0)), 0) AS 1HourDonation, IFNULL(SUM(IF(t.type = 'Donation' AND timestamp >= DATE_SUB(now(), INTERVAL 3600 SECOND), t.amount, 0)), 0) AS 1HourDonation,
IFNULL(SUM(IF(t.type = 'Credit' AND timestamp >= DATE_SUB(now(), INTERVAL 86400 SECOND), t.amount, 0)), 0) AS 24HourCredit, IFNULL(SUM(IF(t.type = 'Credit' AND timestamp >= DATE_SUB(now(), INTERVAL 86400 SECOND), t.amount, 0)), 0) AS 24HourCredit,
IFNULL(SUM(IF(t.type = 'Bonus' AND timestamp >= DATE_SUB(now(), INTERVAL 86400 SECOND), t.amount, 0)), 0) AS 24HourBonus,
IFNULL(SUM(IF(t.type = 'Debit_MP' AND timestamp >= DATE_SUB(now(), INTERVAL 86400 SECOND), t.amount, 0)), 0) AS 24HourDebitMP, IFNULL(SUM(IF(t.type = 'Debit_MP' AND timestamp >= DATE_SUB(now(), INTERVAL 86400 SECOND), t.amount, 0)), 0) AS 24HourDebitMP,
IFNULL(SUM(IF(t.type = 'Debit_AP' AND timestamp >= DATE_SUB(now(), INTERVAL 86400 SECOND), t.amount, 0)), 0) AS 24HourDebitAP, IFNULL(SUM(IF(t.type = 'Debit_AP' AND timestamp >= DATE_SUB(now(), INTERVAL 86400 SECOND), t.amount, 0)), 0) AS 24HourDebitAP,
IFNULL(SUM(IF(t.type = 'TXFee' AND timestamp >= DATE_SUB(now(), INTERVAL 86400 SECOND), t.amount, 0)), 0) AS 24HourTXFee, IFNULL(SUM(IF(t.type = 'TXFee' AND timestamp >= DATE_SUB(now(), INTERVAL 86400 SECOND), t.amount, 0)), 0) AS 24HourTXFee,
@ -126,6 +128,7 @@ class Transaction extends Base {
IFNULL(SUM(IF(t.type = 'Donation' AND timestamp >= DATE_SUB(now(), INTERVAL 86400 SECOND), t.amount, 0)), 0) AS 24HourDonation, IFNULL(SUM(IF(t.type = 'Donation' AND timestamp >= DATE_SUB(now(), INTERVAL 86400 SECOND), t.amount, 0)), 0) AS 24HourDonation,
IFNULL(SUM(IF(t.type = 'Credit' AND timestamp >= DATE_SUB(now(), INTERVAL 604800 SECOND), t.amount, 0)), 0) AS 1WeekCredit, IFNULL(SUM(IF(t.type = 'Credit' AND timestamp >= DATE_SUB(now(), INTERVAL 604800 SECOND), t.amount, 0)), 0) AS 1WeekCredit,
IFNULL(SUM(IF(t.type = 'Bonus' AND timestamp >= DATE_SUB(now(), INTERVAL 604800 SECOND), t.amount, 0)), 0) AS 1WeekBonus,
IFNULL(SUM(IF(t.type = 'Debit_MP' AND timestamp >= DATE_SUB(now(), INTERVAL 604800 SECOND), t.amount, 0)), 0) AS 1WeekDebitMP, IFNULL(SUM(IF(t.type = 'Debit_MP' AND timestamp >= DATE_SUB(now(), INTERVAL 604800 SECOND), t.amount, 0)), 0) AS 1WeekDebitMP,
IFNULL(SUM(IF(t.type = 'Debit_AP' AND timestamp >= DATE_SUB(now(), INTERVAL 604800 SECOND), t.amount, 0)), 0) AS 1WeekDebitAP, IFNULL(SUM(IF(t.type = 'Debit_AP' AND timestamp >= DATE_SUB(now(), INTERVAL 604800 SECOND), t.amount, 0)), 0) AS 1WeekDebitAP,
IFNULL(SUM(IF(t.type = 'TXFee' AND timestamp >= DATE_SUB(now(), INTERVAL 604800 SECOND), t.amount, 0)), 0) AS 1WeekTXFee, IFNULL(SUM(IF(t.type = 'TXFee' AND timestamp >= DATE_SUB(now(), INTERVAL 604800 SECOND), t.amount, 0)), 0) AS 1WeekTXFee,
@ -133,6 +136,7 @@ class Transaction extends Base {
IFNULL(SUM(IF(t.type = 'Donation' AND timestamp >= DATE_SUB(now(), INTERVAL 604800 SECOND), t.amount, 0)), 0) AS 1WeekDonation, IFNULL(SUM(IF(t.type = 'Donation' AND timestamp >= DATE_SUB(now(), INTERVAL 604800 SECOND), t.amount, 0)), 0) AS 1WeekDonation,
IFNULL(SUM(IF(t.type = 'Credit' AND timestamp >= DATE_SUB(now(), INTERVAL 2419200 SECOND), t.amount, 0)), 0) AS 1MonthCredit, IFNULL(SUM(IF(t.type = 'Credit' AND timestamp >= DATE_SUB(now(), INTERVAL 2419200 SECOND), t.amount, 0)), 0) AS 1MonthCredit,
IFNULL(SUM(IF(t.type = 'Bonus' AND timestamp >= DATE_SUB(now(), INTERVAL 2419200 SECOND), t.amount, 0)), 0) AS 1MonthBonus,
IFNULL(SUM(IF(t.type = 'Debit_MP' AND timestamp >= DATE_SUB(now(), INTERVAL 2419200 SECOND), t.amount, 0)), 0) AS 1MonthDebitMP, IFNULL(SUM(IF(t.type = 'Debit_MP' AND timestamp >= DATE_SUB(now(), INTERVAL 2419200 SECOND), t.amount, 0)), 0) AS 1MonthDebitMP,
IFNULL(SUM(IF(t.type = 'Debit_AP' AND timestamp >= DATE_SUB(now(), INTERVAL 2419200 SECOND), t.amount, 0)), 0) AS 1MonthDebitAP, IFNULL(SUM(IF(t.type = 'Debit_AP' AND timestamp >= DATE_SUB(now(), INTERVAL 2419200 SECOND), t.amount, 0)), 0) AS 1MonthDebitAP,
IFNULL(SUM(IF(t.type = 'TXFee' AND timestamp >= DATE_SUB(now(), INTERVAL 2419200 SECOND), t.amount, 0)), 0) AS 1MonthTXFee, IFNULL(SUM(IF(t.type = 'TXFee' AND timestamp >= DATE_SUB(now(), INTERVAL 2419200 SECOND), t.amount, 0)), 0) AS 1MonthTXFee,
@ -140,6 +144,7 @@ class Transaction extends Base {
IFNULL(SUM(IF(t.type = 'Donation' AND timestamp >= DATE_SUB(now(), INTERVAL 2419200 SECOND), t.amount, 0)), 0) AS 1MonthDonation, IFNULL(SUM(IF(t.type = 'Donation' AND timestamp >= DATE_SUB(now(), INTERVAL 2419200 SECOND), t.amount, 0)), 0) AS 1MonthDonation,
IFNULL(SUM(IF(t.type = 'Credit' AND timestamp >= DATE_SUB(now(), INTERVAL 31536000 SECOND), t.amount, 0)), 0) AS 1YearCredit, IFNULL(SUM(IF(t.type = 'Credit' AND timestamp >= DATE_SUB(now(), INTERVAL 31536000 SECOND), t.amount, 0)), 0) AS 1YearCredit,
IFNULL(SUM(IF(t.type = 'Bonus' AND timestamp >= DATE_SUB(now(), INTERVAL 31536000 SECOND), t.amount, 0)), 0) AS 1YearBonus,
IFNULL(SUM(IF(t.type = 'Debit_MP' AND timestamp >= DATE_SUB(now(), INTERVAL 31536000 SECOND), t.amount, 0)), 0) AS 1YearDebitMP, IFNULL(SUM(IF(t.type = 'Debit_MP' AND timestamp >= DATE_SUB(now(), INTERVAL 31536000 SECOND), t.amount, 0)), 0) AS 1YearDebitMP,
IFNULL(SUM(IF(t.type = 'Debit_AP' AND timestamp >= DATE_SUB(now(), INTERVAL 31536000 SECOND), t.amount, 0)), 0) AS 1YearDebitAP, IFNULL(SUM(IF(t.type = 'Debit_AP' AND timestamp >= DATE_SUB(now(), INTERVAL 31536000 SECOND), t.amount, 0)), 0) AS 1YearDebitAP,
IFNULL(SUM(IF(t.type = 'TXFee' AND timestamp >= DATE_SUB(now(), INTERVAL 31536000 SECOND), t.amount, 0)), 0) AS 1YearTXFee, IFNULL(SUM(IF(t.type = 'TXFee' AND timestamp >= DATE_SUB(now(), INTERVAL 31536000 SECOND), t.amount, 0)), 0) AS 1YearTXFee,

6
public/templates/bootstrap/account/earnings/default.tpl
View File

@ -46,6 +46,7 @@
<tr> <tr>
<th></th> <th></th>
<th>Credit</th> <th>Credit</th>
<th>Bonus</th>
<th>Debit AP</th> <th>Debit AP</th>
<th>Debit MP</th> <th>Debit MP</th>
<th>Donation</th> <th>Donation</th>
@ -59,6 +60,7 @@
<tr> <tr>
<td>Last Hour</th> <td>Last Hour</th>
<td>{$BYTIME.1HourCredit|number_format:"8"}</td> <td>{$BYTIME.1HourCredit|number_format:"8"}</td>
<td>{$BYTIME.1HourBonus|number_format:"8"}</td>
<td>{$BYTIME.1HourDebitAP|number_format:"8"}</td> <td>{$BYTIME.1HourDebitAP|number_format:"8"}</td>
<td>{$BYTIME.1HourDebitMP|number_format:"8"}</td> <td>{$BYTIME.1HourDebitMP|number_format:"8"}</td>
<td>{$BYTIME.1HourDonation|number_format:"8"}</td> <td>{$BYTIME.1HourDonation|number_format:"8"}</td>
@ -70,6 +72,7 @@
<tr> <tr>
<td>Last Day</th> <td>Last Day</th>
<td>{$BYTIME.24HourCredit|number_format:"8"}</td> <td>{$BYTIME.24HourCredit|number_format:"8"}</td>
<td>{$BYTIME.24HourBonus|number_format:"8"}</td>
<td>{$BYTIME.24HourDebitAP|number_format:"8"}</td> <td>{$BYTIME.24HourDebitAP|number_format:"8"}</td>
<td>{$BYTIME.24HourDebitMP|number_format:"8"}</td> <td>{$BYTIME.24HourDebitMP|number_format:"8"}</td>
<td>{$BYTIME.24HourDonation|number_format:"8"}</td> <td>{$BYTIME.24HourDonation|number_format:"8"}</td>
@ -81,6 +84,7 @@
<tr> <tr>
<td>Last Week</th> <td>Last Week</th>
<td>{$BYTIME.1WeekCredit|number_format:"8"}</td> <td>{$BYTIME.1WeekCredit|number_format:"8"}</td>
<td>{$BYTIME.1WeekBonus|number_format:"8"}</td>
<td>{$BYTIME.1WeekDebitAP|number_format:"8"}</td> <td>{$BYTIME.1WeekDebitAP|number_format:"8"}</td>
<td>{$BYTIME.1WeekDebitMP|number_format:"8"}</td> <td>{$BYTIME.1WeekDebitMP|number_format:"8"}</td>
<td>{$BYTIME.1WeekDonation|number_format:"8"}</td> <td>{$BYTIME.1WeekDonation|number_format:"8"}</td>
@ -92,6 +96,7 @@
<tr> <tr>
<td>Last Month</th> <td>Last Month</th>
<td>{$BYTIME.1MonthCredit|number_format:"8"}</td> <td>{$BYTIME.1MonthCredit|number_format:"8"}</td>
<td>{$BYTIME.1MonthBonus|number_format:"8"}</td>
<td>{$BYTIME.1MonthDebitAP|number_format:"8"}</td> <td>{$BYTIME.1MonthDebitAP|number_format:"8"}</td>
<td>{$BYTIME.1MonthDebitMP|number_format:"8"}</td> <td>{$BYTIME.1MonthDebitMP|number_format:"8"}</td>
<td>{$BYTIME.1MonthDonation|number_format:"8"}</td> <td>{$BYTIME.1MonthDonation|number_format:"8"}</td>
@ -103,6 +108,7 @@
<tr> <tr>
<td>Last Year</th> <td>Last Year</th>
<td>{$BYTIME.1YearCredit|number_format:"8"}</td> <td>{$BYTIME.1YearCredit|number_format:"8"}</td>
<td>{$BYTIME.1YearBonus|number_format:"8"}</td>
<td>{$BYTIME.1YearDebitAP|number_format:"8"}</td> <td>{$BYTIME.1YearDebitAP|number_format:"8"}</td>
<td>{$BYTIME.1YearDebitMP|number_format:"8"}</td> <td>{$BYTIME.1YearDebitMP|number_format:"8"}</td>
<td>{$BYTIME.1YearDonation|number_format:"8"}</td> <td>{$BYTIME.1YearDonation|number_format:"8"}</td>