fix pagination Voucher

CHANGELOG.md

@@ -2,6 +2,15 @@
 
 # CHANGELOG
 
+## 2024.4.23
+
+- Fix Pagination Voucher
+- Fix Languange Translation
+- Fix Alert Confirmation for requesting Extend
+- Send Telegram Notification when Customer request to extend expiration
+- prepaid users export list by @freeispradius
+- fix show voucher by @agstrxyz
+
 ## 2024.4.21
 
 - Restore old cron

system/controllers/plan.php

@@ -325,18 +325,13 @@ switch ($action) {
 
     case 'voucher':
         $ui->assign('_title', Lang::T('Vouchers'));
-        $limit = 10;
-        $page = _get('p', 0);
-        $pageNow = $page * $limit;
         $search = _req('search');
         if ($search != '') {
             if (in_array($admin['user_type'], ['SuperAdmin', 'Admin'])) {
-                $d = ORM::for_table('tbl_plans')->where('enabled', '1')
+                $query = ORM::for_table('tbl_plans')->where('enabled', '1')
                     ->join('tbl_voucher', array('tbl_plans.id', '=', 'tbl_voucher.id_plan'))
-                    ->where_like('tbl_voucher.code', '%' . $search . '%')
+                    ->where_like('tbl_voucher.code', '%' . $search . '%');
-                    ->offset($pageNow)
+                $d = Paginator::findMany($query, ["search" => $search]);
-                    ->limit($limit)
-                    ->findArray();
             } else if ($admin['user_type'] == 'Agent') {
                 $sales = [];
                 $sls = ORM::for_table('tbl_users')->select('id')->where('root', $admin['id'])->findArray();
@@ -344,21 +339,17 @@ switch ($action) {
                     $sales[] = $s['id'];
                 }
                 $sales[] = $admin['id'];
-                $d = ORM::for_table('tbl_plans')
+                $query = ORM::for_table('tbl_plans')
                     ->join('tbl_voucher', array('tbl_plans.id', '=', 'tbl_voucher.id_plan'))
                     ->where_in('generated_by', $sales)
-                    ->where_like('tbl_voucher.code', '%' . $search . '%')
+                    ->where_like('tbl_voucher.code', '%' . $search . '%');
-                    ->offset($pageNow)
+                $d = Paginator::findMany($query, ["search" => $search]);
-                    ->limit($limit)
-                    ->findArray();
             }
         } else {
             if (in_array($admin['user_type'], ['SuperAdmin', 'Admin'])) {
-                $d = ORM::for_table('tbl_plans')->where('enabled', '1')
+                $query = ORM::for_table('tbl_plans')->where('enabled', '1')
-                    ->join('tbl_voucher', array('tbl_plans.id', '=', 'tbl_voucher.id_plan'))
+                    ->join('tbl_voucher', array('tbl_plans.id', '=', 'tbl_voucher.id_plan'));
-                    ->offset($pageNow)
+                $d = Paginator::findMany($query);
-                    ->limit($limit)
-                    ->findArray();
             } else if ($admin['user_type'] == 'Agent') {
                 $sales = [];
                 $sls = ORM::for_table('tbl_users')->select('id')->where('root', $admin['id'])->findArray();
@@ -366,12 +357,10 @@ switch ($action) {
                     $sales[] = $s['id'];
                 }
                 $sales[] = $admin['id'];
-                $d = ORM::for_table('tbl_plans')
+                $query = ORM::for_table('tbl_plans')
                     ->join('tbl_voucher', array('tbl_plans.id', '=', 'tbl_voucher.id_plan'))
-                    ->where_in('generated_by', $sales)
+                    ->where_in('generated_by', $sales);
-                    ->offset($pageNow)
+                $d = Paginator::findMany($query);
-                    ->limit($limit)
-                    ->findArray();
             }
         }
         // extract admin
@@ -581,6 +570,7 @@ switch ($action) {
                 } else if ($voucher_format == 'rand') {
                     $code = Lang::randomUpLowCase($code);
                 }
+                die($code);
                 $d = ORM::for_table('tbl_voucher')->create();
                 $d->type = $type;
                 $d->routers = $server;

ui/ui/plan.tpl

@@ -75,7 +75,7 @@
                                         {/if}
                                         {if $ds['status']=='off' && $_c['extend_expired']}
                                             <a href="javascript:extend('{$ds['id']}')"
-                                                class="btn btn-info btn-xs">{Lang::T('extend')}</a>
+                                                class="btn btn-info btn-xs">{Lang::T('Extend')}</a>
                                         {/if}
                                     </td>
                                 </tr>

ui/ui/voucher.tpl

@@ -21,7 +21,8 @@
                                 <div class="input-group-addon">
                                     <span class="fa fa-search"></span>
                                 </div>
-            <input type="text" name="search" class="form-control" placeholder="{Lang::T('Search by Code Voucher')}..." value="{$search}">
+                                <input type="text" name="search" class="form-control"
+                                    placeholder="{Lang::T('Search by Code Voucher')}..." value="{$search}">
                                 <div class="input-group-btn">
                                     <button class="btn btn-success" type="submit">{Lang::T('Search')}</button>
                                 </div>
@@ -32,12 +33,14 @@
                     <div class="col-md-4">
                         <div class="btn-group btn-group-justified" role="group">
                             <div class="btn-group" role="group">
-            <a href="{$_url}plan/add-voucher" class="btn btn-primary btn-block"><i class="ion ion-android-add"></i> {Lang::T('Add Vouchers')}</a>
+                                <a href="{$_url}plan/add-voucher" class="btn btn-primary btn-block"><i
+                                        class="ion ion-android-add"></i> {Lang::T('Add Vouchers')}</a>
                             </div>
                         </div>
                         <div class="btn-group btn-group-justified" role="group">
                             <div class="btn-group" role="group">
-            <a href="{$_url}plan/print-voucher" target="print_voucher" class="btn btn-info btn-block"><i class="ion ion-android-print"></i> Print</a>
+                                <a href="{$_url}plan/print-voucher" target="print_voucher"
+                                    class="btn btn-info btn-block"><i class="ion ion-android-print"></i> Print</a>
                             </div>
                         </div>
                     </div>&nbsp;
@@ -82,8 +85,7 @@
                                     </td>
                                     <td>
                                         {if $ds['status'] neq '1'}
-                                            <a href="{$_url}plan/voucher-view/{$ds['id']}" id="{$ds['id']}"
+                                            <a href="{$_url}plan/voucher-view/{$ds['id']}" id="{$ds['id']}" style="margin: 0px;"
-                                                style="margin: 0px;"
                                                 class="btn btn-success btn-xs">&nbsp;&nbsp;{Lang::T('View')}&nbsp;&nbsp;</a>
                                         {/if}
                                         {if in_array($_admin['user_type'],['SuperAdmin','Admin'])}

version.json

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