kevinowino869/mitrobill
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: add fullname field to transaction reports, pdf export and update language file

Browse Source
This commit is contained in:
Focuslinkstech 2025-03-22 18:34:51 +01:00
parent 11e5ebe103
commit 43a92c5d3b
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
system/controllers/export.php
View File

@ -114,7 +114,10 @@ switch ($action) {
$query = ORM::for_table('tbl_transactions') $query = ORM::for_table('tbl_transactions')
->whereRaw("UNIX_TIMESTAMP(CONCAT(`recharged_on`,' ',`recharged_time`)) >= " . strtotime("$sd $ts")) ->whereRaw("UNIX_TIMESTAMP(CONCAT(`recharged_on`,' ',`recharged_time`)) >= " . strtotime("$sd $ts"))
->whereRaw("UNIX_TIMESTAMP(CONCAT(`recharged_on`,' ',`recharged_time`)) <= " . strtotime("$ed $te")) ->whereRaw("UNIX_TIMESTAMP(CONCAT(`recharged_on`,' ',`recharged_time`)) <= " . strtotime("$ed $te"))
->order_by_desc('id'); ->left_outer_join('tbl_customers', 'tbl_transactions.username = tbl_customers.username')
->select('tbl_transactions.*')
->select('tbl_customers.fullname', 'fullname')
->order_by_desc('tbl_transactions.id');
if (count($tps) > 0) { if (count($tps) > 0) {
$query->where_in('type', $tps); $query->where_in('type', $tps);
} }
@ -158,6 +161,7 @@ switch ($action) {
<table id="customers"> <table id="customers">
<tr> <tr>
<th>' . Lang::T('Username') . '</th> <th>' . Lang::T('Username') . '</th>
<th>' . Lang::T('Fullname') . '</th>
<th>' . Lang::T('Plan Name') . '</th> <th>' . Lang::T('Plan Name') . '</th>
<th>' . Lang::T('Type') . '</th> <th>' . Lang::T('Type') . '</th>
<th>' . Lang::T('Plan Price') . '</th> <th>' . Lang::T('Plan Price') . '</th>
@ -170,6 +174,7 @@ switch ($action) {
foreach ($x as $value) { foreach ($x as $value) {
$username = $value['username']; $username = $value['username'];
$fullname = $value['fullname'];
$plan_name = $value['plan_name']; $plan_name = $value['plan_name'];
$type = $value['type']; $type = $value['type'];
$price = $config['currency_code'] . ' ' . number_format($value['price'], 0, $config['dec_point'], $config['thousands_sep']); $price = $config['currency_code'] . ' ' . number_format($value['price'], 0, $config['dec_point'], $config['thousands_sep']);
@ -181,6 +186,7 @@ switch ($action) {
$html .= "<tr" . (($c = !$c) ? ' class="alt"' : ' class=""') . ">" . " $html .= "<tr" . (($c = !$c) ? ' class="alt"' : ' class=""') . ">" . "
<td>$username</td> <td>$username</td>
<td>$fullname</td>
<td>$plan_name</td> <td>$plan_name</td>
<td>$type</td> <td>$type</td>
<td align='right'>$price</td> <td align='right'>$price</td>

5
system/controllers/reports.php
View File

@ -359,7 +359,10 @@ switch ($action) {
$query = ORM::for_table('tbl_transactions') $query = ORM::for_table('tbl_transactions')
->whereRaw("UNIX_TIMESTAMP(CONCAT(`recharged_on`,' ',`recharged_time`)) >= " . strtotime("$sd $ts")) ->whereRaw("UNIX_TIMESTAMP(CONCAT(`recharged_on`,' ',`recharged_time`)) >= " . strtotime("$sd $ts"))
->whereRaw("UNIX_TIMESTAMP(CONCAT(`recharged_on`,' ',`recharged_time`)) <= " . strtotime("$ed $te")) ->whereRaw("UNIX_TIMESTAMP(CONCAT(`recharged_on`,' ',`recharged_time`)) <= " . strtotime("$ed $te"))
->order_by_desc('id'); ->left_outer_join('tbl_customers', 'tbl_transactions.username = tbl_customers.username')
->select('tbl_transactions.*')
->select('tbl_customers.fullname', 'fullname')
->order_by_desc('tbl_transactions.id');
if (count($tps) > 0) { if (count($tps) > 0) {
$query->where_in('type', $tps); $query->where_in('type', $tps);
} }

7
ui/ui/admin/reports/list.tpl
View File

@ -94,10 +94,11 @@
<a href="{Text::url('export/pdf-by-date&')}{$filter}" class="btn btn-default"><i <a href="{Text::url('export/pdf-by-date&')}{$filter}" class="btn btn-default"><i
class="fa fa-file-pdf-o"></i></a> class="fa fa-file-pdf-o"></i></a>
</th> </th>
<th colspan="7"></th> <th colspan="8"></th>
</tr> </tr>
<tr> <tr>
<th>{Lang::T('Username')}</th> <th>{Lang::T('Username')}</th>
<th>{Lang::T('Fullname')}</th>
<th>{Lang::T('Type')}</th> <th>{Lang::T('Type')}</th>
<th>{Lang::T('Plan Name')}</th> <th>{Lang::T('Plan Name')}</th>
<th>{Lang::T('Plan Price')}</th> <th>{Lang::T('Plan Price')}</th>
@ -111,6 +112,7 @@
{foreach $d as $ds} {foreach $d as $ds}
<tr> <tr>
<td>{$ds['username']}</td> <td>{$ds['username']}</td>
<td>{$ds['fullname']}</td>
<td>{$ds['type']}</td> <td>{$ds['type']}</td>
<td>{$ds['plan_name']}</td> <td>{$ds['plan_name']}</td>
<td class="text-right">{Lang::moneyFormat($ds['price'])}</td> <td class="text-right">{Lang::moneyFormat($ds['price'])}</td>
@ -122,9 +124,8 @@
{/foreach} {/foreach}
<tr> <tr>
<th>{Lang::T('Total')}</th> <th>{Lang::T('Total')}</th>
<td colspan="2"></td>
<th class="text-right">{Lang::moneyFormat($dr)}</th> <th class="text-right">{Lang::moneyFormat($dr)}</th>
<td colspan="4"></td> <td colspan="7"></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>