add search and pagination at Customer maps, fix query

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 # CHANGELOG
 
+## 2024.4.29
+
+- Maps Pagination
+- Maps Search
+- Fix extend logic
+- Fix logic customer recharge to not delete when customer not change the plan
+
 ## 2024.4.23
 
 - Fix Pagination Voucher

system/autoload/Paginator.php

@@ -20,7 +20,6 @@ class Paginator
         }
         $url .= '&p=';
         $totalReq = $query->count();
-        $next = $page + 1;
         $lastpage = ceil($totalReq / $per_page);
         $lpm1 = $lastpage - 1;
         $limit = $per_page;

system/controllers/map.php

@@ -17,8 +17,14 @@ if (empty($action)) {
 
 switch ($action) {
     case 'customer':
-
-        $c = ORM::for_table('tbl_customers')->find_many();
+        if(!empty(_req('search'))){
+            $search = _req('search');
+            $query = ORM::for_table('tbl_customers')->whereRaw("coordinates != '' AND fullname LIKE '%$search%' OR username LIKE '%$search%' OR email LIKE '%$search%' OR phonenumber LIKE '%$search%'")->order_by_desc('fullname');
+            $c = Paginator::findMany($query, ['search' => $search], 50);
+        }else{
+            $query = ORM::for_table('tbl_customers')->where_not_equal('coordinates','');
+            $c = Paginator::findMany($query, ['search'=>''], 50);
+        }
         $customerData = [];
 
         foreach ($c as $customer) {
@@ -34,7 +40,7 @@ switch ($action) {
                 ];
             }
         }
-
+        $ui->assign('search', $search);
         $ui->assign('customers', $customerData);
         $ui->assign('xheader', '<link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.3/dist/leaflet.css">');
         $ui->assign('_title', Lang::T('Customer Geo Location Information'));

ui/ui/bandwidth.tpl

@@ -1,6 +1,6 @@
 {include file="sections/header.tpl"}
 
-					<div class="row">
+<div class="row">
 	<div class="col-sm-12">
 		<div class="panel panel-hovered mb20 panel-primary">
 			<div class="panel-heading">{Lang::T('Bandwidth Plans')}</div>
@@ -12,7 +12,8 @@
 								<div class="input-group-addon">
 									<span class="fa fa-search"></span>
 								</div>
-												<input type="text" name="name" class="form-control" placeholder="{Lang::T('Search by Name')}...">
+								<input type="text" name="name" class="form-control"
+									placeholder="{Lang::T('Search by Name')}...">
 								<div class="input-group-btn">
 									<button class="btn btn-success" type="submit">{Lang::T('Search')}</button>
 								</div>
@@ -20,7 +21,8 @@
 						</form>
 					</div>
 					<div class="col-md-4">
-											<a href="{$_url}bandwidth/add" class="btn btn-primary btn-block"><i class="ion ion-android-add"> </i> {Lang::T('New Bandwidth')}</a>
+						<a href="{$_url}bandwidth/add" class="btn btn-primary btn-block"><i class="ion ion-android-add">
+							</i> {Lang::T('New Bandwidth')}</a>
 					</div>&nbsp;
 				</div>
 				<div class="table-responsive">
@@ -37,11 +39,16 @@
 							{foreach $d as $ds}
 								<tr>
 									<td>{$ds['name_bw']}</td>
-                                                    <td>{$ds['rate_down']} {$ds['rate_down_unit']} / {$ds['rate_up']} {$ds['rate_up_unit']}</td>
+									<td>{$ds['rate_down']} {$ds['rate_down_unit']} / {$ds['rate_up']} {$ds['rate_up_unit']}
+									</td>
 									<td>{$ds['burst']}</td>
 									<td>
-                                                        <a href="{$_url}bandwidth/edit/{$ds['id']}" class="btn btn-sm btn-warning">{Lang::T('Edit')}</a>
-                                                        <a href="{$_url}bandwidth/delete/{$ds['id']}" id="{$ds['id']}" class="btn btn-danger btn-sm" onclick="return confirm('{Lang::T('Delete')}?')" ><i class="glyphicon glyphicon-trash"></i></a>
+										<a href="{$_url}bandwidth/edit/{$ds['id']}"
+											class="btn btn-sm btn-warning">{Lang::T('Edit')}</a>
+										<a href="{$_url}bandwidth/delete/{$ds['id']}" id="{$ds['id']}"
+											class="btn btn-danger btn-sm"
+											onclick="return confirm('{Lang::T('Delete')}?')"><i
+												class="glyphicon glyphicon-trash"></i></a>
 									</td>
 								</tr>
 							{/foreach}
@@ -52,7 +59,7 @@
 			</div>
 		</div>
 	</div>
-				</div>
-			</div>
+</div>
+</div>
 
 {include file="sections/footer.tpl"}

ui/ui/customers-map.tpl

@@ -1,8 +1,24 @@
 {include file="sections/header.tpl"}
 
-<!-- Map container div -->
 
-<div id="map" class="well" style="width: '100%'; height: 78vh; margin: 20px auto"></div>
+<form id="site-search" method="post" action="{$_url}map/customer/">
+    <input type="hidden" name="_route" value="map/customer">
+    <div class="input-group">
+        <div class="input-group-addon">
+            <span class="fa fa-search"></span>
+        </div>
+        <input type="text" name="search" class="form-control" value="{$search}"
+            placeholder="{Lang::T('Search')}...">
+        <div class="input-group-btn">
+            <button class="btn btn-success" type="submit">{Lang::T('Search')}</button>
+        </div>
+    </div>
+</form>
+
+<!-- Map container div -->
+<div id="map" class="well" style="width: '100%'; height: 70vh; margin: 20px auto"></div>
+
+{include file="pagination.tpl"}
 
 {literal}
     <script>

version.json

@@ -1,3 +1,3 @@
 {
-    "version": "2024.4.23"
+    "version": "2024.4.29"
 }