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

feat: add fullname field to activation report and update language file

Browse Source
This commit is contained in:
Focuslinkstech 2025-03-22 16:15:16 +01:00
parent dc28298d53
commit 7bfbdb1efb
2 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
system/controllers/reports.php
View File

@ -58,7 +58,7 @@ switch ($action) {
$w = []; $w = [];
$v = []; $v = [];
foreach ($mts as $mt) { foreach ($mts as $mt) {
$w[] ='method'; $w[] = 'method';
$v[] = "$mt - %"; $v[] = "$mt - %";
} }
$query->where_likes($w, $v); $query->where_likes($w, $v);
@ -91,7 +91,7 @@ switch ($action) {
$w = []; $w = [];
$v = []; $v = [];
foreach ($mts as $mt) { foreach ($mts as $mt) {
$w[] ='method'; $w[] = 'method';
$v[] = "$mt - %"; $v[] = "$mt - %";
} }
$query->where_likes($w, $v); $query->where_likes($w, $v);
@ -161,7 +161,7 @@ switch ($action) {
$w = []; $w = [];
$v = []; $v = [];
foreach ($mts as $mt) { foreach ($mts as $mt) {
$w[] ='method'; $w[] = 'method';
$v[] = "$mt - %"; $v[] = "$mt - %";
} }
$query->where_likes($w, $v); $query->where_likes($w, $v);
@ -246,7 +246,7 @@ switch ($action) {
$total += $v; $total += $v;
$array['data'][] = $v; $array['data'][] = $v;
} }
if($total>0){ if ($total > 0) {
$result['datas'][] = $array; $result['datas'][] = $array;
} }
} }
@ -258,18 +258,29 @@ switch ($action) {
die(); die();
case 'by-date': case 'by-date':
case 'activation': case 'activation':
$q = (_post('q') ? _post('q') : _get('q')); $q = trim(_post('q') ?: _get('q'));
$keep = _post('keep'); $keep = _post('keep');
if (!empty($keep)) { if (!empty($keep)) {
ORM::raw_execute("DELETE FROM tbl_transactions WHERE date < UNIX_TIMESTAMP(DATE_SUB(NOW(), INTERVAL $keep DAY))"); ORM::raw_execute("DELETE FROM tbl_transactions WHERE date < UNIX_TIMESTAMP(DATE_SUB(NOW(), INTERVAL ? DAY))", [$keep]);
r2(getUrl('logs/list/'), 's', "Delete logs older than $keep days"); r2(getUrl('reports/activation/'), 's', "Deleted logs older than $keep days");
} }
if ($q != '') {
$query = ORM::for_table('tbl_transactions')->where_like('invoice', '%' . $q . '%')->order_by_desc('id'); $query = ORM::for_table('tbl_transactions')
->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 ($q !== '') {
$query->where_like('invoice', "%$q%");
}
try {
$d = Paginator::findMany($query, ['q' => $q]); $d = Paginator::findMany($query, ['q' => $q]);
} else { } catch (Exception $e) {
$query = ORM::for_table('tbl_transactions')->order_by_desc('id'); r2(getUrl('reports/activation/'), 'e','Database query failed: ' . $e->getMessage());
$d = Paginator::findMany($query); $d = [];
} }
$ui->assign('activation', $d); $ui->assign('activation', $d);
@ -298,7 +309,7 @@ switch ($action) {
$d->where_gte('recharged_on', $fdate); $d->where_gte('recharged_on', $fdate);
$d->where_lte('recharged_on', $tdate); $d->where_lte('recharged_on', $tdate);
$d->order_by_desc('id'); $d->order_by_desc('id');
$x = $d->find_many(); $x = $d->find_many();
$dr = ORM::for_table('tbl_transactions'); $dr = ORM::for_table('tbl_transactions');
if ($stype != '') { if ($stype != '') {
@ -356,7 +367,7 @@ switch ($action) {
$w = []; $w = [];
$v = []; $v = [];
foreach ($mts as $mt) { foreach ($mts as $mt) {
$w[] ='method'; $w[] = 'method';
$v[] = "$mt - %"; $v[] = "$mt - %";
} }
$query->where_likes($w, $v); $query->where_likes($w, $v);

2
ui/ui/admin/reports/activation.tpl
View File

@ -33,6 +33,7 @@
<tr> <tr>
<th>{Lang::T('Invoice')}</th> <th>{Lang::T('Invoice')}</th>
<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('Plan Price')}</th> <th>{Lang::T('Plan Price')}</th>
<th>{Lang::T('Type')}</th> <th>{Lang::T('Type')}</th>
@ -48,6 +49,7 @@
style="cursor:pointer;">{$ds['invoice']}</td> style="cursor:pointer;">{$ds['invoice']}</td>
<td onclick="window.location.href = '{Text::url('')}customers/viewu/{$ds['username']}'" <td onclick="window.location.href = '{Text::url('')}customers/viewu/{$ds['username']}'"
style="cursor:pointer;">{$ds['username']}</td> style="cursor:pointer;">{$ds['username']}</td>
<td>{$ds['fullname']}</td>
<td>{$ds['plan_name']}</td> <td>{$ds['plan_name']}</td>
<td>{Lang::moneyFormat($ds['price'])}</td> <td>{Lang::moneyFormat($ds['price'])}</td>
<td>{$ds['type']}</td> <td>{$ds['type']}</td>