add is file exists

Development

CHANGELOG.md

@@ -2,6 +2,27 @@
 
 # CHANGELOG
 
+## 2024.3.3
+
+- Change loading button by @Focuslinkstech
+- Add Customer Announcements by @Gerandonk
+- Add PPPOE Period Validity by @Gerandonk
+
+## 2024.2.29
+
+- Fix Hook Functionality
+- Change Customer Menu
+
+## 2024.2.28
+
+- Fix Buy Plan with Balance
+- Add Expired date for reminder
+
+## 2024.2.27
+
+- fix path notification
+- redirect to dashboard if already login
+
 ## 2024.2.26
 
 - Clean Unused JS and CSS

init.php

@@ -76,10 +76,10 @@ if ($_app_stage != 'Live') {
 define('U', APP_URL . '/index.php?_route=');
 
 // notification message
-if (file_exists($root_path . $UPLOAD_PATH . DIRECTORY_SEPARATOR . "notifications.json")) {
-    $_notifmsg = json_decode(file_get_contents($root_path . $UPLOAD_PATH . DIRECTORY_SEPARATOR . 'notifications.json'), true);
+if (file_exists($UPLOAD_PATH . DIRECTORY_SEPARATOR . "notifications.json")) {
+    $_notifmsg = json_decode(file_get_contents($UPLOAD_PATH . DIRECTORY_SEPARATOR . 'notifications.json'), true);
 }
-$_notifmsg_default = json_decode(file_get_contents($root_path . $UPLOAD_PATH . DIRECTORY_SEPARATOR . 'notifications.default.json'), true);
+$_notifmsg_default = json_decode(file_get_contents($UPLOAD_PATH . DIRECTORY_SEPARATOR . 'notifications.default.json'), true);
 
 //register all plugin
 foreach (glob(File::pathFixer($PLUGIN_PATH . DIRECTORY_SEPARATOR . '*.php')) as $filename) {
@@ -96,6 +96,7 @@ $result = ORM::for_table('tbl_appconfig')->find_many();
 foreach ($result as $value) {
     $config[$value['setting']] = $value['value'];
 }
+$_c =  $config;
 if (empty($http_proxy) && !empty($config['http_proxy'])) {
     $http_proxy = $config['http_proxy'];
     if (empty($http_proxyauth) && !empty($config['http_proxyauth'])) {
@@ -237,7 +238,7 @@ function r2($to, $ntype = 'e', $msg = '')
     exit;
 }
 
-function _alert($text, $type = 'success', $url = "home")
+function _alert($text, $type = 'success', $url = "home", $time = 3)
 {
     global $ui;
     if (!isset($ui)) return;
@@ -250,8 +251,10 @@ function _alert($text, $type = 'success', $url = "home")
     }
     $ui->assign('text', $text);
     $ui->assign('type', $type);
+    $ui->assign('time', $time);
     $ui->assign('url', $url);
     $ui->display('alert.tpl');
+    die();
 }
 
 

install/phpnuxbill.sql

@@ -91,7 +91,7 @@ CREATE TABLE `tbl_plans` (
   `data_limit` int(10) UNSIGNED DEFAULT NULL,
   `data_unit` enum('MB','GB') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
   `validity` int(10) NOT NULL,
-  `validity_unit` enum('Mins','Hrs','Days','Months') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `validity_unit` enum('Mins','Hrs','Days','Months','Period') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
   `shared_users` int(10) DEFAULT NULL,
   `routers` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
   `is_radius` tinyint(1) NOT NULL DEFAULT '0' COMMENT '1 is radius',

pages_template/Announcement.html

@@ -1 +1,3 @@
-Pengumuman!!<br>Besok libur<br><br>Announcement!!<br>Tomorrow holiday<br>
+Pengumuman!!<br>Besok libur<br><br>Announcement!!<br>Tomorrow holiday<br><br>
+<br>
+This Announcement is for Login Page.

pages_template/Announcement_Customer.html

@@ -0,0 +1,8 @@
+Pengumuman Pelanggan!!<br>
+Besok libur<br>
+<br>
+Customer Announcement!!<br>
+Tomorrow holiday<br>
+<br>
+<br>
+This Announcement is for Customer Dashboard

system/autoload/Admin.php

@@ -51,7 +51,7 @@ class Admin
         if ($id) {
             return ORM::for_table('tbl_users')->find_one($id);
         } else {
-            return [];
+            return null;
         }
     }
 }

system/autoload/Hookers.php

@@ -38,6 +38,7 @@ function register_menu($name, $admin, $function, $position, $icon = '', $label =
 $hook_registered = array();
 
 function register_hook($action, $function){
+    global $hook_registered;
     $hook_registered[] = [
         'action' => $action,
         'function' => $function

system/autoload/Message.php

@@ -68,9 +68,13 @@ class Message
 
     public static function sendPackageNotification($phone, $name, $package, $price, $message, $via)
     {
+        global $u;
         $msg = str_replace('[[name]]', $name, $message);
         $msg = str_replace('[[package]]', $package, $msg);
         $msg = str_replace('[[price]]', $price, $msg);
+        if($u){
+            $msg = str_replace('[[expired_date]]', Lang::dateAndTimeFormat($u['expiration'], $u['time']), $msg);
+        }
         if (
             !empty($phone) && strlen($phone) > 5
             && !empty($message) && in_array($via, ['sms', 'wa'])

system/autoload/Package.php

@@ -19,7 +19,7 @@ class Package
      */
     public static function rechargeUser($id_customer, $router_name, $plan_id, $gateway, $channel)
     {
-        global $config, $admin;
+        global $config, $admin, $c, $p, $b, $t, $d;
         $date_now = date("Y-m-d H:i:s");
         $date_only = date("Y-m-d");
         $time_only = date("H:i:s");
@@ -48,8 +48,8 @@ class Package
             $t->routers = $router_name;
             $t->type = "Balance";
             if ($admin) {
-                $t->admin_id = $admin['id'];
-            }else{
+                $t->admin_id = ($admin['id']) ? $admin['id'] : '0';
+            } else {
                 $t->admin_id = '0';
             }
             $t->save();
@@ -94,9 +94,24 @@ class Package
             ->where('Type', $p['type'])
             ->find_one();
 
+        run_hook("recharge_user");
+
+
         $mikrotik = Mikrotik::info($router_name);
         if ($p['validity_unit'] == 'Months') {
             $date_exp = date("Y-m-d", strtotime('+' . $p['validity'] . ' month'));
+		} else if ($p['validity_unit'] == 'Period') {
+			$date_tmp = date("Y-m-20", strtotime('+' . $p['validity'] . ' month'));
+			$dt1 = new DateTime("$date_only");
+			$dt2 = new DateTime("$date_tmp");
+			$diff = $dt2->diff($dt1);
+			$sum =  $diff->format("%a");// => 453
+			if ($sum >= 35) {
+				$date_exp = date("Y-m-20", strtotime('+0 month'));
+			} else {
+				$date_exp = date("Y-m-20", strtotime('+' . $p['validity'] . ' month'));
+				};
+			$time = date("23:59:00");
         } else if ($p['validity_unit'] == 'Days') {
             $date_exp = date("Y-m-d", strtotime('+' . $p['validity'] . ' day'));
         } else if ($p['validity_unit'] == 'Hrs') {
@@ -116,6 +131,9 @@ class Package
                     if ($p['validity_unit'] == 'Months') {
                         $date_exp = date("Y-m-d", strtotime($b['expiration'] . ' +' . $p['validity'] . ' months'));
                         $time = $b['time'];
+					} else if ($p['validity_unit'] == 'Period') {
+						$date_exp = date("Y-m-20", strtotime($b['expiration'] . ' +' . $p['validity'] . ' months'));
+						$time = date("23:59:00");
                     } else if ($p['validity_unit'] == 'Days') {
                         $date_exp = date("Y-m-d", strtotime($b['expiration'] . ' +' . $p['validity'] . ' days'));
                         $time = $b['time'];
@@ -152,8 +170,8 @@ class Package
                 $b->routers = $router_name;
                 $b->type = "Hotspot";
                 if ($admin) {
-                    $b->admin_id = $admin['id'];
-                }else{
+                    $b->admin_id = ($admin['id']) ? $admin['id'] : '0';
+                } else {
                     $b->admin_id = '0';
                 }
                 $b->save();
@@ -172,11 +190,17 @@ class Package
                 $t->routers = $router_name;
                 $t->type = "Hotspot";
                 if ($admin) {
-                    $t->admin_id = $admin['id'];
-                }else{
+                    $t->admin_id = ($admin['id']) ? $admin['id'] : '0';
+                } else {
                     $t->admin_id = '0';
                 }
                 $t->save();
+				
+				Message::sendTelegram("#u$c[username] #recharge #Hotspot \n" . $p['name_plan'] .
+                "\nRouter: " . $router_name .
+                "\nGateway: " . $gateway .
+                "\nChannel: " . $channel .
+                "\nPrice: " . Lang::moneyFormat($p['price']));
             } else {
                 if ($p['is_radius']) {
                     Radius::customerAddPlan($c, $p, "$date_exp $time");
@@ -201,9 +225,9 @@ class Package
                 $d->routers = $router_name;
                 $d->type = "Hotspot";
                 if ($admin) {
-                    $b->admin_id = $admin['id'];
-                }else{
-                    $b->admin_id = '0';
+                    $d->admin_id = ($admin['id']) ? $admin['id'] : '0';
+                } else {
+                    $d->admin_id = '0';
                 }
                 $d->save();
 
@@ -221,17 +245,19 @@ class Package
                 $t->routers = $router_name;
                 $t->type = "Hotspot";
                 if ($admin) {
-                    $t->admin_id = $admin['id'];
-                }else{
+                    $t->admin_id = ($admin['id']) ? $admin['id'] : '0';
+                } else {
                     $t->admin_id = '0';
                 }
                 $t->save();
-            }
+				
 				Message::sendTelegram("#u$c[username] #buy #Hotspot \n" . $p['name_plan'] .
                 "\nRouter: " . $router_name .
                 "\nGateway: " . $gateway .
                 "\nChannel: " . $channel .
                 "\nPrice: " . Lang::moneyFormat($p['price']));
+            }
+            
         } else {
 
             if ($b) {
@@ -240,6 +266,9 @@ class Package
                     if ($p['validity_unit'] == 'Months') {
                         $date_exp = date("Y-m-d", strtotime($b['expiration'] . ' +' . $p['validity'] . ' months'));
                         $time = $b['time'];
+					} else if ($p['validity_unit'] == 'Period') {
+						$date_exp = date("Y-m-20", strtotime($b['expiration'] . ' +' . $p['validity'] . ' months'));
+						$time = date("23:59:00");
                     } else if ($p['validity_unit'] == 'Days') {
                         $date_exp = date("Y-m-d", strtotime($b['expiration'] . ' +' . $p['validity'] . ' days'));
                         $time = $b['time'];
@@ -276,8 +305,8 @@ class Package
                 $b->routers = $router_name;
                 $b->type = "PPPOE";
                 if ($admin) {
-                    $b->admin_id = $admin['id'];
-                }else{
+                    $b->admin_id = ($admin['id']) ? $admin['id'] : '0';
+                } else {
                     $b->admin_id = '0';
                 }
                 $b->save();
@@ -296,11 +325,17 @@ class Package
                 $t->routers = $router_name;
                 $t->type = "PPPOE";
                 if ($admin) {
-                    $t->admin_id = $admin['id'];
-                }else{
+                    $t->admin_id = ($admin['id']) ? $admin['id'] : '0';
+                } else {
                     $t->admin_id = '0';
                 }
                 $t->save();
+				
+				Message::sendTelegram("#u$c[username] #recharge #PPPOE \n" . $p['name_plan'] .
+                "\nRouter: " . $router_name .
+                "\nGateway: " . $gateway .
+                "\nChannel: " . $channel .
+                "\nPrice: " . Lang::moneyFormat($p['price']));
             } else {
                 if ($p['is_radius']) {
                     Radius::customerAddPlan($c, $p, "$date_exp $time");
@@ -325,8 +360,8 @@ class Package
                 $d->routers = $router_name;
                 $d->type = "PPPOE";
                 if ($admin) {
-                    $d->admin_id = $admin['id'];
-                }else{
+                    $d->admin_id = ($admin['id']) ? $admin['id'] : '0';
+                } else {
                     $d->admin_id = '0';
                 }
                 $d->save();
@@ -344,13 +379,13 @@ class Package
                 $t->method = "$gateway - $channel";
                 $t->routers = $router_name;
                 if ($admin) {
-                    $t->admin_id = $admin['id'];
-                }else{
+                    $t->admin_id = ($admin['id']) ? $admin['id'] : '0';
+                } else {
                     $t->admin_id = '0';
                 }
                 $t->type = "PPPOE";
                 $t->save();
-            }
+				
 				Message::sendTelegram("#u$c[username] #buy #PPPOE \n" . $p['name_plan'] .
                 "\nRouter: " . $router_name .
                 "\nGateway: " . $gateway .
@@ -358,6 +393,8 @@ class Package
                 "\nPrice: " . Lang::moneyFormat($p['price']));
             }
             
+        }
+        run_hook("recharge_user_finish");
         Message::sendInvoice($c, $t);
         return true;
     }
@@ -511,6 +548,6 @@ class Package
         $invoice .= Lang::pad("", '=') . "\n";
         $invoice .= Lang::pad($config['note'], ' ', 2) . "\n";
         $ui->assign('whatsapp', urlencode("```$invoice```"));
-        $ui->assign('in',$in);
+        $ui->assign('in', $in);
     }
 }

system/boot.php

@@ -78,9 +78,9 @@ $ui->assign('_domain', str_replace('www.', '', parse_url(APP_URL, PHP_URL_HOST))
 $ui->assign('_url', APP_URL . '/index.php?_route=');
 $ui->assign('_path', __DIR__);
 $ui->assign('_c', $config);
-$ui->assign('UPLOAD_PATH', $UPLOAD_PATH);
-$ui->assign('CACHE_PATH', $CACHE_PATH);
-$ui->assign('PAGES_PATH', $PAGES_PATH);
+$ui->assign('UPLOAD_PATH', str_replace($root_path, '',  $UPLOAD_PATH));
+$ui->assign('CACHE_PATH', str_replace($root_path, '',  $CACHE_PATH));
+$ui->assign('PAGES_PATH', str_replace($root_path, '',  $PAGES_PATH));
 $ui->assign('_system_menu', 'dashboard');
 
 function _msglog($type, $msg)

system/controllers/admin.php

@@ -5,6 +5,10 @@
  *  by https://t.me/ibnux
  **/
 
+if(Admin::getID()){
+    r2(U.'dashboard');
+}
+
 if (isset($routes['1'])) {
     $do = $routes['1'];
 } else {

system/controllers/customers.php

@@ -12,6 +12,9 @@ $ui->assign('_system_menu', 'customers');
 $action = $routes['1'];
 $ui->assign('_admin', $admin);
 
+if(empty($action)){
+    $action = 'list';
+}
 
 switch ($action) {
     case 'list':
@@ -274,7 +277,7 @@ switch ($action) {
                 } catch (Throwable $e) {
                 }
                 try {
-                    $c->delete();
+                    if($c) $c->delete();
                 } catch (Exception $e) {
                 } catch (Throwable $e) {
                 }

system/controllers/default.php

@@ -4,5 +4,10 @@
  *  by https://t.me/ibnux
  **/
 
-
-r2(APP_URL.'/index.php?_route=dashboard');
+if(Admin::getID()){
+    r2(U.'dashboard');
+}if(User::getID()){
+    r2(U.'home');
+}else{
+    r2(U.'login');
+}

system/controllers/export.php

@@ -62,10 +62,11 @@ switch ($action) {
         $title = ' Reports [' . $mdate . ']';
         $title = str_replace('-', ' ', $title);
 
+        $UPLOAD_URL_PATH = str_replace($root_path, '',  $UPLOAD_PATH);
         if (file_exists($UPLOAD_PATH . '/logo.png')) {
-            $logo = $UPLOAD_PATH . '/logo.png';
+            $logo = $UPLOAD_URL_PATH . '/logo.png';
         } else {
-            $logo = $UPLOAD_PATH . '/logo.default.png';
+            $logo = $UPLOAD_URL_PATH . '/logo.default.png';
         }
 
         if ($x) {
@@ -234,10 +235,12 @@ EOF;
 
         $title = ' Reports [' . $mdate . ']';
         $title = str_replace('-', ' ', $title);
+
+        $UPLOAD_URL_PATH = str_replace($root_path, '',  $UPLOAD_PATH);
         if (file_exists($UPLOAD_PATH . '/logo.png')) {
-            $logo = $UPLOAD_PATH . '/logo.png';
+            $logo = $UPLOAD_URL_PATH . '/logo.png';
         } else {
-            $logo = $UPLOAD_PATH . '/logo.default.png';
+            $logo = $UPLOAD_URL_PATH . '/logo.default.png';
         }
 
         if ($x) {

system/controllers/home.php

@@ -99,9 +99,6 @@ if (isset($_GET['recharge']) && !empty($_GET['recharge'])) {
             if(!$plan['enabled']){
                 r2(U . "home", 'e', 'Plan is not exists');
             }
-            if($plan['allow_purchase'] != 'yes'){
-                r2(U . "home", 'e', 'Cannot recharge this plan');
-            }
             if ($user['balance'] > $plan['price']) {
                 r2(U . "order/pay/$router[id]/$bill[plan_id]", 'e', 'Order Plan');
             } else {

system/controllers/login.php

@@ -5,6 +5,10 @@
  *  by https://t.me/ibnux
  **/
 
+if(User::getID()){
+    r2(U.'home');
+}
+
 if (isset($routes['1'])) {
     $do = $routes['1'];
 } else {

system/controllers/order.php

@@ -142,7 +142,7 @@ switch ($action) {
         $ui->display('user-orderView.tpl');
         break;
     case 'pay':
-        if ($_c['enable_balance'] != 'yes' && $config['allow_balance_transfer'] != 'yes') {
+        if ($config['enable_balance'] != 'yes') {
             r2(U . "order/package", 'e', Lang::T("Balance not enabled"));
         }
         $plan = ORM::for_table('tbl_plans')->where('enabled', '1')->find_one($routes['3']);
@@ -176,7 +176,7 @@ switch ($action) {
         }
         break;
     case 'send':
-        if ($_c['enable_balance'] != 'yes') {
+        if ($config['enable_balance'] != 'yes') {
             r2(U . "order/package", 'e', Lang::T("Balance not enabled"));
         }
         $ui->assign('_title', Lang::T('Buy for friend'));

system/controllers/settings.php

@@ -30,15 +30,16 @@ switch ($action) {
             r2(U . "settings/app", 's', 'Test Telegram has been send<br>Result: ' . $result);
         }
 
+        $UPLOAD_URL_PATH = str_replace($root_path,'',  $UPLOAD_PATH);
         if (file_exists($UPLOAD_PATH . DIRECTORY_SEPARATOR . 'logo.png')) {
-            $logo = $UPLOAD_PATH . DIRECTORY_SEPARATOR . 'logo.png?' . time();
+            $logo = $UPLOAD_URL_PATH . DIRECTORY_SEPARATOR . 'logo.png?' . time();
         } else {
-            $logo = $UPLOAD_PATH . DIRECTORY_SEPARATOR . 'logo.default.png';
+            $logo = $UPLOAD_URL_PATH . DIRECTORY_SEPARATOR . 'logo.default.png';
         }
         $ui->assign('logo', $logo);
-        if ($_c['radius_enable'] && empty($_c['radius_client'])) {
+        if ($config['radius_enable'] && empty($config['radius_client'])) {
             try {
-                $_c['radius_client'] = Radius::getClient();
+                $config['radius_client'] = Radius::getClient();
                 $ui->assign('_c', $_c);
             } catch (Exception $e) {
                 //ignore

system/cron.php

@@ -24,7 +24,7 @@ echo "Found " . count($d) . " user(s)\n";
 run_hook('cronjob'); #HOOK
 
 foreach ($d as $ds) {
-    if ($ds['type'] == 'Hotspot') {
+    if ($ds['type'] == 'Hotspot') { # HOTSPOT
         $date_now = strtotime(date("Y-m-d H:i:s"));
         $expiration = strtotime($ds['expiration'] . ' ' . $ds['time']);
         echo $ds['expiration'] . " : " . (($isCli) ? $ds['username'] : Lang::maskText($ds['username']));
@@ -82,7 +82,7 @@ foreach ($d as $ds) {
             }
         } else
             echo " : ACTIVE \r\n";
-    } else {
+    } else { # PPPOE
         $date_now = strtotime(date("Y-m-d H:i:s"));
         $expiration = strtotime($ds['expiration'] . ' ' . $ds['time']);
         echo $ds['expiration'] . " : " . (($isCli) ? $ds['username'] : Lang::maskText($ds['username']));

system/lan/english.json

@@ -456,5 +456,9 @@
     "Click_Here": "Click Here",
     "danger": "danger",
     "Logout_Successful": "Logout Successful",
-    "warning": "warning"
+    "warning": "warning",
+    "Users_Announcement": "Users Announcement",
+    "Customer_Announcement": "Customer Announcement",
+    "1_Period___1_Month__Expires_the_20th_of_each_month": "1 Period = 1 Month, Expires the 20th of each month",
+    "Period": "Period"
 }

system/updates.json

@@ -69,5 +69,8 @@
     "2024.2.23" : [
         "ALTER TABLE `tbl_transactions` ADD `admin_id` INT NOT NULL DEFAULT '1' AFTER `type`;",
         "ALTER TABLE `tbl_user_recharges` ADD `admin_id` INT NOT NULL DEFAULT '1' AFTER `type`;"
+    ],
+    "2024.3.3" : [
+		"ALTER TABLE `tbl_plans` CHANGE `validity_unit` `validity_unit` ENUM('Mins','Hrs','Days','Months','Period') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL;"
     ]
 }

ui/ui/alert.tpl

@@ -9,7 +9,7 @@
     <link rel="shortcut icon" href="ui/ui/images/logo.png" type="image/x-icon" />
     <link rel="stylesheet" href="ui/ui/styles/bootstrap.min.css">
     <link rel="stylesheet" href="ui/ui/styles/modern-AdminLTE.min.css">
-    <meta http-equiv="refresh" content="3; url={$url}">
+    <meta http-equiv="refresh" content="{$time}; url={$url}">
 </head>
 
 <body class="hold-transition lockscreen">
@@ -20,7 +20,7 @@
                 {$text}
             </div>
             <div class="panel-footer">
-                <a href="{$url}" id="button" class="btn btn-{$type} btn-block btn-block">{Lang::T('Click Here')} (3)</a>
+                <a href="{$url}" id="button" class="btn btn-{$type} btn-block btn-block">{Lang::T('Click Here')} ({$time})</a>
             </div>
         </div>
         <div class="lockscreen-footer text-center">
@@ -29,7 +29,7 @@
     </div>
 
     <script>
-        var time = 3;
+        var time = {$time};
         timer();
 
         function timer() {

ui/ui/app-notifications.tpl

@@ -15,13 +15,14 @@
                     <div class="form-group">
                         <label class="col-md-2 control-label">{Lang::T('Expired Notification Message')}</label>
                         <div class="col-md-6">
-                            <textarea class="form-control" id="expired"
-                                name="expired"
+                            <textarea class="form-control" id="expired" name="expired"
                                 placeholder="Hello [[name]], your internet package [[package]] has been expired"
                                 rows="3">{if $_json['expired']!=''}{Lang::htmlspecialchars($_json['expired'])}{else}Hello [[name]], your internet package [[package]] has been expired.{/if}</textarea>
                         </div>
                         <p class="help-block col-md-4">
-                            <b>[[name]]</b> will be replaced with Customer Name. <b>[[package]]</b> will be replaced with Package name. <b>[[price]]</b> will be replaced with Package price.
+                            <b>[[name]]</b> will be replaced with Customer Name.
+                            <b>[[package]]</b> will be replaced with Package name.
+                            <b>[[price]]</b> will be replaced with Package price.
                         </p>
                     </div>
                 </div>
@@ -33,7 +34,10 @@
                                 rows="3">{Lang::htmlspecialchars($_json['reminder_7_day'])}</textarea>
                         </div>
                         <p class="help-block col-md-4">
-                            <b>[[name]]</b> will be replaced with Customer Name. <b>[[package]]</b> will be replaced with Package name. <b>[[price]]</b> will be replaced with Package price.
+                            <b>[[name]]</b> will be replaced with Customer Name.
+                            <b>[[package]]</b> will be replaced with Package name.
+                            <b>[[price]]</b> will be replaced with Package price.
+                            <b>[[expired_date]]</b> will be replaced with Expiration date.
                         </p>
                     </div>
                 </div>
@@ -45,7 +49,10 @@
                                 rows="3">{Lang::htmlspecialchars($_json['reminder_3_day'])}</textarea>
                         </div>
                         <p class="help-block col-md-4">
-                            <b>[[name]]</b> will be replaced with Customer Name. <b>[[package]]</b> will be replaced with Package name. <b>[[price]]</b> will be replaced with Package price.
+                            <b>[[name]]</b> will be replaced with Customer Name.
+                            <b>[[package]]</b> will be replaced with Package name.
+                            <b>[[price]]</b> will be replaced with Package price.
+                            <b>[[expired_date]]</b> will be replaced with Expiration date.
                         </p>
                     </div>
                 </div>
@@ -57,7 +64,10 @@
                                 rows="3">{Lang::htmlspecialchars($_json['reminder_1_day'])}</textarea>
                         </div>
                         <p class="help-block col-md-4">
-                            <b>[[name]]</b> will be replaced with Customer Name. <b>[[package]]</b> will be replaced with Package name. <b>[[price]]</b> will be replaced with Package price.
+                            <b>[[name]]</b> will be replaced with Customer Name.
+                            <b>[[package]]</b> will be replaced with Package name.
+                            <b>[[price]]</b> will be replaced with Package price.
+                            <b>[[expired_date]]</b> will be replaced with Expiration date.
                         </p>
                     </div>
                 </div>
@@ -149,8 +159,7 @@
 
             <div class="panel-body">
                 <div class="form-group">
-                    <button class="btn btn-success btn-block"
-                        type="submit">{Lang::T('Save Changes')}</button>
+                    <button class="btn btn-success btn-block" type="submit">{Lang::T('Save Changes')}</button>
                 </div>
             </div>
         </div>

ui/ui/customers-edit.tpl

@@ -108,8 +108,7 @@
                     <div class="form-group">
                         <label class="col-md-2 control-label">{Lang::T('Attributes')}</label>
                         <div id="custom-fields-container" class="col-md-6">
-                            <button class="btn btn-success btn-sm" type="button"
-                                id="add-custom-field">+</button>
+                            <button class="btn btn-success btn-sm" type="button" id="add-custom-field">+</button>
                         </div>
                     </div>
                     <!--Customers Attributes add end -->
@@ -129,12 +128,12 @@
 </div>
 
 {literal}
-<script type="text/javascript">
-    document.addEventListener("DOMContentLoaded", function () {
+    <script type="text/javascript">
+        document.addEventListener("DOMContentLoaded", function() {
             var customFieldsContainer = document.getElementById('custom-fields-container');
             var addCustomFieldButton = document.getElementById('add-custom-field');
 
-        addCustomFieldButton.addEventListener('click', function () {
+            addCustomFieldButton.addEventListener('click', function() {
                 var fieldIndex = customFieldsContainer.children.length;
                 var newField = document.createElement('div');
                 newField.className = 'form-group';
@@ -154,14 +153,14 @@
                 customFieldsContainer.appendChild(newField);
             });
 
-        customFieldsContainer.addEventListener('click', function (event) {
+            customFieldsContainer.addEventListener('click', function(event) {
                 if (event.target.classList.contains('remove-custom-field')) {
                     var fieldContainer = event.target.parentNode.parentNode;
                     fieldContainer.parentNode.removeChild(fieldContainer);
                 }
             });
         });
-</script>
+    </script>
 {/literal}
 
 {include file="sections/footer.tpl"}

ui/ui/dashboard.tpl

@@ -60,8 +60,11 @@
         </div>
     </div>
 </div>
-<!-- solid sales graph -->
-{if $_c['hide_mrc'] != 'yes'}
+<div class="row">
+    <div class="col-md-7">
+
+        <!-- solid sales graph -->
+        {if $_c['hide_mrc'] != 'yes'}
             <div class="box box-solid ">
                 <div class="box-header">
                     <i class="fa fa-th"></i>
@@ -71,7 +74,8 @@
                     <div class="box-tools pull-right">
                         <button type="button" class="btn bg-teal btn-sm" data-widget="collapse"><i class="fa fa-minus"></i>
                         </button>
-                <a href="{$_url}settings/app#hide_dashboard_content" class="btn bg-teal btn-sm" ><i class="fa fa-times"></i>
+                        <a href="{$_url}settings/app#hide_dashboard_content" class="btn bg-teal btn-sm"><i
+                                class="fa fa-times"></i>
                         </a>
                     </div>
                 </div>
@@ -79,10 +83,10 @@
                     <canvas class="chart" id="chart" style="height: 250px;"></canvas>
                 </div>
             </div>
-{/if}
+        {/if}
 
-<!-- solid sales graph -->
-{if $_c['hide_tms'] != 'yes'}
+        <!-- solid sales graph -->
+        {if $_c['hide_tms'] != 'yes'}
             <div class="box box-solid ">
                 <div class="box-header">
                     <i class="fa fa-inbox"></i>
@@ -92,7 +96,8 @@
                     <div class="box-tools pull-right">
                         <button type="button" class="btn bg-teal btn-sm" data-widget="collapse"><i class="fa fa-minus"></i>
                         </button>
-                <a href="{$_url}settings/app#hide_dashboard_content" class="btn bg-teal btn-sm" ><i class="fa fa-times"></i>
+                        <a href="{$_url}settings/app#hide_dashboard_content" class="btn bg-teal btn-sm"><i
+                                class="fa fa-times"></i>
                         </a>
                     </div>
                 </div>
@@ -100,9 +105,7 @@
                     <canvas class="chart" id="salesChart" style="height: 250px;"></canvas>
                 </div>
             </div>
-{/if}
-<div class="row">
-    <div class="col-md-7">
+        {/if}
         {if $_c['disable_voucher'] != 'yes' && $stocks['unused']>0 || $stocks['used']>0}
             {if $_c['hide_vs'] != 'yes'}
                 <div class="panel panel-primary mb20 panel-hovered project-stats table-responsive">

ui/ui/pppoe-add.tpl

@@ -60,6 +60,7 @@
                         <label class="col-md-2 control-label">{Lang::T('Plan Validity')}</label>
                         <div class="col-md-4">
                             <input type="text" class="form-control" id="validity" name="validity">
+							<p class="help-block">{Lang::T('1 Period = 1 Month, Expires the 20th of each month')}</p>
                         </div>
                         <div class="col-md-2">
                             <select class="form-control" id="validity_unit" name="validity_unit">
@@ -67,6 +68,7 @@
                                 <option value="Hrs">{Lang::T('Hrs')}</option>
                                 <option value="Days">{Lang::T('Days')}</option>
                                 <option value="Months">{Lang::T('Months')}</option>
+								<option value="Period">{Lang::T('Period')}</option>
                             </select>
                         </div>
                     </div>

ui/ui/pppoe-edit.tpl

@@ -62,6 +62,7 @@
                         <div class="col-md-4">
                             <input type="text" class="form-control" id="validity" name="validity"
                                 value="{$d['validity']}">
+							<p class="help-block">{Lang::T('1 Period = 30 Month, Expires the 20th of each month')}</p>
                         </div>
                         <div class="col-md-2">
                             <select class="form-control" id="validity_unit" name="validity_unit">
@@ -73,6 +74,7 @@
                                 </option>
                                 <option value="Months" {if $d['validity_unit'] eq 'Months'} selected {/if}>
                                     {Lang::T('Months')}</option>
+								<option value="Period" {if $d['validity_unit'] eq 'Period'} selected {/if}>{Lang::T('Period')}</option>
                             </select>
                         </div>
                     </div>

ui/ui/sections/footer.tpl

@@ -27,7 +27,7 @@
                         if (el.addEventListener) { // all browsers except IE before version 9
                             el.addEventListener("click", function() {
                                 $(this).html(
-                                    `<span class="glyphicon glyphicon-refresh" role="status" aria-hidden="true"></span>`
+                                    `<span class="loading"></span>`
                                 );
                                 setTimeout(() => {
                                     $(this).prop("disabled", true);
@@ -37,7 +37,7 @@
                             if (el.attachEvent) { // IE before version 9
                                 el.attachEvent("click", function() {
                                     $(this).html(
-                                        `<span class="glyphicon glyphicon-refresh" role="status" aria-hidden="true"></span>`
+                                        `<span class="loading"></span>`
                                     );
                                     setTimeout(() => {
                                         $(this).prop("disabled", true);

ui/ui/sections/header.tpl

@@ -57,8 +57,36 @@
             max-height: 1em;
             line-height: 1em;
         }
-    </style>
 
+
+        .loading {
+          pointer-events: none;
+          opacity: 0.7;
+        }
+
+        .loading::after {
+          content: "";
+          display: inline-block;
+          width: 16px;
+          height: 16px;
+          vertical-align: middle;
+          margin-left: 10px;
+          border: 2px solid #fff;
+          border-top-color: transparent;
+          border-radius: 50%;
+          animation: spin 0.8s infinite linear;
+        }
+
+        @keyframes spin {
+          0% {
+            transform: rotate(0deg);
+          }
+
+          100% {
+            transform: rotate(360deg);
+          }
+        }
+      </style>
     {if isset($xheader)}
         {$xheader}
     {/if}
@@ -130,20 +158,11 @@
                     </li>
                     {$_MENU_AFTER_DASHBOARD}
                     {if !in_array($_admin['user_type'],['Report'])}
-                        <li class="{if $_system_menu eq 'customers'}active{/if} treeview">
-                            <a href="#">
-                                <i class="ion ion-android-contacts"></i> <span>{Lang::T('Customer')}</span>
-                                <span class="pull-right-container">
-                                    <i class="fa fa-angle-left pull-right"></i>
-                                </span>
+                        <li {if $_system_menu eq 'customers'}class="active" {/if}>
+                            <a href="{$_url}customers">
+                                <i class="fa fa-users"></i>
+                                <span>{Lang::T('Customer')}</span>
                             </a>
-                            <ul class="treeview-menu">
-                                <li {if $_routes[1] eq 'add'}class="active" {/if}><a href="{$_url}customers/add"><i
-                                            class="fa fa-user-plus"></i> {Lang::T('Add New Contact')}</a></li>
-                                <li {if $_routes[1] eq 'list'}class="active" {/if}><a href="{$_url}customers/list"><i
-                                            class="fa fa-users"></i> {Lang::T('List Contact')}</a></li>
-                                {$_MENU_CUSTOMERS}
-                            </ul>
                         </li>
                         {$_MENU_AFTER_CUSTOMERS}
                         <li class="{if $_system_menu eq 'prepaid'}active{/if} treeview">
@@ -258,6 +277,8 @@
                                         href="{$_url}pages/Voucher">{Lang::T('Voucher')} Template</a></li>
                                 <li {if $_routes[1] eq 'Announcement'}class="active" {/if}><a
                                         href="{$_url}pages/Announcement">{Lang::T('Announcement')}</a></li>
+								<li {if $_routes[1] eq 'Announcement_Customer'}class="active" {/if}><a
+                                        href="{$_url}pages/Announcement_Customer">{Lang::T('Customer Announcement')}</a></li>
                                 <li {if $_routes[1] eq 'Registration_Info'}class="active" {/if}><a
                                         href="{$_url}pages/Registration_Info">{Lang::T('Registration Info')}</a></li>
                                 <li {if $_routes[1] eq 'Privacy_Policy'}class="active" {/if}><a

ui/ui/sections/user-footer.tpl

@@ -85,7 +85,7 @@
                         if (el.addEventListener) { // all browsers except IE before version 9
                             el.addEventListener("click", function() {
                                 $(this).html(
-                                    `<span class="glyphicon glyphicon-refresh" role="status" aria-hidden="true"></span>`
+                                    `<span class="loading"></span>`
                                 );
                                 setTimeout(() => {
                                     $(this).prop("disabled", true);
@@ -95,7 +95,7 @@
                             if (el.attachEvent) { // IE before version 9
                                 el.attachEvent("click", function() {
                                     $(this).html(
-                                        `<span class="glyphicon glyphicon-refresh" role="status" aria-hidden="true"></span>`
+                                        `<span class="loading"></span>`
                                     );
                                     setTimeout(() => {
                                         $(this).prop("disabled", true);

ui/ui/sections/user-header.tpl

@@ -37,6 +37,35 @@
                 margin-top: 100px;
             }
         }
+    
+        
+        .loading {
+          pointer-events: none;
+          opacity: 0.7;
+        }
+    
+        .loading::after {
+          content: "";
+          display: inline-block;
+          width: 16px;
+          height: 16px;
+          vertical-align: middle;
+          margin-left: 10px;
+          border: 2px solid #fff;
+          border-top-color: transparent;
+          border-radius: 50%;
+          animation: spin 0.8s infinite linear;
+        }
+    
+        @keyframes spin {
+          0% {
+            transform: rotate(0deg);
+          }
+    
+          100% {
+            transform: rotate(360deg);
+          }
+        }
       </style>
 
     {if isset($xheader)}

ui/ui/user-dashboard.tpl

@@ -53,7 +53,10 @@
                 <h3 class="box-title">{Lang::T('Announcement')}</h3>
             </div>
             <div class="box-body">
-                {include file="$_path/../pages/Announcement.html"}
+            {$Announcement_Customer = "{$PAGES_PATH}/Announcement_Customer.html"}
+            {if file_exists($Announcement_Customer)}
+                {include file=$Announcement_Customer}
+            {/if}
             </div>
         </div>
     </div>
@@ -111,7 +114,7 @@
                         <div class="box-header">
                             <h3 class="box-title">{$_bill['routers']}</h3>
                             <div class="btn-group pull-right">
-                                {if $_bill['type'] != 'Hotspot'}
+                                {if $_bill['type'] == 'Hotspot'}
                                     {if $_c['hotspot_plan']==''}Hotspot Plan{else}{$_c['hotspot_plan']}{/if}
                                 {else}
                                     {if $_c['pppoe_plan']==''}PPPOE Plan{else}{$_c['pppoe_plan']}{/if}

ui/ui/user-login.tpl

@@ -32,7 +32,10 @@
                 <div class="panel panel-info">
                     <div class="panel-heading">{Lang::T('Announcement')}</div>
                     <div class="panel-body">
-                        {include file="$_path/../pages/Announcement.html"}
+                    {$Announcement = "{$PAGES_PATH}/Announcement.html"}
+                    {if file_exists($Announcement)}
+                        {include file=$Announcement}
+                    {/if}
                     </div>
                 </div>
             </div>

update.php

@@ -77,6 +77,9 @@ if (empty($step)) {
     // remove downloaded zip
     if (file_exists($file)) unlink($file);
 } else if ($step == 3) {
+    deleteFolder('system/autoload/');
+    deleteFolder('system/vendor/');
+    deleteFolder('ui/ui/');
     copyFolder($folder, pathFixer('./'));
     deleteFolder('install/');
     deleteFolder($folder);

version.json

@@ -1,3 +1,3 @@
 {
-    "version": "2024.2.26"
+    "version": "2024.3.3"
 }