From fa3e25617460e8cc5df0c3ad0f815001b597e96b Mon Sep 17 00:00:00 2001
From: iBNu Maksum <me@ibnux.net>
Date: Tue, 4 Feb 2025 10:22:14 +0700
Subject: [PATCH] stage 2 restructured ui folder

---
 init.php                                             |  2 +-
 system/controllers/autoload.php                      |  6 +++---
 system/controllers/bandwidth.php                     |  6 +++---
 system/controllers/coupons.php                       |  6 +++---
 system/controllers/customers.php                     |  8 ++++----
 system/controllers/customfield.php                   |  2 +-
 system/controllers/services.php                      | 12 ++++++------
 system/controllers/settings.php                      | 12 ++++++------
 system/lan/english.json                              |  3 ++-
 ui/ui/{ => admin}/alert.tpl                          |  0
 ui/ui/{autoload.tpl => admin/autoload/plan.tpl}      |  0
 ui/ui/{autoload-pool.tpl => admin/autoload/pool.tpl} |  0
 .../autoload/server.tpl}                             |  0
 ui/ui/{balance-add.tpl => admin/balance/add.tpl}     |  0
 ui/ui/{balance-edit.tpl => admin/balance/edit.tpl}   |  0
 ui/ui/{balance.tpl => admin/balance/list.tpl}        |  0
 ui/ui/{bandwidth-add.tpl => admin/bandwidth/add.tpl} |  0
 .../{bandwidth-edit.tpl => admin/bandwidth/edit.tpl} |  0
 ui/ui/{bandwidth.tpl => admin/bandwidth/list.tpl}    |  0
 ui/ui/{ => admin}/change-password.tpl                |  0
 ui/ui/{coupons-add.tpl => admin/coupons/add.tpl}     |  0
 ui/ui/{coupons-edit.tpl => admin/coupons/edit.tpl}   |  0
 ui/ui/{coupons.tpl => admin/coupons/list.tpl}        |  0
 ui/ui/{customers-add.tpl => admin/customers/add.tpl} |  0
 .../{customers-edit.tpl => admin/customers/edit.tpl} |  0
 ui/ui/{customers.tpl => admin/customers/list.tpl}    |  0
 ui/ui/{customers-map.tpl => admin/customers/map.tpl} |  0
 .../{customers-view.tpl => admin/customers/view.tpl} |  0
 ui/ui/{hotspot-add.tpl => admin/hotspot/add.tpl}     |  0
 ui/ui/{hotspot-edit.tpl => admin/hotspot/edit.tpl}   |  0
 ui/ui/{hotspot.tpl => admin/hotspot/list.tpl}        |  0
 ui/ui/{app-settings.tpl => admin/settings/app.tpl}   |  0
 ui/ui/{ => admin/settings}/customfield.tpl           |  0
 .../{app-devices.tpl => admin/settings/devices.tpl}  |  0
 .../settings/localisation.tpl}                       |  0
 .../settings/miscellaneous.tpl}                      |  0
 .../settings/notifications.tpl}                      |  0
 37 files changed, 29 insertions(+), 28 deletions(-)
 rename ui/ui/{ => admin}/alert.tpl (100%)
 rename ui/ui/{autoload.tpl => admin/autoload/plan.tpl} (100%)
 rename ui/ui/{autoload-pool.tpl => admin/autoload/pool.tpl} (100%)
 rename ui/ui/{autoload-server.tpl => admin/autoload/server.tpl} (100%)
 rename ui/ui/{balance-add.tpl => admin/balance/add.tpl} (100%)
 rename ui/ui/{balance-edit.tpl => admin/balance/edit.tpl} (100%)
 rename ui/ui/{balance.tpl => admin/balance/list.tpl} (100%)
 rename ui/ui/{bandwidth-add.tpl => admin/bandwidth/add.tpl} (100%)
 rename ui/ui/{bandwidth-edit.tpl => admin/bandwidth/edit.tpl} (100%)
 rename ui/ui/{bandwidth.tpl => admin/bandwidth/list.tpl} (100%)
 rename ui/ui/{ => admin}/change-password.tpl (100%)
 rename ui/ui/{coupons-add.tpl => admin/coupons/add.tpl} (100%)
 rename ui/ui/{coupons-edit.tpl => admin/coupons/edit.tpl} (100%)
 rename ui/ui/{coupons.tpl => admin/coupons/list.tpl} (100%)
 rename ui/ui/{customers-add.tpl => admin/customers/add.tpl} (100%)
 rename ui/ui/{customers-edit.tpl => admin/customers/edit.tpl} (100%)
 rename ui/ui/{customers.tpl => admin/customers/list.tpl} (100%)
 rename ui/ui/{customers-map.tpl => admin/customers/map.tpl} (100%)
 rename ui/ui/{customers-view.tpl => admin/customers/view.tpl} (100%)
 rename ui/ui/{hotspot-add.tpl => admin/hotspot/add.tpl} (100%)
 rename ui/ui/{hotspot-edit.tpl => admin/hotspot/edit.tpl} (100%)
 rename ui/ui/{hotspot.tpl => admin/hotspot/list.tpl} (100%)
 rename ui/ui/{app-settings.tpl => admin/settings/app.tpl} (100%)
 rename ui/ui/{ => admin/settings}/customfield.tpl (100%)
 rename ui/ui/{app-devices.tpl => admin/settings/devices.tpl} (100%)
 rename ui/ui/{app-localisation.tpl => admin/settings/localisation.tpl} (100%)
 rename ui/ui/{app-miscellaneous.tpl => admin/settings/miscellaneous.tpl} (100%)
 rename ui/ui/{app-notifications.tpl => admin/settings/notifications.tpl} (100%)

diff --git a/init.php b/init.php
index 3059f859..be43dae3 100644
--- a/init.php
+++ b/init.php
@@ -349,7 +349,7 @@ function _alert($text, $type = 'success', $url = "home", $time = 3)
     $ui->assign('type', $type);
     $ui->assign('time', $time);
     $ui->assign('url', $url);
-    $ui->display('alert.tpl');
+    $ui->display('admin/alert.tpl');
     die();
 }
 
diff --git a/system/controllers/autoload.php b/system/controllers/autoload.php
index 8f2a71e6..db66aafb 100644
--- a/system/controllers/autoload.php
+++ b/system/controllers/autoload.php
@@ -26,7 +26,7 @@ switch ($action) {
         }
         $ui->assign('routers', $routers);
         $ui->assign('d', $d);
-        $ui->display('autoload-pool.tpl');
+        $ui->display('admin/autoload/pool.tpl');
         break;
     case 'bw_name':
         $bw = ORM::for_table('tbl_bandwidth')->select("name_bw")->find_one($routes['2']);
@@ -44,7 +44,7 @@ switch ($action) {
         $d = ORM::for_table('tbl_routers')->where('enabled', '1')->find_many();
         $ui->assign('d', $d);
 
-        $ui->display('autoload-server.tpl');
+        $ui->display('admin/autoload/server.tpl');
         break;
     case 'pppoe_ip_used':
         if (!empty(_get('ip'))) {
@@ -100,7 +100,7 @@ switch ($action) {
         }
         $ui->assign('d', $d);
 
-        $ui->display('autoload.tpl');
+        $ui->display('admin/autoload/plan.tpl');
         break;
     case 'customer_is_active':
         if ($config['check_customer_online'] == 'yes') {
diff --git a/system/controllers/bandwidth.php b/system/controllers/bandwidth.php
index 68d14092..7192f151 100644
--- a/system/controllers/bandwidth.php
+++ b/system/controllers/bandwidth.php
@@ -30,7 +30,7 @@ switch ($action) {
         }
 
         $ui->assign('d', $d);
-        $ui->display('bandwidth.tpl');
+        $ui->display('admin/bandwidth/list.tpl');
         break;
 
     case 'add':
@@ -38,7 +38,7 @@ switch ($action) {
             _alert(Lang::T('You do not have permission to access this page'), 'danger', "dashboard");
         }
         run_hook('view_add_bandwidth'); #HOOK
-        $ui->display('bandwidth-add.tpl');
+        $ui->display('admin/bandwidth/add.tpl');
         break;
 
     case 'edit':
@@ -51,7 +51,7 @@ switch ($action) {
         if ($d) {
             $ui->assign('burst', explode(" ", $d['burst']));
             $ui->assign('d', $d);
-            $ui->display('bandwidth-edit.tpl');
+            $ui->display('admin/bandwidth/edit.tpl');
         } else {
             r2(getUrl('bandwidth/list'), 'e', Lang::T('Account Not Found'));
         }
diff --git a/system/controllers/coupons.php b/system/controllers/coupons.php
index f019f22f..976d80b8 100644
--- a/system/controllers/coupons.php
+++ b/system/controllers/coupons.php
@@ -22,7 +22,7 @@ switch ($action) {
         }
         $ui->assign('_title', Lang::T('Add Coupon'));
         $ui->assign('csrf_token', Csrf::generateAndStoreToken());
-        $ui->display('coupons-add.tpl');
+        $ui->display('admin/coupons/add.tpl');
         break;
 
     case 'add-post':
@@ -131,7 +131,7 @@ switch ($action) {
         $ui->assign('coupon', $coupon);
         $ui->assign('_title', Lang::T('Edit Coupon: ' . $coupon['code']));
         $ui->assign('csrf_token', Csrf::generateAndStoreToken());
-        $ui->display('coupons-edit.tpl');
+        $ui->display('admin/coupons/edit.tpl');
         break;
 
     case 'edit-post':
@@ -310,6 +310,6 @@ switch ($action) {
         $coupons = Paginator::findMany($couponsData, ['search' => $search], 5, '');
         $ui->assign('csrf_token', Csrf::generateAndStoreToken());
         $ui->assign('coupons', $coupons);
-        $ui->display('coupons.tpl');
+        $ui->display('admin/coupons/list.tpl');
         break;
 }
diff --git a/system/controllers/customers.php b/system/controllers/customers.php
index a5fa8f53..58f649ec 100644
--- a/system/controllers/customers.php
+++ b/system/controllers/customers.php
@@ -158,7 +158,7 @@ switch ($action) {
         $ui->assign('xheader', $leafletpickerHeader);
         run_hook('view_add_customer'); #HOOK
         $ui->assign('csrf_token',  Csrf::generateAndStoreToken());
-        $ui->display('customers-add.tpl');
+        $ui->display('admin/customers/add.tpl');
         break;
     case 'recharge':
         if (!in_array($admin['user_type'], ['SuperAdmin', 'Admin', 'Agent', 'Sales'])) {
@@ -364,7 +364,7 @@ switch ($action) {
             $ui->assign('customFields', $customFields);
             $ui->assign('xheader', $leafletpickerHeader);
             $ui->assign('csrf_token',  Csrf::generateAndStoreToken());
-            $ui->display('customers-view.tpl');
+            $ui->display('admin/customers/view.tpl');
         } else {
             r2(getUrl('customers/list'), 'e', Lang::T('Account Not Found'));
         }
@@ -403,7 +403,7 @@ switch ($action) {
             $ui->assign('customFields', $customFields);
             $ui->assign('xheader', $leafletpickerHeader);
             $ui->assign('csrf_token',  Csrf::generateAndStoreToken());
-            $ui->display('customers-edit.tpl');
+            $ui->display('admin/customers/edit.tpl');
         } else {
             r2(getUrl('customers/list'), 'e', Lang::T('Account Not Found'));
         }
@@ -908,6 +908,6 @@ switch ($action) {
         $ui->assign('order_pos', $order_pos[$order]);
         $ui->assign('orderby', $orderby);
         $ui->assign('csrf_token',  Csrf::generateAndStoreToken());
-        $ui->display('customers.tpl');
+        $ui->display('admin/customers/list.tpl');
         break;
 }
diff --git a/system/controllers/customfield.php b/system/controllers/customfield.php
index d0463283..7bd0214d 100644
--- a/system/controllers/customfield.php
+++ b/system/controllers/customfield.php
@@ -48,6 +48,6 @@ switch ($action) {
             $fields = json_decode(file_get_contents($fieldPath), true);
         }
         $ui->assign('fields', $fields);
-        $ui->display('customfield.tpl');
+        $ui->display('admin/settings/customfield.tpl');
         break;
 }
\ No newline at end of file
diff --git a/system/controllers/services.php b/system/controllers/services.php
index 81072480..f3244cd8 100644
--- a/system/controllers/services.php
+++ b/system/controllers/services.php
@@ -139,7 +139,7 @@ switch ($action) {
         $d = Paginator::findMany($query, ['name' => $name], 20, $append_url);
         $ui->assign('d', $d);
         run_hook('view_list_plans'); #HOOK
-        $ui->display('hotspot.tpl');
+        $ui->display('admin/hotspot/list.tpl');
         break;
     case 'add':
         $d = ORM::for_table('tbl_bandwidth')->find_many();
@@ -156,7 +156,7 @@ switch ($action) {
         }
         $ui->assign('devices', $devices);
         run_hook('view_add_plan'); #HOOK
-        $ui->display('hotspot-add.tpl');
+        $ui->display('admin/hotspot/add.tpl');
         break;
 
     case 'edit':
@@ -191,7 +191,7 @@ switch ($action) {
             }
             $ui->assign('exps', $exps);
             run_hook('view_edit_plan'); #HOOK
-            $ui->display('hotspot-edit.tpl');
+            $ui->display('admin/hotspot/edit.tpl');
         } else {
             r2(getUrl('services/hotspot'), 'e', Lang::T('Account Not Found'));
         }
@@ -819,12 +819,12 @@ switch ($action) {
 
         $ui->assign('d', $d);
         run_hook('view_list_balance'); #HOOK
-        $ui->display('balance.tpl');
+        $ui->display('admin/balance/list.tpl');
         break;
     case 'balance-add':
         $ui->assign('_title', Lang::T('Balance Plans'));
         run_hook('view_add_balance'); #HOOK
-        $ui->display('balance-add.tpl');
+        $ui->display('admin/balance/add.tpl');
         break;
     case 'balance-edit':
         $ui->assign('_title', Lang::T('Balance Plans'));
@@ -832,7 +832,7 @@ switch ($action) {
         $d = ORM::for_table('tbl_plans')->find_one($id);
         $ui->assign('d', $d);
         run_hook('view_edit_balance'); #HOOK
-        $ui->display('balance-edit.tpl');
+        $ui->display('admin/balance/edit.tpl');
         break;
     case 'balance-delete':
         $id = $routes['2'];
diff --git a/system/controllers/settings.php b/system/controllers/settings.php
index f26cccd7..3cfc2633 100644
--- a/system/controllers/settings.php
+++ b/system/controllers/settings.php
@@ -50,7 +50,7 @@ switch ($action) {
             }
         }
         $ui->assign('devices', $devices);
-        $ui->display('app-devices.tpl');
+        $ui->display('admin/settings/devices.tpl');
         break;
     case 'app':
         if (!in_array($admin['user_type'], ['SuperAdmin', 'Admin'])) {
@@ -165,7 +165,7 @@ switch ($action) {
         run_hook('view_app_settings'); #HOOK
         $csrf_token = Csrf::generateAndStoreToken();
         $ui->assign('csrf_token', $csrf_token);
-        $ui->display('app-settings.tpl');
+        $ui->display('admin/settings/app.tpl');
         break;
 
     case 'app-post':
@@ -352,7 +352,7 @@ switch ($action) {
         run_hook('view_localisation'); #HOOK
         $csrf_token = Csrf::generateAndStoreToken();
         $ui->assign('csrf_token', $csrf_token);
-        $ui->display('app-localisation.tpl');
+        $ui->display('admin/settings/localisation.tpl');
         break;
 
     case 'localisation-post':
@@ -869,7 +869,7 @@ switch ($action) {
         run_hook('view_change_password'); #HOOK
         $csrf_token = Csrf::generateAndStoreToken();
         $ui->assign('csrf_token', $csrf_token);
-        $ui->display('change-password.tpl');
+        $ui->display('admin/change-password.tpl');
         break;
 
     case 'change-password-post':
@@ -926,7 +926,7 @@ switch ($action) {
         $csrf_token = Csrf::generateAndStoreToken();
         $ui->assign('csrf_token', $csrf_token);
         $ui->assign('_default', json_decode(file_get_contents($UPLOAD_PATH . DIRECTORY_SEPARATOR . 'notifications.default.json'), true));
-        $ui->display('app-notifications.tpl');
+        $ui->display('admin/settings/notifications.tpl');
         break;
     case 'notifications-post':
         if (!in_array($admin['user_type'], ['SuperAdmin', 'Admin'])) {
@@ -1127,7 +1127,7 @@ switch ($action) {
         $ui->assign('csrf_token', $csrf_token);
         $ui->assign('_c', $config);
         $ui->assign('_title', Lang::T('Miscellaneous Settings'));
-        $ui->display('app-miscellaneous.tpl');
+        $ui->display('admin/settings/miscellaneous.tpl');
         break;
 
     default:
diff --git a/system/lan/english.json b/system/lan/english.json
index 93127434..2801653e 100644
--- a/system/lan/english.json
+++ b/system/lan/english.json
@@ -963,5 +963,6 @@
     "Max_30_days": "Max 30 days",
     "Information": "Information",
     "Export_and_Print_will_show_all_data_without_pagination": "Export and Print will show all data without pagination",
-    "Free_Internet_Plan_updated_successfully_": "Free Internet Plan updated successfully!"
+    "Free_Internet_Plan_updated_successfully_": "Free Internet Plan updated successfully!",
+    "Create_Bandwidth_Package_for_expired_Internet_Package": "Create Bandwidth Package for expired Internet Package"
 }
\ No newline at end of file
diff --git a/ui/ui/alert.tpl b/ui/ui/admin/alert.tpl
similarity index 100%
rename from ui/ui/alert.tpl
rename to ui/ui/admin/alert.tpl
diff --git a/ui/ui/autoload.tpl b/ui/ui/admin/autoload/plan.tpl
similarity index 100%
rename from ui/ui/autoload.tpl
rename to ui/ui/admin/autoload/plan.tpl
diff --git a/ui/ui/autoload-pool.tpl b/ui/ui/admin/autoload/pool.tpl
similarity index 100%
rename from ui/ui/autoload-pool.tpl
rename to ui/ui/admin/autoload/pool.tpl
diff --git a/ui/ui/autoload-server.tpl b/ui/ui/admin/autoload/server.tpl
similarity index 100%
rename from ui/ui/autoload-server.tpl
rename to ui/ui/admin/autoload/server.tpl
diff --git a/ui/ui/balance-add.tpl b/ui/ui/admin/balance/add.tpl
similarity index 100%
rename from ui/ui/balance-add.tpl
rename to ui/ui/admin/balance/add.tpl
diff --git a/ui/ui/balance-edit.tpl b/ui/ui/admin/balance/edit.tpl
similarity index 100%
rename from ui/ui/balance-edit.tpl
rename to ui/ui/admin/balance/edit.tpl
diff --git a/ui/ui/balance.tpl b/ui/ui/admin/balance/list.tpl
similarity index 100%
rename from ui/ui/balance.tpl
rename to ui/ui/admin/balance/list.tpl
diff --git a/ui/ui/bandwidth-add.tpl b/ui/ui/admin/bandwidth/add.tpl
similarity index 100%
rename from ui/ui/bandwidth-add.tpl
rename to ui/ui/admin/bandwidth/add.tpl
diff --git a/ui/ui/bandwidth-edit.tpl b/ui/ui/admin/bandwidth/edit.tpl
similarity index 100%
rename from ui/ui/bandwidth-edit.tpl
rename to ui/ui/admin/bandwidth/edit.tpl
diff --git a/ui/ui/bandwidth.tpl b/ui/ui/admin/bandwidth/list.tpl
similarity index 100%
rename from ui/ui/bandwidth.tpl
rename to ui/ui/admin/bandwidth/list.tpl
diff --git a/ui/ui/change-password.tpl b/ui/ui/admin/change-password.tpl
similarity index 100%
rename from ui/ui/change-password.tpl
rename to ui/ui/admin/change-password.tpl
diff --git a/ui/ui/coupons-add.tpl b/ui/ui/admin/coupons/add.tpl
similarity index 100%
rename from ui/ui/coupons-add.tpl
rename to ui/ui/admin/coupons/add.tpl
diff --git a/ui/ui/coupons-edit.tpl b/ui/ui/admin/coupons/edit.tpl
similarity index 100%
rename from ui/ui/coupons-edit.tpl
rename to ui/ui/admin/coupons/edit.tpl
diff --git a/ui/ui/coupons.tpl b/ui/ui/admin/coupons/list.tpl
similarity index 100%
rename from ui/ui/coupons.tpl
rename to ui/ui/admin/coupons/list.tpl
diff --git a/ui/ui/customers-add.tpl b/ui/ui/admin/customers/add.tpl
similarity index 100%
rename from ui/ui/customers-add.tpl
rename to ui/ui/admin/customers/add.tpl
diff --git a/ui/ui/customers-edit.tpl b/ui/ui/admin/customers/edit.tpl
similarity index 100%
rename from ui/ui/customers-edit.tpl
rename to ui/ui/admin/customers/edit.tpl
diff --git a/ui/ui/customers.tpl b/ui/ui/admin/customers/list.tpl
similarity index 100%
rename from ui/ui/customers.tpl
rename to ui/ui/admin/customers/list.tpl
diff --git a/ui/ui/customers-map.tpl b/ui/ui/admin/customers/map.tpl
similarity index 100%
rename from ui/ui/customers-map.tpl
rename to ui/ui/admin/customers/map.tpl
diff --git a/ui/ui/customers-view.tpl b/ui/ui/admin/customers/view.tpl
similarity index 100%
rename from ui/ui/customers-view.tpl
rename to ui/ui/admin/customers/view.tpl
diff --git a/ui/ui/hotspot-add.tpl b/ui/ui/admin/hotspot/add.tpl
similarity index 100%
rename from ui/ui/hotspot-add.tpl
rename to ui/ui/admin/hotspot/add.tpl
diff --git a/ui/ui/hotspot-edit.tpl b/ui/ui/admin/hotspot/edit.tpl
similarity index 100%
rename from ui/ui/hotspot-edit.tpl
rename to ui/ui/admin/hotspot/edit.tpl
diff --git a/ui/ui/hotspot.tpl b/ui/ui/admin/hotspot/list.tpl
similarity index 100%
rename from ui/ui/hotspot.tpl
rename to ui/ui/admin/hotspot/list.tpl
diff --git a/ui/ui/app-settings.tpl b/ui/ui/admin/settings/app.tpl
similarity index 100%
rename from ui/ui/app-settings.tpl
rename to ui/ui/admin/settings/app.tpl
diff --git a/ui/ui/customfield.tpl b/ui/ui/admin/settings/customfield.tpl
similarity index 100%
rename from ui/ui/customfield.tpl
rename to ui/ui/admin/settings/customfield.tpl
diff --git a/ui/ui/app-devices.tpl b/ui/ui/admin/settings/devices.tpl
similarity index 100%
rename from ui/ui/app-devices.tpl
rename to ui/ui/admin/settings/devices.tpl
diff --git a/ui/ui/app-localisation.tpl b/ui/ui/admin/settings/localisation.tpl
similarity index 100%
rename from ui/ui/app-localisation.tpl
rename to ui/ui/admin/settings/localisation.tpl
diff --git a/ui/ui/app-miscellaneous.tpl b/ui/ui/admin/settings/miscellaneous.tpl
similarity index 100%
rename from ui/ui/app-miscellaneous.tpl
rename to ui/ui/admin/settings/miscellaneous.tpl
diff --git a/ui/ui/app-notifications.tpl b/ui/ui/admin/settings/notifications.tpl
similarity index 100%
rename from ui/ui/app-notifications.tpl
rename to ui/ui/admin/settings/notifications.tpl