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

fix reports by methods

Browse Source
This commit is contained in:
iBNu Maksum 2025-03-04 13:37:52 +07:00
parent 1e7d9cf6ef
commit ee3dcc05a0
No known key found for this signature in database
GPG Key ID: 7FC82848810579E5
3 changed files with 43 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
system/controllers/reports.php
View File

@ -56,7 +56,13 @@ switch ($action) {
if (count($mts) > 0) { if (count($mts) > 0) {
if (count($mts) != count($methods)) { if (count($mts) != count($methods)) {
foreach ($mts as $mt) { foreach ($mts as $mt) {
$query->where_like('method', "$mt - %"); $w = [];
$v = [];
foreach ($mts as $mt) {
$w[] ='method';
$v[] = "$mt - %";
}
$query->where_likes($w, $v);
} }
} }
} }
@ -85,7 +91,13 @@ switch ($action) {
if (count($mts) > 0) { if (count($mts) > 0) {
if (count($mts) != count($methods)) { if (count($mts) != count($methods)) {
foreach ($mts as $mt) { foreach ($mts as $mt) {
$query->where_like('method', "$mt - %"); $w = [];
$v = [];
foreach ($mts as $mt) {
$w[] ='method';
$v[] = "$mt - %";
}
$query->where_likes($w, $v);
} }
} }
} }
@ -116,9 +128,13 @@ switch ($action) {
} }
if (count($mts) > 0) { if (count($mts) > 0) {
if (count($mts) != count($methods)) { if (count($mts) != count($methods)) {
$w = [];
$v = [];
foreach ($mts as $mt) { foreach ($mts as $mt) {
$query->where_like('method', "$mt - %"); $w[] ='method';
$v[] = "$mt - %";
} }
$query->where_likes($w, $v);
} }
} }
$count = $query->count(); $count = $query->count();
@ -158,7 +174,13 @@ switch ($action) {
if (count($mts) > 0) { if (count($mts) > 0) {
if (count($mts) != count($methods)) { if (count($mts) != count($methods)) {
foreach ($mts as $mt) { foreach ($mts as $mt) {
$query->where_like('method', "$mt - %"); $w = [];
$v = [];
foreach ($mts as $mt) {
$w[] ='method';
$v[] = "$mt - %";
}
$query->where_likes($w, $v);
} }
} }
} }
@ -348,11 +370,13 @@ switch ($action) {
$query->where_in('type', $tps); $query->where_in('type', $tps);
} }
if (count($mts) > 0) { if (count($mts) > 0) {
if (count($mts) != count($methods)) { $w = [];
foreach ($mts as $mt) { $v = [];
$query->where_like('method', "$mt - %"); foreach ($mts as $mt) {
} $w[] ='method';
$v[] = "$mt - %";
} }
$query->where_likes($w, $v);
} }
if (count($rts) > 0) { if (count($rts) > 0) {
$query->where_in('routers', $rts); $query->where_in('routers', $rts);

4
system/lan/english.json
View File

@ -1114,5 +1114,7 @@
"3_Days": "3 Days", "3_Days": "3 Days",
"7_Days": "7 Days", "7_Days": "7 Days",
"Reminder_Notification_Intervals": "Reminder Notification Intervals", "Reminder_Notification_Intervals": "Reminder Notification Intervals",
"Reminder_Notify_Intervals": "Reminder Notify Intervals" "Reminder_Notify_Intervals": "Reminder Notify Intervals",
"read_documentation": "read documentation",
"Day": "Day"
} }

8
system/orm.php
View File

@ -1483,6 +1483,14 @@ class ORM implements ArrayAccess
return $this->_add_simple_where($column_name, 'LIKE', $value); return $this->_add_simple_where($column_name, 'LIKE', $value);
} }
/**
* Add any WHERE ... LIKE clause to your query.
*/
public function where_likes($column = null, $values = null)
{
return $this->_addWhere('(' . implode(' LIKE ? OR ', $column) . ' LIKE ? )', $values);
}
/** /**
* Add where WHERE ... NOT LIKE clause to your query. * Add where WHERE ... NOT LIKE clause to your query.
*/ */