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

Fixing Pagination, more Simple

Browse Source
This commit is contained in:
Ibnu Maksum 2024-03-27 09:44:48 +07:00
parent e11ab5ba01
commit 37a7da614e
No known key found for this signature in database
GPG Key ID: 7FC82848810579E5
16 changed files with 166 additions and 233 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
system/autoload/Package.php
View File

@ -44,6 +44,7 @@ class Package
foreach ($bills as $k => $v) { foreach ($bills as $k => $v) {
$note .= $k . " : " . Lang::moneyFormat($v) . "\n"; $note .= $k . " : " . Lang::moneyFormat($v) . "\n";
} }
$note .= $p['name_plan'] . " : " . Lang::moneyFormat($p['price']) . "\n";
} }
} }
@ -520,7 +521,9 @@ class Package
$t->plan_name = $p['name_plan']; $t->plan_name = $p['name_plan'];
if ($p['validity_unit'] == 'Period') { if ($p['validity_unit'] == 'Period') {
// Postpaid price always zero for first time // Postpaid price always zero for first time
$t->price = 0 + $add_cost; $note = '';
$bills = [];
$t->price = 0;
} else { } else {
$t->price = $p['price'] + $add_cost; $t->price = $p['price'] + $add_cost;
} }

171
system/autoload/Paginator.php
View File

@ -1,16 +1,16 @@
<?php <?php
/** /**
* PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/) * PHP Mikrotik Billing (https://github.com/SiberTech/)
* by https://t.me/ibnux * by https://t.me/ibnux
**/ **/
class Paginator class Paginator
{ {
public static function generate($query, $search = [], $per_page = '10') public static function findMany($query, $search = [], $per_page = '10')
{ {
global $routes; global $routes, $ui;
$adjacents = "2"; $adjacents = "2";
$page = _get('p', 1); $page = _get('p', 1);
$page = (empty($page) ? 1 : $page); $page = (empty($page) ? 1 : $page);
@ -66,15 +66,20 @@ class Paginator
'url' => $url, 'url' => $url,
'page' => $page, 'page' => $page,
'pages' => $pages, 'pages' => $pages,
'prev' => ($page>0) ? ($page-1): "0", 'prev' => ($page > 0) ? ($page - 1) : "0",
'next' => ($page>= $lastpage) ? $lastpage : $page+1 'next' => ($page >= $lastpage) ? $lastpage : $page + 1
]; ];
return $result; if ($ui) {
$ui->assign('paginator', $result);
}
return $query->offset($startpoint)->limit($per_page)->find_many();
} }
} }
public static function build($table, $colVal = [], $query = '', $per_page = '10') public static function build($table, $colVal = [], $query = '', $per_page = '10')
{ {
global $routes; global $routes;
global $_L;
$url = U . implode('/', $routes); $url = U . implode('/', $routes);
$query = urlencode($query); $query = urlencode($query);
$adjacents = "2"; $adjacents = "2";
@ -99,60 +104,60 @@ class Paginator
$limit = $per_page; $limit = $per_page;
$startpoint = ($page * $limit) - $limit; $startpoint = ($page * $limit) - $limit;
if ($lastpage >= 1) { if ($lastpage >= 1) {
$pagination .= '<ul class="pagination pagination-sm">'; $pagination .= '<ul class="pagination">';
if ($lastpage < 7 + ($adjacents * 2)) { if ($lastpage < 7 + ($adjacents * 2)) {
for ($counter = 1; $counter <= $lastpage; $counter++) { for ($counter = 1; $counter <= $lastpage; $counter++) {
if ($counter == $page) if ($counter == $page)
$pagination .= "<li class='active'><a href='javascript:void(0);'>$counter</a></li>"; $pagination .= "<li class='page-item active'><a class='page-link' href='javascript:void(0);'>$counter</a></li>";
else else
$pagination .= "<li><a href='{$url}&p=$counter&q=$query'>$counter</a></li>"; $pagination .= "<li class='page-item'><a class='page-link' href='{$url}&p=$counter&q=$query'>$counter</a></li>";
} }
} elseif ($lastpage > 5 + ($adjacents * 2)) { } elseif ($lastpage > 5 + ($adjacents * 2)) {
if ($page < 1 + ($adjacents * 2)) { if ($page < 1 + ($adjacents * 2)) {
for ($counter = 1; $counter < 4 + ($adjacents * 2); $counter++) { for ($counter = 1; $counter < 4 + ($adjacents * 2); $counter++) {
if ($counter == $page) if ($counter == $page)
$pagination .= "<li class='active'><a href='javascript:void(0);'>$counter</a></li>"; $pagination .= "<li class='page-item active'><a class='page-link' href='javascript:void(0);'>$counter</a></li>";
else else
$pagination .= "<li><a href='{$url}&p=$counter&q=$query'>$counter</a></li>"; $pagination .= "<li class='page-item'><a class='page-link' href='{$url}&p=$counter&q=$query'>$counter</a></li>";
} }
$pagination .= "<li class='disabled'><a href='#'>...</a></li>"; $pagination .= "<li class='page-item disabled'><a class='page-link' href='#'>...</a></li>";
$pagination .= "<li><a href='{$url}&p=$lpm1&q=$query'>$lpm1</a></li>"; $pagination .= "<li class='page-item'><a class='page-link' href='{$url}&p=$lpm1&q=$query'>$lpm1</a></li>";
$pagination .= "<li><a href='{$url}&p=$lastpage&q=$query'>$lastpage</a></li>"; $pagination .= "<li class='page-item'><a class='page-link' href='{$url}&p=$lastpage&q=$query'>$lastpage</a></li>";
} elseif ($lastpage - ($adjacents * 2) > $page && $page > ($adjacents * 2)) { } elseif ($lastpage - ($adjacents * 2) > $page && $page > ($adjacents * 2)) {
$pagination .= "<li><a href='{$url}&p=1&q=$query'>1</a></li>"; $pagination .= "<li class='page-item'><a class='page-link' href='{$url}&p=1&q=$query'>1</a></li>";
$pagination .= "<li><a href='{$url}&p=2&q=$query'>2</a></li>"; $pagination .= "<li class='page-item'><a class='page-link' href='{$url}&p=2&q=$query'>2</a></li>";
$pagination .= "<li class='disabled'><a href='#'>...</a></li>"; $pagination .= "<li class='page-item disabled'><a class='page-link' href='#'>...</a></li>";
for ($counter = $page - $adjacents; $counter <= $page + $adjacents; $counter++) { for ($counter = $page - $adjacents; $counter <= $page + $adjacents; $counter++) {
if ($counter == $page) if ($counter == $page)
$pagination .= "<li class='active'><a href='javascript:void(0);'>$counter</a></li>"; $pagination .= "<li class='page-item active'><a class='page-link' href='javascript:void(0);'>$counter</a></li>";
else else
$pagination .= "<li><a href='{$url}&p=$counter&q=$query'>$counter</a></li>"; $pagination .= "<li class='page-item'><a class='page-link' href='{$url}&p=$counter&q=$query'>$counter</a></li>";
} }
$pagination .= "<li class='disabled'><a href='#'>...</a></li>"; $pagination .= "<li class='page-item disabled'><a class='page-link' href='#'>...</a></li>";
$pagination .= "<li><a href='{$url}&p=$lpm1&q=$query'>$lpm1</a></li>"; $pagination .= "<li class='page-item'><a class='page-link' href='{$url}&p=$lpm1&q=$query'>$lpm1</a></li>";
$pagination .= "<li><a href='{$url}&p=$lastpage&q=$query'>$lastpage</a></li>"; $pagination .= "<li class='page-item'><a class='page-link' href='{$url}&p=$lastpage&q=$query'>$lastpage</a></li>";
} else { } else {
$pagination .= "<li><a href='{$url}&p=1&q=$query'>1</a></li>"; $pagination .= "<li class='page-item'><a class='page-link' href='{$url}&p=1&q=$query'>1</a></li>";
$pagination .= "<li><a href='{$url}&p=2&q=$query'>2</a></li>"; $pagination .= "<li class='page-item'><a class='page-link' href='{$url}&p=2&q=$query'>2</a></li>";
$pagination .= "<li><a href='#'>...</a></li>"; $pagination .= "<li class='page-item'><a class='page-link' href='#'>...</a></li>";
for ($counter = $lastpage - (2 + ($adjacents * 2)); $counter <= $lastpage; $counter++) { for ($counter = $lastpage - (2 + ($adjacents * 2)); $counter <= $lastpage; $counter++) {
if ($counter == $page) if ($counter == $page)
$pagination .= "<li class='active'><a class='disabled'>$counter</a></li>"; $pagination .= "<li class='page-item'><a class='page-link disabled'>$counter</a></li>";
else else
$pagination .= "<li><a href='{$url}&p=$counter&q=$query'>$counter</a></li>"; $pagination .= "<li class='page-item'><a class='page-link' href='{$url}&p=$counter&q=$query'>$counter</a></li>";
} }
} }
} }
if ($page < $counter - 1) { if ($page < $counter - 1) {
$pagination .= "<li><a href='{$url}&p=$next&q=$query'>" . Lang::T('Next') . "</a></li>"; $pagination .= "<li class='page-item'><a class='page-link' href='{$url}&p=$next&q=$query'>" . Lang::T('Next') . "</a></li>";
$pagination .= "<li><a href='{$url}&p=$lastpage&q=$query'>" . Lang::T('Last') . "</a></li>"; $pagination .= "<li class='page-item'><a class='page-link' href='{$url}&p=$lastpage&q=$query'>" . Lang::T('Last') . "</a></li>";
} else { } else {
$pagination .= "<li class='disabled'><a class='disabled'>" . Lang::T('Next') . "</a></li>"; $pagination .= "<li class='page-item disabled'><a class='page-link disabled'>" . Lang::T('Next') . "</a></li>";
$pagination .= "<li class='disabled'><a class='disabled'>" . Lang::T('Last') . "</a></li>"; $pagination .= "<li class='page-item disabled'><a class='page-link disabled'>" . Lang::T('Last') . "</a></li>";
} }
$pagination .= "</ul>"; $pagination .= "</ul>";
$pagination = '<nav>' . $pagination . '</nav>';
return array("startpoint" => $startpoint, "limit" => $limit, "found" => $totalReq, "page" => $page, "lastpage" => $lastpage, "contents" => $pagination); return array("startpoint" => $startpoint, "limit" => $limit, "found" => $totalReq, "page" => $page, "lastpage" => $lastpage, "contents" => $pagination);
} }
} }
@ -205,59 +210,60 @@ class Paginator
$startpoint = ($page * $limit) - $limit; $startpoint = ($page * $limit) - $limit;
if ($lastpage >= 1) { if ($lastpage >= 1) {
$pagination .= '<ul class="pagination pagination-sm">'; $pagination .= '<ul class="pagination">';
if ($lastpage < 7 + ($adjacents * 2)) { if ($lastpage < 7 + ($adjacents * 2)) {
for ($counter = 1; $counter <= $lastpage; $counter++) { for ($counter = 1; $counter <= $lastpage; $counter++) {
if ($counter == $page) if ($counter == $page)
$pagination .= "<li class='active'><a href='javascript:void(0);'>$counter</a></li>"; $pagination .= "<li class='page-item active'><a class='page-link' href='javascript:void(0);'>$counter</a></li>";
else else
$pagination .= "<li><a href='{$url}$counter'>$counter</a></li>"; $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$counter'>$counter</a></li>";
} }
} elseif ($lastpage > 5 + ($adjacents * 2)) { } elseif ($lastpage > 5 + ($adjacents * 2)) {
if ($page < 1 + ($adjacents * 2)) { if ($page < 1 + ($adjacents * 2)) {
for ($counter = 1; $counter < 4 + ($adjacents * 2); $counter++) { for ($counter = 1; $counter < 4 + ($adjacents * 2); $counter++) {
if ($counter == $page) if ($counter == $page)
$pagination .= "<li class='active'><a href='javascript:void(0);'>$counter</a></li>"; $pagination .= "<li class='page-item active'><a class='page-link' href='javascript:void(0);'>$counter</a></li>";
else else
$pagination .= "<li><a href='{$url}$counter'>$counter</a></li>"; $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$counter'>$counter</a></li>";
} }
$pagination .= "<li class='disabled'><a href='#'>...</a></li>"; $pagination .= "<li class='page-item disabled'><a class='page-link' href='#'>...</a></li>";
$pagination .= "<li><a href='{$url}$lpm1'>$lpm1</a></li>"; $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$lpm1'>$lpm1</a></li>";
$pagination .= "<li><a href='{$url}$lastpage'>$lastpage</a></li>"; $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$lastpage'>$lastpage</a></li>";
} elseif ($lastpage - ($adjacents * 2) > $page && $page > ($adjacents * 2)) { } elseif ($lastpage - ($adjacents * 2) > $page && $page > ($adjacents * 2)) {
$pagination .= "<li><a href='{$url}1'>1</a></li>"; $pagination .= "<li class='page-item'><a class='page-link' href='{$url}1'>1</a></li>";
$pagination .= "<li><a href='{$url}2'>2</a></li>"; $pagination .= "<li class='page-item'><a class='page-link' href='{$url}2'>2</a></li>";
$pagination .= "<li class='disabled'><a href='#'>...</a></li>"; $pagination .= "<li class='page-item disabled'><a class='page-link' href='#'>...</a></li>";
for ($counter = $page - $adjacents; $counter <= $page + $adjacents; $counter++) { for ($counter = $page - $adjacents; $counter <= $page + $adjacents; $counter++) {
if ($counter == $page) if ($counter == $page)
$pagination .= "<li class='active'><a href='javascript:void(0);'>$counter</a></li>"; $pagination .= "<li class='page-item active'><a class='page-link' href='javascript:void(0);'>$counter</a></li>";
else else
$pagination .= "<li><a href='{$url}$counter'>$counter</a></li>"; $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$counter'>$counter</a></li>";
} }
$pagination .= "<li class='disabled'><a href='#'>...</a></li>"; $pagination .= "<li class='page-item disabled'><a class='page-link' href='#'>...</a></li>";
$pagination .= "<li><a href='{$url}$lpm1'>$lpm1</a></li>"; $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$lpm1'>$lpm1</a></li>";
$pagination .= "<li><a href='{$url}$lastpage'>$lastpage</a></li>"; $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$lastpage'>$lastpage</a></li>";
} else { } else {
$pagination .= "<li><a href='{$url}1'>1</a></li>"; $pagination .= "<li class='page-item'><a class='page-link' href='{$url}1'>1</a></li>";
$pagination .= "<li><a href='{$url}2'>2</a></li>"; $pagination .= "<li class='page-item'><a class='page-link' href='{$url}2'>2</a></li>";
$pagination .= "<li><a href='#'>...</a></li>"; $pagination .= "<li class='page-item'><a class='page-link' href='#'>...</a></li>";
for ($counter = $lastpage - (2 + ($adjacents * 2)); $counter <= $lastpage; $counter++) { for ($counter = $lastpage - (2 + ($adjacents * 2)); $counter <= $lastpage; $counter++) {
if ($counter == $page) if ($counter == $page)
$pagination .= "<li class='active'><a class='disabled'>$counter</a></li>"; $pagination .= "<li class='page-item'><a class='page-link disabled'>$counter</a></li>";
else else
$pagination .= "<li><a href='{$url}$counter'>$counter</a></li>"; $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$counter'>$counter</a></li>";
} }
} }
} }
if ($page < $counter - 1) { if ($page < $counter - 1) {
$pagination .= "<li><a href='{$url}$next'>" . Lang::T('Next') . "</a></li>"; $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$next'>" . Lang::T('Next') . "</a></li>";
$pagination .= "<li><a href='{$url}$lastpage'>" . Lang::T('Last') . "</a></li>"; $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$lastpage'>" . Lang::T('Last') . "</a></li>";
} else { } else {
$pagination .= "<li class='disabled'><a class='disabled'>" . Lang::T('Next') . "</a></li>"; $pagination .= "<li class='page-item disabled'><a class='page-link disabled'>" . Lang::T('Next') . "</a></li>";
$pagination .= "<li class='disabled'><a class='disabled'>" . Lang::T('Last') . "</a></li>"; $pagination .= "<li class='page-item disabled'><a class='page-link disabled'>" . Lang::T('Last') . "</a></li>";
} }
$pagination .= "</ul>"; $pagination .= "</ul>";
$pagination = '<nav>' . $pagination . '</nav>';
$gen = array("startpoint" => $startpoint, "limit" => $limit, "found" => $totalReq, "page" => $page, "lastpage" => $lastpage, "contents" => $pagination); $gen = array("startpoint" => $startpoint, "limit" => $limit, "found" => $totalReq, "page" => $page, "lastpage" => $lastpage, "contents" => $pagination);
return $gen; return $gen;
@ -299,59 +305,60 @@ class Paginator
$startpoint = ($page * $limit) - $limit; $startpoint = ($page * $limit) - $limit;
if ($lastpage >= 1) { if ($lastpage >= 1) {
$pagination .= '<ul class="pagination pagination-sm">'; $pagination .= '<ul class="pagination">';
if ($lastpage < 7 + ($adjacents * 2)) { if ($lastpage < 7 + ($adjacents * 2)) {
for ($counter = 1; $counter <= $lastpage; $counter++) { for ($counter = 1; $counter <= $lastpage; $counter++) {
if ($counter == $page) if ($counter == $page)
$pagination .= "<li class='active'><a href='javascript:void(0);'>$counter</a></li>"; $pagination .= "<li class='page-item active'><a class='page-link' href='javascript:void(0);'>$counter</a></li>";
else else
$pagination .= "<li><a href='{$url}$counter'>$counter</a></li>"; $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$counter'>$counter</a></li>";
} }
} elseif ($lastpage > 5 + ($adjacents * 2)) { } elseif ($lastpage > 5 + ($adjacents * 2)) {
if ($page < 1 + ($adjacents * 2)) { if ($page < 1 + ($adjacents * 2)) {
for ($counter = 1; $counter < 4 + ($adjacents * 2); $counter++) { for ($counter = 1; $counter < 4 + ($adjacents * 2); $counter++) {
if ($counter == $page) if ($counter == $page)
$pagination .= "<li class='active'><a href='javascript:void(0);'>$counter</a></li>"; $pagination .= "<li class='page-item active'><a class='page-link' href='javascript:void(0);'>$counter</a></li>";
else else
$pagination .= "<li><a href='{$url}$counter'>$counter</a></li>"; $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$counter'>$counter</a></li>";
} }
$pagination .= "<li class='disabled'><a href='#'>...</a></li>"; $pagination .= "<li class='page-item disabled'><a class='page-link' href='#'>...</a></li>";
$pagination .= "<li><a href='{$url}$lpm1'>$lpm1</a></li>"; $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$lpm1'>$lpm1</a></li>";
$pagination .= "<li><a href='{$url}$lastpage'>$lastpage</a></li>"; $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$lastpage'>$lastpage</a></li>";
} elseif ($lastpage - ($adjacents * 2) > $page && $page > ($adjacents * 2)) { } elseif ($lastpage - ($adjacents * 2) > $page && $page > ($adjacents * 2)) {
$pagination .= "<li><a href='{$url}1'>1</a></li>"; $pagination .= "<li class='page-item'><a class='page-link' href='{$url}1'>1</a></li>";
$pagination .= "<li><a href='{$url}2'>2</a></li>"; $pagination .= "<li class='page-item'><a class='page-link' href='{$url}2'>2</a></li>";
$pagination .= "<li class='disabled'><a href='#'>...</a></li>"; $pagination .= "<li class='page-item disabled'><a class='page-link' href='#'>...</a></li>";
for ($counter = $page - $adjacents; $counter <= $page + $adjacents; $counter++) { for ($counter = $page - $adjacents; $counter <= $page + $adjacents; $counter++) {
if ($counter == $page) if ($counter == $page)
$pagination .= "<li class='active'><a href='javascript:void(0);'>$counter</a></li>"; $pagination .= "<li class='page-item active'><a class='page-link' href='javascript:void(0);'>$counter</a></li>";
else else
$pagination .= "<li><a href='{$url}$counter'>$counter</a></li>"; $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$counter'>$counter</a></li>";
} }
$pagination .= "<li class='disabled'><a href='#'>...</a></li>"; $pagination .= "<li class='page-item disabled'><a class='page-link' href='#'>...</a></li>";
$pagination .= "<li><a href='{$url}$lpm1'>$lpm1</a></li>"; $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$lpm1'>$lpm1</a></li>";
$pagination .= "<li><a href='{$url}$lastpage'>$lastpage</a></li>"; $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$lastpage'>$lastpage</a></li>";
} else { } else {
$pagination .= "<li><a href='{$url}1'>1</a></li>"; $pagination .= "<li class='page-item'><a class='page-link' href='{$url}1'>1</a></li>";
$pagination .= "<li><a href='{$url}2'>2</a></li>"; $pagination .= "<li class='page-item'><a class='page-link' href='{$url}2'>2</a></li>";
$pagination .= "<li><a href='#'>...</a></li>"; $pagination .= "<li class='page-item'><a class='page-link' href='#'>...</a></li>";
for ($counter = $lastpage - (2 + ($adjacents * 2)); $counter <= $lastpage; $counter++) { for ($counter = $lastpage - (2 + ($adjacents * 2)); $counter <= $lastpage; $counter++) {
if ($counter == $page) if ($counter == $page)
$pagination .= "<li class='active'><a class='disabled'>$counter</a></li>"; $pagination .= "<li class='page-item active'><a class='page-item disabled'>$counter</a></li>";
else else
$pagination .= "<li><a href='{$url}$counter'>$counter</a></li>"; $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$counter'>$counter</a></li>";
} }
} }
} }
if ($page < $counter - 1) { if ($page < $counter - 1) {
$pagination .= "<li><a href='{$url}$next'>" . Lang::T('Next') . "</a></li>"; $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$next'>" . Lang::T('Next') . "</a></li>";
$pagination .= "<li><a href='{$url}$lastpage'>" . Lang::T('Last') . "</a></li>"; $pagination .= "<li class='page-item'><a class='page-link' href='{$url}$lastpage'>" . Lang::T('Last') . "</a></li>";
} else { } else {
$pagination .= "<li class='disabled'><a class='disabled'>" . Lang::T('Next') . "</a></li>"; $pagination .= "<li class='page-item disabled'><a class='page-item disabled'>" . Lang::T('Next') . "</a></li>";
$pagination .= "<li class='disabled'><a class='disabled'>" . Lang::T('Last') . "</a></li>"; $pagination .= "<li class='page-item disabled'><a class='page-item disabled'>" . Lang::T('Last') . "</a></li>";
} }
$pagination .= "</ul>"; $pagination .= "</ul>";
$pagination = '<nav>' . $pagination . '</nav>';
$gen = array("startpoint" => $startpoint, "limit" => $limit, "found" => $totalReq, "page" => $page, "lastpage" => $lastpage, "contents" => $pagination); $gen = array("startpoint" => $startpoint, "limit" => $limit, "found" => $totalReq, "page" => $page, "lastpage" => $lastpage, "contents" => $pagination);
return $gen; return $gen;

11
system/controllers/bandwidth.php
View File

@ -22,17 +22,14 @@ switch ($action) {
run_hook('view_list_bandwidth'); #HOOK run_hook('view_list_bandwidth'); #HOOK
$name = _post('name'); $name = _post('name');
if ($name != '') { if ($name != '') {
$query = ORM::for_table('tbl_bandwidth')->where_like('name_bw', '%' . $name . '%'); $query = ORM::for_table('tbl_bandwidth')->where_like('name_bw', '%' . $name . '%')->order_by_desc('id');
$paginator = Paginator::generate($query, ['name' => $name]); $d = Paginator::findMany($query, ['name' => $name]);
$d = $query->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
} else { } else {
$query = ORM::for_table('tbl_bandwidth'); $query = ORM::for_table('tbl_bandwidth')->order_by_desc('id');
$paginator = Paginator::generate($query); $d = Paginator::findMany($query);
$d = $query->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
} }
$ui->assign('d', $d); $ui->assign('d', $d);
$ui->assign('paginator', $paginator);
$ui->display('bandwidth.tpl'); $ui->display('bandwidth.tpl');
break; break;

36
system/controllers/customers.php
View File

@ -192,23 +192,12 @@ switch ($action) {
} }
if ($v == 'order') { if ($v == 'order') {
$v = 'order'; $v = 'order';
$query = ORM::for_table('tbl_transactions')->where('username', $customer['username']); $query = ORM::for_table('tbl_transactions')->where('username', $customer['username'])->order_by_desc('id');
$paginator = Paginator::generate($query); $order = Paginator::findMany($query);
$order = $query
->offset($paginator['startpoint'])
->limit($paginator['limit'])
->order_by_desc('id')
->find_many();
$ui->assign('paginator', $paginator);
$ui->assign('order', $order); $ui->assign('order', $order);
} else if ($v == 'activation') { } else if ($v == 'activation') {
$query = ORM::for_table('tbl_transactions')->where('username', $customer['username']); $query = ORM::for_table('tbl_transactions')->where('username', $customer['username'])->order_by_desc('id');
$paginator = Paginator::generate($query); $activation = Paginator::findMany($query);
$activation = $query->offset($paginator['startpoint'])
->limit($paginator['limit'])
->order_by_desc('id')
->find_many();
$ui->assign('paginator', $paginator);
$ui->assign('activation', $activation); $ui->assign('activation', $activation);
} }
$ui->assign('packages', User::_billing($customer['id'])); $ui->assign('packages', User::_billing($customer['id']));
@ -526,22 +515,17 @@ switch ($action) {
$search = _post('search'); $search = _post('search');
run_hook('list_customers'); #HOOK run_hook('list_customers'); #HOOK
if ($search != '') { if ($search != '') {
$query = ORM::for_table('tbl_customers')->where_raw("(`username` LIKE '%$search%' OR `fullname` LIKE '%$search%' OR `phonenumber` LIKE '%$search%' OR `email` LIKE '%$search%')"); $query = ORM::for_table('tbl_customers')
$paginator = Paginator::generate($query, ['search' => $search]); ->where_raw("(`username` LIKE '%$search%' OR `fullname` LIKE '%$search%' OR `phonenumber` LIKE '%$search%' OR `email` LIKE '%$search%')")
$d = $query->offset($paginator['startpoint']) ->order_by_asc('username');
->limit($paginator['limit']) $d = Paginator::findMany($query, ['search' => $search]);
->order_by_asc('username')
->find_many();
} else { } else {
$query = ORM::for_table('tbl_customers'); $query = ORM::for_table('tbl_customers')->order_by_asc('username');
$paginator = Paginator::generate($query); $d = Paginator::findMany($query);
$d = ORM::for_table('tbl_customers')
->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
} }
$ui->assign('search', htmlspecialchars($search)); $ui->assign('search', htmlspecialchars($search));
$ui->assign('d', $d); $ui->assign('d', $d);
$ui->assign('paginator', $paginator);
$ui->display('customers.tpl'); $ui->display('customers.tpl');
break; break;
} }

11
system/controllers/dashboard.php
View File

@ -55,13 +55,9 @@ $ui->assign('c_all', $c_all);
if ($config['hide_uet'] != 'yes') { if ($config['hide_uet'] != 'yes') {
//user expire //user expire
$query = ORM::for_table('tbl_user_recharges') $query = ORM::for_table('tbl_user_recharges')
->where_lte('expiration', $mdate); ->where_lte('expiration', $mdate)
$paginator = Paginator::generate($query); ->order_by_desc('expiration');
$expire = $query $expire = Paginator::findMany($query);
->offset($paginator['startpoint'])
->limit($paginator['limit'])
->order_by_desc('expiration')
->find_many();
// Get the total count of expired records for pagination // Get the total count of expired records for pagination
$totalCount = ORM::for_table('tbl_user_recharges') $totalCount = ORM::for_table('tbl_user_recharges')
@ -72,7 +68,6 @@ if ($config['hide_uet'] != 'yes') {
$paginator['total_count'] = $totalCount; $paginator['total_count'] = $totalCount;
// Assign the pagination HTML to the template variable // Assign the pagination HTML to the template variable
$ui->assign('paginator', $paginator);
$ui->assign('expire', $expire); $ui->assign('expire', $expire);
} }

22
system/controllers/logs.php
View File

@ -26,18 +26,15 @@ switch ($action) {
r2(U . "logs/list/", 's', "Delete logs older than $keep days"); r2(U . "logs/list/", 's', "Delete logs older than $keep days");
} }
if ($q != '') { if ($q != '') {
$query = ORM::for_table('tbl_logs')->where_like('description', '%' . $q . '%'); $query = ORM::for_table('tbl_logs')->where_like('description', '%' . $q . '%')->order_by_desc('id');
$paginator = Paginator::generate($query, ['q' => $q]); $d = Paginator::findMany($query, ['q' => $q]);
$d = $query->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
} else { } else {
$query = ORM::for_table('tbl_logs'); $query = ORM::for_table('tbl_logs')->order_by_desc('id');
$paginator = Paginator::generate($query); $d = Paginator::findMany($query);
$d = $query->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
} }
$ui->assign('d', $d); $ui->assign('d', $d);
$ui->assign('q', $q); $ui->assign('q', $q);
$ui->assign('paginator', $paginator);
$ui->display('logs.tpl'); $ui->display('logs.tpl');
break; break;
case 'radius': case 'radius':
@ -48,18 +45,15 @@ switch ($action) {
r2(U . "logs/radius/", 's', "Delete logs older than $keep days"); r2(U . "logs/radius/", 's', "Delete logs older than $keep days");
} }
if ($q != '') { if ($q != '') {
$query = ORM::for_table('radpostauth', 'radius')->where_like('username', '%' . $q . '%'); $query = ORM::for_table('radpostauth', 'radius')->where_like('username', '%' . $q . '%')->order_by_desc('id');
$paginator = Paginator::generate($query, ['q' => $q]); $d = Paginator::findMany($query, ['q' => $q]);
$d = $query->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
} else { } else {
$query = ORM::for_table('radpostauth', 'radius'); $query = ORM::for_table('radpostauth', 'radius')->order_by_desc('id');
$paginator = Paginator::generate($query); $d = Paginator::findMany($query);
$d = $query->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
} }
$ui->assign('d', $d); $ui->assign('d', $d);
$ui->assign('q', $q); $ui->assign('q', $q);
$ui->assign('paginator', $paginator);
$ui->display('logs-radius.tpl'); $ui->display('logs-radius.tpl');
break; break;

9
system/controllers/order.php
View File

@ -19,13 +19,8 @@ switch ($action) {
break; break;
case 'history': case 'history':
$ui->assign('_system_menu', 'history'); $ui->assign('_system_menu', 'history');
$query = ORM::for_table('tbl_payment_gateway')->where('username', $user['username']); $query = ORM::for_table('tbl_payment_gateway')->where('username', $user['username'])->order_by_desc('id');
$paginator = Paginator::generate($query); $d = Paginator::findMany($query);
$d = $query
->order_by_desc('id')
->offset($paginator['startpoint'])->limit($paginator['limit'])
->find_many();
$ui->assign('paginator', $paginator);
$ui->assign('d', $d); $ui->assign('d', $d);
$ui->assign('_title', Lang::T('Order History')); $ui->assign('_title', Lang::T('Order History'));
run_hook('customer_view_order_history'); #HOOK run_hook('customer_view_order_history'); #HOOK

11
system/controllers/plan.php
View File

@ -68,13 +68,11 @@ switch ($action) {
$ui->assign('_title', Lang::T('Customer')); $ui->assign('_title', Lang::T('Customer'));
$search = _post('search'); $search = _post('search');
if ($search != '') { if ($search != '') {
$query = ORM::for_table('tbl_user_recharges')->where_like('username', '%' . $search . '%'); $query = ORM::for_table('tbl_user_recharges')->where_like('username', '%' . $search . '%')->order_by_desc('id');
$paginator = Paginator::generate($query, ['search' => $search]); $d = Paginator::findMany($query, ['search' => $search]);
$d = $query->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
} else { } else {
$query = ORM::for_table('tbl_user_recharges'); $query = ORM::for_table('tbl_user_recharges')->order_by_desc('id');
$paginator = Paginator::generate($query); $d = Paginator::findMany($query);
$d = $query->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_array();
} }
run_hook('view_list_billing'); #HOOK run_hook('view_list_billing'); #HOOK
if ($isApi) { if ($isApi) {
@ -82,7 +80,6 @@ switch ($action) {
} }
$ui->assign('d', $d); $ui->assign('d', $d);
$ui->assign('search', $search); $ui->assign('search', $search);
$ui->assign('paginator', $paginator);
$ui->display('plan.tpl'); $ui->display('plan.tpl');
break; break;

11
system/controllers/pool.php
View File

@ -23,17 +23,14 @@ switch ($action) {
$name = _post('name'); $name = _post('name');
if ($name != '') { if ($name != '') {
$query = ORM::for_table('tbl_pool')->where_like('pool_name', '%' . $name . '%'); $query = ORM::for_table('tbl_pool')->where_like('pool_name', '%' . $name . '%')->order_by_desc('id');
$paginator = Paginator::generate($query, ['name' => $name]); $d = Paginator::findMany($query, ['name' => $name]);
$d = $query->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
} else { } else {
$query = ORM::for_table('tbl_pool'); $query = ORM::for_table('tbl_pool')->order_by_desc('id');
$paginator = Paginator::generate($query); $d = Paginator::findMany($query);
$d = $query->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
} }
$ui->assign('d', $d); $ui->assign('d', $d);
$ui->assign('paginator', $paginator);
run_hook('view_pool'); #HOOK run_hook('view_pool'); #HOOK
$ui->display('pool.tpl'); $ui->display('pool.tpl');
break; break;

9
system/controllers/radius.php
View File

@ -136,19 +136,14 @@ switch ($action) {
$name = _post('name'); $name = _post('name');
if (empty($name)) { if (empty($name)) {
$query = ORM::for_table('nas', 'radius'); $query = ORM::for_table('nas', 'radius');
$paginator = Paginator::generate($query); $nas = Paginator::findMany($query);
$nas = $query->offset($paginator['startpoint'])->limit($paginator['limit'])->find_many();
} else { } else {
$query = ORM::for_table('nas', 'radius') $query = ORM::for_table('nas', 'radius')
->where_like('nasname', $search) ->where_like('nasname', $search)
->where_like('shortname', $search) ->where_like('shortname', $search)
->where_like('description', $search); ->where_like('description', $search);
$paginator = Paginator::generate($query, ['name' => $name]); $nas = Paginator::findMany($query, ['name' => $name]);
$nas = $query
->offset($paginator['startpoint'])->limit($paginator['limit'])
->find_many();
} }
$ui->assign('paginator', $paginator);
$ui->assign('name', $name); $ui->assign('name', $name);
$ui->assign('nas', $nas); $ui->assign('nas', $nas);
$ui->display('radius-nas.tpl'); $ui->display('radius-nas.tpl');

17
system/controllers/reports.php
View File

@ -30,31 +30,26 @@ switch ($action) {
r2(U . "logs/list/", 's', "Delete logs older than $keep days"); r2(U . "logs/list/", 's', "Delete logs older than $keep days");
} }
if ($q != '') { if ($q != '') {
$query = ORM::for_table('tbl_transactions')->where_like('invoice', '%' . $q . '%'); $query = ORM::for_table('tbl_transactions')->where_like('invoice', '%' . $q . '%')->order_by_desc('id');
$paginator = Paginator::generate($query, ['q' => $q]); $d = Paginator::findMany($query, ['q' => $q]);
$d = $where->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
} else { } else {
$query = ORM::for_table('tbl_transactions'); $query = ORM::for_table('tbl_transactions')->order_by_desc('id');
$paginator = Paginator::generate($query); $d = Paginator::findMany($query);
$d = $where->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
} }
$ui->assign('activation', $d); $ui->assign('activation', $d);
$ui->assign('q', $q); $ui->assign('q', $q);
$ui->assign('paginator', $paginator);
$ui->display('reports-activation.tpl'); $ui->display('reports-activation.tpl');
break; break;
case 'daily-report': case 'daily-report':
$query = ORM::for_table('tbl_transactions')->where('recharged_on', $mdate); $query = ORM::for_table('tbl_transactions')->where('recharged_on', $mdate)->order_by_desc('id');
$paginator = Paginator::generate($query); $d = Paginator::findMany($query);
$d = $query->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
$dr = $query->sum('price'); $dr = $query->sum('price');
$ui->assign('d', $d); $ui->assign('d', $d);
$ui->assign('dr', $dr); $ui->assign('dr', $dr);
$ui->assign('mdate', $mdate); $ui->assign('mdate', $mdate);
$ui->assign('mtime', $mtime); $ui->assign('mtime', $mtime);
$ui->assign('paginator', $paginator);
run_hook('view_daily_reports'); #HOOK run_hook('view_daily_reports'); #HOOK
$ui->display('reports-daily.tpl'); $ui->display('reports-daily.tpl');
break; break;

11
system/controllers/routers.php
View File

@ -26,17 +26,14 @@ switch ($action) {
$name = _post('name'); $name = _post('name');
if ($name != '') { if ($name != '') {
$query = ORM::for_table('tbl_routers')->where_like('name', '%' . $name . '%'); $query = ORM::for_table('tbl_routers')->where_like('name', '%' . $name . '%')->order_by_desc('id');
$paginator = Paginator::generate($query, ['name' => $name]); $d = Paginator::findMany($query, ['name' => $name]);
$d = $query->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
} else { } else {
$query = ORM::for_table('tbl_routers'); $query = ORM::for_table('tbl_routers')->order_by_desc('id');
$paginator = Paginator::generate($query); $d = Paginator::findMany($query);
$d = $query->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
} }
$ui->assign('d', $d); $ui->assign('d', $d);
$ui->assign('paginator', $paginator);
run_hook('view_list_routers'); #HOOK run_hook('view_list_routers'); #HOOK
$ui->display('routers.tpl'); $ui->display('routers.tpl');
break; break;

21
system/controllers/services.php
View File

@ -120,16 +120,13 @@ switch ($action) {
$name = _post('name'); $name = _post('name');
if ($name != '') { if ($name != '') {
$query = ORM::for_table('tbl_bandwidth')->join('tbl_plans', array('tbl_bandwidth.id', '=', 'tbl_plans.id_bw'))->where('tbl_plans.type', 'Hotspot')->where_like('tbl_plans.name_plan', '%' . $name . '%'); $query = ORM::for_table('tbl_bandwidth')->join('tbl_plans', array('tbl_bandwidth.id', '=', 'tbl_plans.id_bw'))->where('tbl_plans.type', 'Hotspot')->where_like('tbl_plans.name_plan', '%' . $name . '%');
$paginator = Paginator::generate($query, ['name'=> $name]); $d = Paginator::findMany($query, ['name'=> $name]);
$d = $query->offset($paginator['startpoint'])->limit($paginator['limit'])->find_many();
} else { } else {
$query = ORM::for_table('tbl_bandwidth')->join('tbl_plans', array('tbl_bandwidth.id', '=', 'tbl_plans.id_bw'))->where('tbl_plans.type', 'Hotspot'); $query = ORM::for_table('tbl_bandwidth')->join('tbl_plans', array('tbl_bandwidth.id', '=', 'tbl_plans.id_bw'))->where('tbl_plans.type', 'Hotspot');
$paginator = Paginator::generate($query); $d = Paginator::findMany($query);
$d = $query->offset($paginator['startpoint'])->limit($paginator['limit'])->find_many();
} }
$ui->assign('d', $d); $ui->assign('d', $d);
$ui->assign('paginator', $paginator);
run_hook('view_list_plans'); #HOOK run_hook('view_list_plans'); #HOOK
$ui->display('hotspot.tpl'); $ui->display('hotspot.tpl');
break; break;
@ -396,16 +393,13 @@ switch ($action) {
$name = _post('name'); $name = _post('name');
if ($name != '') { if ($name != '') {
$query = ORM::for_table('tbl_bandwidth')->join('tbl_plans', array('tbl_bandwidth.id', '=', 'tbl_plans.id_bw'))->where('tbl_plans.type', 'PPPOE')->where_like('tbl_plans.name_plan', '%' . $name . '%'); $query = ORM::for_table('tbl_bandwidth')->join('tbl_plans', array('tbl_bandwidth.id', '=', 'tbl_plans.id_bw'))->where('tbl_plans.type', 'PPPOE')->where_like('tbl_plans.name_plan', '%' . $name . '%');
$paginator = Paginator::generate($query, ['name' => $name]); $d = Paginator::findMany($query, ['name' => $name]);
$d =$query->offset($paginator['startpoint'])->limit($paginator['limit'])->find_many();
} else { } else {
$query = ORM::for_table('tbl_bandwidth')->join('tbl_plans', array('tbl_bandwidth.id', '=', 'tbl_plans.id_bw'))->where('tbl_plans.type', 'PPPOE'); $query = ORM::for_table('tbl_bandwidth')->join('tbl_plans', array('tbl_bandwidth.id', '=', 'tbl_plans.id_bw'))->where('tbl_plans.type', 'PPPOE');
$paginator = Paginator::generate($query); $d = Paginator::findMany($query);
$d =$query->offset($paginator['startpoint'])->limit($paginator['limit'])->find_many();
} }
$ui->assign('d', $d); $ui->assign('d', $d);
$ui->assign('paginator', $paginator);
run_hook('view_list_ppoe'); #HOOK run_hook('view_list_ppoe'); #HOOK
$ui->display('pppoe.tpl'); $ui->display('pppoe.tpl');
break; break;
@ -651,16 +645,13 @@ switch ($action) {
$name = _post('name'); $name = _post('name');
if ($name != '') { if ($name != '') {
$query = ORM::for_table('tbl_plans')->where('tbl_plans.type', 'Balance')->where_like('tbl_plans.name_plan', '%' . $name . '%'); $query = ORM::for_table('tbl_plans')->where('tbl_plans.type', 'Balance')->where_like('tbl_plans.name_plan', '%' . $name . '%');
$paginator = Paginator::generate($query, ['name' => $name]); $d = Paginator::findMany($query, ['name' => $name]);
$d = $query->offset($paginator['startpoint'])->limit($paginator['limit'])->find_many();
} else { } else {
$query = ORM::for_table('tbl_plans')->where('tbl_plans.type', 'Balance'); $query = ORM::for_table('tbl_plans')->where('tbl_plans.type', 'Balance');
$paginator = Paginator::generate($query); $d = Paginator::findMany($query);
$d = $query->offset($paginator['startpoint'])->limit($paginator['limit'])->find_many();
} }
$ui->assign('d', $d); $ui->assign('d', $d);
$ui->assign('paginator', $paginator);
run_hook('view_list_balance'); #HOOK run_hook('view_list_balance'); #HOOK
$ui->display('balance.tpl'); $ui->display('balance.tpl');
break; break;

39
system/controllers/settings.php
View File

@ -277,11 +277,9 @@ switch ($action) {
if ($search != '') { if ($search != '') {
if ($admin['user_type'] == 'SuperAdmin') { if ($admin['user_type'] == 'SuperAdmin') {
$query = ORM::for_table('tbl_users') $query = ORM::for_table('tbl_users')
->where_like('username', '%' . $search . '%'); ->where_like('username', '%' . $search . '%')
$paginator = Paginator::generate($query, ['search' => $search]); ->order_by_asc('id');
$d = $query $d = Paginator::findMany($query, ['search' => $search]);
->offset($paginator['startpoint'])
->limit($paginator['limit'])->order_by_asc('id')->findArray();
} else if ($admin['user_type'] == 'Admin') { } else if ($admin['user_type'] == 'Admin') {
$query = ORM::for_table('tbl_users') $query = ORM::for_table('tbl_users')
->where_like('username', '%' . $search . '%')->where_any_is([ ->where_like('username', '%' . $search . '%')->where_any_is([
@ -289,46 +287,36 @@ switch ($action) {
['user_type' => 'Agent'], ['user_type' => 'Agent'],
['user_type' => 'Sales'], ['user_type' => 'Sales'],
['id' => $admin['id']] ['id' => $admin['id']]
]); ])->order_by_asc('id');
$paginator = Paginator::generate($query, ['search' => $search]); $d = Paginator::findMany($query, ['search' => $search]);
$d = $query
->offset($paginator['startpoint'])
->limit($paginator['limit'])->order_by_asc('id')->findArray();
} else { } else {
$query = ORM::for_table('tbl_users') $query = ORM::for_table('tbl_users')
->where_like('username', '%' . $search . '%') ->where_like('username', '%' . $search . '%')
->where_any_is([ ->where_any_is([
['id' => $admin['id']], ['id' => $admin['id']],
['root' => $admin['id']] ['root' => $admin['id']]
]); ])->order_by_asc('id');
$paginator = Paginator::generate($query, ['search' => $search]); $d = Paginator::findMany($query, ['search' => $search]);
$d = $query
->offset($paginator['startpoint'])
->limit($paginator['limit'])->order_by_asc('id')->findArray();
} }
} else { } else {
if ($admin['user_type'] == 'SuperAdmin') { if ($admin['user_type'] == 'SuperAdmin') {
$query = ORM::for_table('tbl_users'); $query = ORM::for_table('tbl_users')->order_by_asc('id');
$paginator = Paginator::generate($query); $d = Paginator::findMany($query);
$d = $query->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_asc('id')->findArray();
} else if ($admin['user_type'] == 'Admin') { } else if ($admin['user_type'] == 'Admin') {
$query = ORM::for_table('tbl_users')->where_any_is([ $query = ORM::for_table('tbl_users')->where_any_is([
['user_type' => 'Report'], ['user_type' => 'Report'],
['user_type' => 'Agent'], ['user_type' => 'Agent'],
['user_type' => 'Sales'], ['user_type' => 'Sales'],
['id' => $admin['id']] ['id' => $admin['id']]
]); ])->order_by_asc('id');
$paginator = Paginator::generate($query); $d = Paginator::findMany($query);
$d = $query->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_asc('id')->findArray();
} else { } else {
$query = ORM::for_table('tbl_users') $query = ORM::for_table('tbl_users')
->where_any_is([ ->where_any_is([
['id' => $admin['id']], ['id' => $admin['id']],
['root' => $admin['id']] ['root' => $admin['id']]
]); ])->order_by_asc('id');
$paginator = Paginator::generate($query); $d = Paginator::findMany($query);
$d = $query
->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_asc('id')->findArray();
} }
} }
$admins = []; $admins = [];
@ -353,7 +341,6 @@ switch ($action) {
$ui->assign('admins', $admins); $ui->assign('admins', $admins);
$ui->assign('d', $d); $ui->assign('d', $d);
$ui->assign('search', $search); $ui->assign('search', $search);
$ui->assign('paginator', $paginator);
run_hook('view_list_admin'); #HOOK run_hook('view_list_admin'); #HOOK
$ui->display('users.tpl'); $ui->display('users.tpl');
break; break;

6
system/controllers/voucher.php
View File

@ -40,12 +40,10 @@ switch ($action) {
case 'list-activated': case 'list-activated':
$ui->assign('_system_menu', 'list-activated'); $ui->assign('_system_menu', 'list-activated');
$query = ORM::for_table('tbl_transactions')->where('username', $user['username']); $query = ORM::for_table('tbl_transactions')->where('username', $user['username'])->order_by_asc('id');
$paginator = Paginator::generate($query); $d = Paginator::findMany($query);
$d = $query->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
$ui->assign('d', $d); $ui->assign('d', $d);
$ui->assign('paginator', $paginator);
run_hook('customer_view_activation_list'); #HOOK run_hook('customer_view_activation_list'); #HOOK
$ui->display('user-activation-list.tpl'); $ui->display('user-activation-list.tpl');

9
ui/ui/pagination.tpl
View File

@ -3,15 +3,16 @@
<ul class="pagination"> <ul class="pagination">
<li {if empty($paginator['prev'])}class="disabled" {/if}> <li {if empty($paginator['prev'])}class="disabled" {/if}>
<a href="{$paginator['url']}{$paginator['prev']}" aria-label="Previous"> <a href="{$paginator['url']}{$paginator['prev']}" aria-label="Previous">
<span aria-hidden="true">prev</span> <span aria-hidden="true">{Lang::T('Prev')}</span>
</a> </a>
</li> </li>
{foreach $paginator['pages'] as $page} {foreach $paginator['pages'] as $page}
<li class="{if $paginator['page'] == $page}active{elseif $page == '...'}disabled{/if}"><a href="{$paginator['url']}{$page}">{$page}</a></li> <li class="{if $paginator['page'] == $page}active{elseif $page == '...'}disabled{/if}"><a
href="{$paginator['url']}{$page}">{$page}</a></li>
{/foreach} {/foreach}
<li {if $paginator['count']==$paginator['next']}class="disabled" {/if}> <li {if $paginator['page']>=$paginator['count']}class="disabled" {/if}>
<a href="{$paginator['url']}{$paginator['next']}" aria-label="Next"> <a href="{$paginator['url']}{$paginator['next']}" aria-label="Next">
<span aria-hidden="true">next</span> <span aria-hidden="true">{Lang::T('Next')}</span>
</a> </a>
</li> </li>
</ul> </ul>