Change the view of Attributes Customer

2024.3.5
Merge pull request #118 from gerandonk/Development
2024-03-06 11:15:45 +07:00 · 2024-03-05 16:20:18 +07:00 · 2024-03-05 16:18:32 +07:00 · 2024-03-05 16:08:33 +07:00 · 2024-03-05 11:15:38 +07:00 · 2024-03-05 11:15:26 +07:00
30 changed files with 455 additions and 204 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -2,6 +2,23 @@

 # CHANGELOG

+## 2024.3.6
+
+- change attributes view
+
+## 2024.3.4
+
+- add [[username]] for reminder
+- fix agent show when editing
+- fix password admin when sending notification
+- add file exists for pages
+
+## 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
--- a/init.php
+++ b/init.php
@ -238,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;
@ -251,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();
 }


--- a/install/phpnuxbill.sql
+++ b/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',
--- a/pages_template/Announcement.html
+++ b/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.
--- a/pages_template/Announcement_Customer.html
+++ b/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
--- a/system/autoload/Message.php
+++ b/system/autoload/Message.php
@ -60,29 +60,30 @@ class Message
        global $config;
        run_hook('send_whatsapp'); #HOOK
        if (!empty($config['wa_url'])) {
-            $waurl = str_replace('[number]', urlencode($phone), $config['wa_url']);
+            $waurl = str_replace('[number]', urlencode(Lang::phoneFormat($phone)), $config['wa_url']);
            $waurl = str_replace('[text]', urlencode($txt), $waurl);
            return Http::getData($waurl);
        }
    }

-    public static function sendPackageNotification($phone, $name, $package, $price, $message, $via)
+    public static function sendPackageNotification($customer, $package, $price, $message, $via)
    {
        global $u;
-        $msg = str_replace('[[name]]', $name, $message);
+        $msg = str_replace('[[name]]', $customer['fullname'], $message);
+        $msg = str_replace('[[username]]', $customer['username'], $msg);
        $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($customer['phonenumber']) && strlen($customer['phonenumber']) > 5
            && !empty($message) && in_array($via, ['sms', 'wa'])
        ) {
            if ($via == 'sms') {
-                Message::sendSMS($phone, $msg);
+                Message::sendSMS($customer['phonenumber'], $msg);
            } else if ($via == 'wa') {
-                Message::sendWhatsapp($phone, $msg);
+                Message::sendWhatsapp($customer['phonenumber'], $msg);
            }
        }
        return "$via: $msg";
--- a/system/autoload/Package.php
+++ b/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");
@ -31,6 +31,14 @@ class Package

        $c = ORM::for_table('tbl_customers')->where('id', $id_customer)->find_one();
        $p = ORM::for_table('tbl_plans')->where('id', $plan_id)->where('enabled', '1')->find_one();
+		$f = ORM::for_table('tbl_customers_fields')->where('field_name', 'Expired Date')->where('customer_id', $c['id'])->find_one();
+		if (!$f) {
+			$f = ORM::for_table('tbl_customers_fields')->create();
+			$f->customer_id = $c['id'];
+			$f->field_name = 'Expired Date';
+			$f->field_value = 20;
+			$f->save();
+		}

        if ($router_name == 'balance') {
            // insert table transactions
@ -94,9 +102,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-{$f['field_value']}", 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-{$f['field_value']}", strtotime('+0 month'));
+			} else {
+				$date_exp = date("Y-m-{$f['field_value']}", 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 +139,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-{$f['field_value']}", 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'];
@ -177,6 +203,27 @@ class Package
                    $t->admin_id = '0';
                }
                $t->save();
+				
+				// insert to fields
+				$fl = ORM::for_table('tbl_customers_fields')->where('field_name', 'Invoice')->where('customer_id', $c['id'])->find_one();
+				if (!$fl) {
+					$fl = ORM::for_table('tbl_customers_fields')->create();
+					$fl->customer_id = $c['id'];
+					$fl->field_name = 'Invoice';
+					$fl->field_value = $p['price'];
+					$fl->save();
+				} else {
+					$fl->customer_id = $c['id'];
+					$fl->field_value = $p['price'];
+					$fl->save();
+				}
+				
+
+				Message::sendTelegram("#u$c[username] $c[fullname] #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");
@ -207,12 +254,23 @@ class Package
                }
                $d->save();
 				
+				// Calculating Price
+				$sd = new DateTime("$date_only");
+				$ed = new DateTime("$date_exp");
+				$td = $ed->diff($sd);
+				$fd = $td->format("%a");
+				$gi = ($p['price']/30)*$fd;
+
                // insert table transactions
                $t = ORM::for_table('tbl_transactions')->create();
                $t->invoice = "INV-" . Package::_raid(5);
                $t->username = $c['username'];
                $t->plan_name = $p['name_plan'];
+				if ($gi > $p['price']) {
 					$t->price = $p['price'];
+				} else {
+					$t->price = $gi;
+				}                
                $t->recharged_on = $date_only;
                $t->recharged_time = $time_only;
                $t->expiration = $date_exp;
@ -226,12 +284,32 @@ class Package
                    $t->admin_id = '0';
                }
                $t->save();
+				
+				// insert to fields
+				$fl = ORM::for_table('tbl_customers_fields')->where('field_name', 'Invoice')->where('customer_id', $c['id'])->find_one();
+				if (!$fl) {
+					$fl = ORM::for_table('tbl_customers_fields')->create();
+					$fl->customer_id = $c['id'];
+					$fl->field_name = 'Invoice';
+					if ($gi > $p['price']) {
+						$fl->field_value = $p['price'];
+					} else {
+						$fl->field_value = $gi;
 					}								
-            Message::sendTelegram("#u$c[username] #buy #Hotspot \n" . $p['name_plan'] .
+					$fl->save();
+				} else {
+					$fl->customer_id = $c['id'];
+					$fl->field_value = $p['price'];
+					$fl->save();
+				}
+
+				Message::sendTelegram("#u$c[username] $c[fullname] #buy #Hotspot \n" . $p['name_plan'] .
                "\nRouter: " . $router_name .
                "\nGateway: " . $gateway .
                "\nChannel: " . $channel .
                "\nPrice: " . Lang::moneyFormat($p['price']));
+            }
+
        } else {

            if ($b) {
@ -240,6 +318,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-{$f['field_value']}", 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'];
@ -301,6 +382,27 @@ class Package
                    $t->admin_id = '0';
                }
                $t->save();
+				
+				// insert to fields
+				$fl = ORM::for_table('tbl_customers_fields')->where('field_name', 'Invoice')->where('customer_id', $c['id'])->find_one();
+				$gp = $gi;
+				if (!$fl) {
+					$fl = ORM::for_table('tbl_customers_fields')->create();
+					$fl->customer_id = $c['id'];
+					$fl->field_name = 'Invoice';
+					$fl->field_value = $p['price'];								
+					$fl->save();
+				} else {
+					$fl->customer_id = $c['id'];
+					$fl->field_value = $p['price'];
+					$fl->save();
+				}
+
+				Message::sendTelegram("#u$c[username] $c[fullname] #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");
@ -331,12 +433,23 @@ class Package
                }
                $d->save();
 				
+				// Calculating Price
+				$sd = new DateTime("$date_only");
+				$ed = new DateTime("$date_exp");
+				$td = $ed->diff($sd);
+				$fd = $td->format("%a");
+				$gi = ($p['price']/30)*$fd;
+
                // insert table transactions
                $t = ORM::for_table('tbl_transactions')->create();
                $t->invoice = "INV-" . Package::_raid(5);
                $t->username = $c['username'];
                $t->plan_name = $p['name_plan'];
+                if ($gi > $p['price']) {
 					$t->price = $p['price'];
+				} else {
+					$t->price = $gi;
+				}
                $t->recharged_on = $date_only;
                $t->recharged_time = $time_only;
                $t->expiration = $date_exp;
@ -350,14 +463,34 @@ class Package
                }
                $t->type = "PPPOE";
                $t->save();
+				
+				// insert to fields
+				$fl = ORM::for_table('tbl_customers_fields')->where('field_name', 'Invoice')->where('customer_id', $c['id'])->find_one();
+				if (!$fl) {
+					$fl = ORM::for_table('tbl_customers_fields')->create();
+					$fl->customer_id = $c['id'];
+					$fl->field_name = 'Invoice';
+					if ($gi > $p['price']) {
+						$fl->field_value = $p['price'];
+					} else {
+						$fl->field_value = $gi;
 					}								
-            Message::sendTelegram("#u$c[username] #buy #PPPOE \n" . $p['name_plan'] .
+					$fl->save();
+				} else {
+					$fl->customer_id = $c['id'];
+					$fl->field_value = $p['price'];
+					$fl->save();
+				}
+
+				Message::sendTelegram("#u$c[username] $c[fullname] #buy #PPPOE \n" . $p['name_plan'] .
                "\nRouter: " . $router_name .
                "\nGateway: " . $gateway .
                "\nChannel: " . $channel .
                "\nPrice: " . Lang::moneyFormat($p['price']));
            }

+        }
+        run_hook("recharge_user_finish");
        Message::sendInvoice($c, $t);
        return true;
    }
--- a/system/boot.php
+++ b/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)
--- a/system/controllers/export.php
+++ b/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) {
--- a/system/controllers/home.php
+++ b/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 {
--- a/system/controllers/settings.php
+++ b/system/controllers/settings.php
@ -30,10 +30,11 @@ 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 ($config['radius_enable'] && empty($config['radius_client'])) {
@ -495,11 +496,11 @@ switch ($action) {
        $date_now = date("Y-m-d H:i:s");
        run_hook('add_admin'); #HOOK
        if ($msg == '') {
-            $password = Password::_crypt($password);
+            $passwordC = Password::_crypt($password);
            $d = ORM::for_table('tbl_users')->create();
            $d->username = $username;
            $d->fullname = $fullname;
-            $d->password = $password;
+            $d->password = $passwordC;
            $d->user_type = $user_type;
            $d->phone = $phone;
            $d->email = $email;
--- a/system/cron.php
+++ b/system/cron.php
@ -54,7 +54,7 @@ foreach ($d as $ds) {
                }
                Mikrotik::removeHotspotActiveUser($client, $c['username']);
            }
-            echo Message::sendPackageNotification($c['phonenumber'], $c['fullname'], $u['namebp'], $price, $textExpired, $config['user_notification_expired'])."\n";
+            echo Message::sendPackageNotification($c, $u['namebp'], $price, $textExpired, $config['user_notification_expired'])."\n";
            //update database user dengan status off
            $u->status = 'off';
            $u->save();
@ -109,7 +109,7 @@ foreach ($d as $ds) {
                }
                Mikrotik::removePpoeActive($client, $c['username']);
            }
-            echo Message::sendPackageNotification($c['phonenumber'], $c['fullname'], $u['namebp'], $price, $textExpired, $config['user_notification_expired'])."\n";
+            echo Message::sendPackageNotification($c, $u['namebp'], $price, $textExpired, $config['user_notification_expired'])."\n";

            $u->status = 'off';
            $u->save();
--- a/system/cron_reminder.php
+++ b/system/cron_reminder.php
@ -40,11 +40,11 @@ foreach ($d as $ds) {
        $c = ORM::for_table('tbl_customers')->where('id', $ds['customer_id'])->find_one();
        $price = Lang::moneyFormat($p['price']);
        if ($ds['expiration'] == $day7) {
-            echo Message::sendPackageNotification($c['phonenumber'], $c['fullname'], $p['name_plan'], $price, Lang::getNotifText('reminder_7_day'), $config['user_notification_reminder']) . "\n";
+            echo Message::sendPackageNotification($c, $p['name_plan'], $price, Lang::getNotifText('reminder_7_day'), $config['user_notification_reminder']) . "\n";
        } else if ($ds['expiration'] == $day3) {
-            echo Message::sendPackageNotification($c['phonenumber'], $c['fullname'], $p['name_plan'], $price, Lang::getNotifText('reminder_3_day'), $config['user_notification_reminder']) . "\n";
+            echo Message::sendPackageNotification($c, $p['name_plan'], $price, Lang::getNotifText('reminder_3_day'), $config['user_notification_reminder']) . "\n";
        } else if ($ds['expiration'] == $day1) {
-            echo Message::sendPackageNotification($c['phonenumber'], $c['fullname'], $p['name_plan'], $price, Lang::getNotifText('reminder_1_day'), $config['user_notification_reminder']) . "\n";
+            echo Message::sendPackageNotification($c, $p['name_plan'], $price, Lang::getNotifText('reminder_1_day'), $config['user_notification_reminder']) . "\n";
        }
    }
 }
--- a/system/lan/english.json
+++ b/system/lan/english.json
@ -456,5 +456,10 @@
    "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",
+    "Add": "Add"
 }
--- a/system/updates.json
+++ b/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;"
    ]
 }
--- a/ui/ui/admin-login.tpl
+++ b/ui/ui/admin-login.tpl
@ -4,7 +4,7 @@
 <head>
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <title>{$_title} - {Lang::T('Login')}</title>
+    <title>{Lang::T('Login')} - {$_c['CompanyName']}</title>
    <link rel="shortcut icon" href="ui/ui/images/logo.png" type="image/x-icon" />

    <link rel="stylesheet" href="ui/ui/styles/bootstrap.min.css">
@ -16,7 +16,7 @@
 <body class="hold-transition login-page">
    <div class="login-box">
        <div class="login-logo">
-            <b>Nux</b>Billing
+            {$_c['CompanyName']}
        </div>
        <div class="login-box-body">
            <p class="login-box-msg">{Lang::T('Enter Admin Area')}</p>
--- a/ui/ui/alert.tpl
+++ b/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() {
--- a/ui/ui/app-notifications.tpl
+++ b/ui/ui/app-notifications.tpl
@ -127,6 +127,7 @@
                        </p>
                    </div>
                </div>
+                {if $_c['enable_balance'] == 'yes'}
                    <div class="panel-body">
                        <div class="form-group">
                            <label class="col-md-2 control-label">{Lang::T('Send Balance')}</label>
@ -155,6 +156,7 @@
                            </p>
                        </div>
                    </div>
+                {/if}
            </div>

            <div class="panel-body">
--- a/ui/ui/customers-add.tpl
+++ b/ui/ui/customers-add.tpl
@ -1,15 +1,14 @@
 {include file="sections/header.tpl"}

+<form class="form-horizontal" method="post" role="form" action="{$_url}customers/add-post">
    <div class="row">
-    <div class="col-sm-12 col-md-12">
+        <div class="col-md-6">
            <div class="panel panel-primary panel-hovered panel-stacked mb30">
                <div class="panel-heading">{Lang::T('Add New Contact')}</div>
                <div class="panel-body">
-
-                <form class="form-horizontal" method="post" role="form" action="{$_url}customers/add-post">
                    <div class="form-group">
-                        <label class="col-md-2 control-label">{Lang::T('Username')}</label>
-                        <div class="col-md-6">
+                        <label class="col-md-3 control-label">{Lang::T('Username')}</label>
+                        <div class="col-md-9">
                            <div class="input-group">
                                {if $_c['country_code_phone']!= ''}
                                    <span class="input-group-addon" id="basic-addon1">+</span>
@ -23,20 +22,20 @@
                        </div>
                    </div>
                    <div class="form-group">
-                        <label class="col-md-2 control-label">{Lang::T('Full Name')}</label>
-                        <div class="col-md-6">
+                        <label class="col-md-3 control-label">{Lang::T('Full Name')}</label>
+                        <div class="col-md-9">
                            <input type="text" required class="form-control" id="fullname" name="fullname">
                        </div>
                    </div>
                    <div class="form-group">
-                        <label class="col-md-2 control-label">{Lang::T('Email')}</label>
-                        <div class="col-md-6">
+                        <label class="col-md-3 control-label">{Lang::T('Email')}</label>
+                        <div class="col-md-9">
                            <input type="email" class="form-control" id="email" name="email">
                        </div>
                    </div>
                    <div class="form-group">
-                        <label class="col-md-2 control-label">{Lang::T('Phone Number')}</label>
-                        <div class="col-md-6">
+                        <label class="col-md-3 control-label">{Lang::T('Phone Number')}</label>
+                        <div class="col-md-9">
                            <div class="input-group">
                                {if $_c['country_code_phone']!= ''}
                                    <span class="input-group-addon" id="basic-addon1">+</span>
@ -50,15 +49,15 @@
                        </div>
                    </div>
                    <div class="form-group">
-                        <label class="col-md-2 control-label">{Lang::T('Password')}</label>
-                        <div class="col-md-6">
-                            <input type="password" class="form-control" autocomplete="off" required id="password"
+                        <label class="col-md-3 control-label">{Lang::T('Password')}</label>
+                        <div class="col-md-9">
+                            <input type="password" class="form-control" autocomplete="off" required id="password" value="{rand(000000,999999)}"
                                name="password" onmouseleave="this.type = 'password'" onmouseenter="this.type = 'text'">
                        </div>
                    </div>
                    <div class="form-group">
-                        <label class="col-md-2 control-label">{Lang::T('PPPOE Password')}</label>
-                        <div class="col-md-6">
+                        <label class="col-md-3 control-label">{Lang::T('PPPOE Password')}</label>
+                        <div class="col-md-9">
                            <input type="password" class="form-control" id="pppoe_password" name="pppoe_password"
                                value="{$d['pppoe_password']}" onmouseleave="this.type = 'password'"
                                onmouseenter="this.type = 'text'">
@ -68,14 +67,14 @@
                        </div>
                    </div>
                    <div class="form-group">
-                        <label class="col-md-2 control-label">{Lang::T('Address')}</label>
-                        <div class="col-md-6">
+                        <label class="col-md-3 control-label">{Lang::T('Address')}</label>
+                        <div class="col-md-9">
                            <textarea name="address" id="address" class="form-control"></textarea>
                        </div>
                    </div>
                    <div class="form-group">
-                        <label class="col-md-2 control-label">{Lang::T('Service Type')}</label>
-                        <div class="col-md-6">
+                        <label class="col-md-3 control-label">{Lang::T('Service Type')}</label>
+                        <div class="col-md-9">
                            <select class="form-control" id="service_type" name="service_type">
                                <option value="Hotspot" {if $d['service_type'] eq 'Hotspot' }selected{/if}>Hotspot
                                </option>
@ -84,30 +83,33 @@
                            </select>
                        </div>
                    </div>
-                    <!-- Customers Attributes add start -->
-                    <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>
                </div>
            </div>
+        </div>
+        <div class="col-md-6">
+            <div class="panel panel-primary panel-hovered panel-stacked mb30">
+                <div class="panel-heading">{Lang::T('Attributes')}</div>
+                <div class="panel-body">
+                    <!-- Customers Attributes add start -->
+                    <div id="custom-fields-container">
+
+                    </div>
                    <!-- Customers Attributes add end -->
-
-                    <div class="form-group">
-                        <div class="col-lg-offset-2 col-lg-10">
+                </div>
+                <div class="panel-footer">
+                    <button class="btn btn-success btn-block" type="button"
+                        id="add-custom-field">{Lang::T('Add')}</button>
+                </div>
+            </div>
+        </div>
+    </div>
+    <center>
        <button class="btn btn-primary" type="submit">
            {Lang::T('Save Changes')}
        </button>
-                            Or <a href="{$_url}customers/list">{Lang::T('Cancel')}</a>
-                        </div>
-                    </div>
+        <br><a href="{$_url}customers/list" class="btn btn-link">{Lang::T('Cancel')}</a>
+    </center>
 </form>
-            </div>
-        </div>
-    </div>
-</div>
-</div>
 {literal}
    <script type="text/javascript">
        document.addEventListener("DOMContentLoaded", function() {
@ -119,12 +121,10 @@
                var newField = document.createElement('div');
                newField.className = 'form-group';
                newField.innerHTML = `
-                <label class="col-md-2 control-label">Name:</label>
-                <div class="col-md-3">
+                <div class="col-md-4">
                    <input type="text" class="form-control" name="custom_field_name[]" placeholder="Name">
                </div>
-                <label class="col-md-2 control-label">Value:</label>
-                <div class="col-md-3">
+                <div class="col-md-6">
                    <input type="text" class="form-control" name="custom_field_value[]" placeholder="Value">
                </div>
                <div class="col-md-2">
--- a/ui/ui/customers-edit.tpl
+++ b/ui/ui/customers-edit.tpl
@ -1,16 +1,15 @@
 {include file="sections/header.tpl"}

+<form class="form-horizontal" method="post" role="form" action="{$_url}customers/edit-post">
    <div class="row">
-    <div class="col-sm-12 col-md-12">
+        <div class="col-md-6">
            <div class="panel panel-primary panel-hovered panel-stacked mb30">
                <div class="panel-heading">{Lang::T('Edit Contact')}</div>
                <div class="panel-body">
-
-                <form class="form-horizontal" method="post" role="form" action="{$_url}customers/edit-post">
                    <input type="hidden" name="id" value="{$d['id']}">
                    <div class="form-group">
-                        <label class="col-md-2 control-label">{Lang::T('Username')}</label>
-                        <div class="col-md-6">
+                        <label class="col-md-3 control-label">{Lang::T('Username')}</label>
+                        <div class="col-md-9">
                            <div class="input-group">
                                {if $_c['country_code_phone']!= ''}
                                    <span class="input-group-addon" id="basic-addon1">+</span>
@ -25,21 +24,21 @@
                        </div>
                    </div>
                    <div class="form-group">
-                        <label class="col-md-2 control-label">{Lang::T('Full Name')}</label>
-                        <div class="col-md-6">
+                        <label class="col-md-3 control-label">{Lang::T('Full Name')}</label>
+                        <div class="col-md-9">
                            <input type="text" class="form-control" id="fullname" name="fullname"
                                value="{$d['fullname']}">
                        </div>
                    </div>
                    <div class="form-group">
-                        <label class="col-md-2 control-label">{Lang::T('Email')}</label>
-                        <div class="col-md-6">
+                        <label class="col-md-3 control-label">{Lang::T('Email')}</label>
+                        <div class="col-md-9">
                            <input type="email" class="form-control" id="email" name="email" value="{$d['email']}">
                        </div>
                    </div>
                    <div class="form-group">
-                        <label class="col-md-2 control-label">{Lang::T('Phone Number')}</label>
-                        <div class="col-md-6">
+                        <label class="col-md-3 control-label">{Lang::T('Phone Number')}</label>
+                        <div class="col-md-9">
                            <div class="input-group">
                                {if $_c['country_code_phone']!= ''}
                                    <span class="input-group-addon" id="basic-addon1">+</span>
@ -53,8 +52,8 @@
                        </div>
                    </div>
                    <div class="form-group">
-                        <label class="col-md-2 control-label">{Lang::T('Password')}</label>
-                        <div class="col-md-6">
+                        <label class="col-md-3 control-label">{Lang::T('Password')}</label>
+                        <div class="col-md-9">
                            <input type="password" autocomplete="off" class="form-control" id="password" name="password"
                                onmouseleave="this.type = 'password'" onmouseenter="this.type = 'text'"
                                value="{$d['password']}">
@ -62,8 +61,8 @@
                        </div>
                    </div>
                    <div class="form-group">
-                        <label class="col-md-2 control-label">{Lang::T('PPPOE Password')}</label>
-                        <div class="col-md-6">
+                        <label class="col-md-3 control-label">{Lang::T('PPPOE Password')}</label>
+                        <div class="col-md-9">
                            <input type="password" autocomplete="off" class="form-control" id="pppoe_password"
                                name="pppoe_password" value="{$d['pppoe_password']}"
                                onmouseleave="this.type = 'password'" onmouseenter="this.type = 'text'">
@ -73,14 +72,14 @@
                        </div>
                    </div>
                    <div class="form-group">
-                        <label class="col-md-2 control-label">{Lang::T('Address')}</label>
-                        <div class="col-md-6">
+                        <label class="col-md-3 control-label">{Lang::T('Address')}</label>
+                        <div class="col-md-9">
                            <textarea name="address" id="address" class="form-control">{$d['address']}</textarea>
                        </div>
                    </div>
                    <div class="form-group">
-                        <label class="col-md-2 control-label">{Lang::T('Service Type')}</label>
-                        <div class="col-md-6">
+                        <label class="col-md-3 control-label">{Lang::T('Service Type')}</label>
+                        <div class="col-md-9">
                            <select class="form-control" id="service_type" name="service_type">
                                <option value="Hotspot" {if $d['service_type'] eq 'Hotspot' }selected{/if}>Hotspot
                                </option>
@ -89,43 +88,49 @@
                            </select>
                        </div>
                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="col-md-6">
+            <div class="panel panel-primary panel-hovered panel-stacked mb30">
+                <div class="panel-heading">{Lang::T('Attributes')}</div>
+                <div class="panel-body">
                    <!--Customers Attributes edit start -->
                    {if $customFields}
                        {foreach $customFields as $customField}
                            <div class="form-group">
-                                <label class="col-md-2 control-label"
+                                <label class="col-md-4 control-label"
                                    for="{$customField.field_name}">{$customField.field_name}</label>
                                <div class="col-md-6">
                                    <input class="form-control" type="text" name="custom_fields[{$customField.field_name}]"
                                        id="{$customField.field_name}" value="{$customField.field_value}">
                                </div>
+                                <label class="col-md-2">
                                <input type="checkbox" name="delete_custom_fields[]" value="{$customField.field_name}"> Delete
+                                </label>
                            </div>
                        {/foreach}
                    {/if}
                    <!--Customers Attributes edit end -->
                    <!-- Customers Attributes add start -->
-                    <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>
-                        </div>
+                    <div id="custom-fields-container">
                    </div>
                    <!-- Customers Attributes add end -->
-                    <div class="form-group">
-                        <div class="col-lg-offset-2 col-lg-10">
+                </div>
+                <div class="panel-footer">
+                    <button class="btn btn-success btn-block" type="button"
+                        id="add-custom-field">{Lang::T('Add')}</button>
+                </div>
+            </div>
+        </div>
+    </div>
+    <center>
        <button class="btn btn-primary" type="submit">
            {Lang::T('Save Changes')}
        </button>
-                            Or <a href="{$_url}customers/list">{Lang::T('Cancel')}</a>
-                        </div>
-                    </div>
+        <br><a href="{$_url}customers/list" class="btn btn-link">{Lang::T('Cancel')}</a>
+    </center>
 </form>
-            </div>
-        </div>
-    </div>
-</div>
-</div>

 {literal}
    <script type="text/javascript">
@ -138,12 +143,10 @@
                var newField = document.createElement('div');
                newField.className = 'form-group';
                newField.innerHTML = `
-                <label class="col-md-2 control-label">Name:</label>
-                <div class="col-md-3">
+                <div class="col-md-4">
                    <input type="text" class="form-control" name="custom_field_name[]" placeholder="Name">
                </div>
-                <label class="col-md-2 control-label">Value:</label>
-                <div class="col-md-3">
+                <div class="col-md-6">
                    <input type="text" class="form-control" name="custom_field_value[]" placeholder="Value">
                </div>
                <div class="col-md-2">
--- a/ui/ui/pppoe-add.tpl
+++ b/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>
--- a/ui/ui/pppoe-edit.tpl
+++ b/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>
--- a/ui/ui/sections/footer.tpl
+++ b/ui/ui/sections/footer.tpl
@ -27,21 +27,21 @@
                        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);
-                                }, 100);
+                                // setTimeout(() => {
+                                //     $(this).prop("disabled", true);
+                                // }, 100);
                            }, false);
                        } else {
                            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);
-                                    }, 100);
+                                    // setTimeout(() => {
+                                    //     $(this).prop("disabled", true);
+                                    // }, 100);
                                });
                            }
                        }
--- a/ui/ui/sections/header.tpl
+++ b/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}
@ -155,8 +183,10 @@
                                {/if}
                                <li {if $_routes[1] eq 'recharge'}class="active" {/if}><a
                                        href="{$_url}prepaid/recharge">{Lang::T('Recharge Account')}</a></li>
+                                {if $_c['enable_balance'] == 'yes'}
                                    <li {if $_routes[1] eq 'deposit'}class="active" {/if}><a
                                            href="{$_url}prepaid/deposit">{Lang::T('Refill Balance')}</a></li>
+                                {/if}
                                {$_MENU_PREPAID}
                            </ul>
                        </li>
@ -177,8 +207,10 @@
                                        href="{$_url}services/pppoe">{Lang::T('PPPOE Plans')}</a></li>
                                <li {if $_routes[1] eq 'list'}class="active" {/if}><a
                                        href="{$_url}bandwidth/list">{Lang::T('Bandwidth Plans')}</a></li>
+                                {if $_c['enable_balance'] == 'yes'}
                                    <li {if $_routes[1] eq 'balance'}class="active" {/if}><a
                                            href="{$_url}services/balance">{Lang::T('Balance Plans')}</a></li>
+                                {/if}
                                {$_MENU_SERVICES}
                            </ul>
                        </li>
@ -249,6 +281,9 @@
                                        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
--- a/ui/ui/sections/user-footer.tpl
+++ b/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);
--- a/ui/ui/sections/user-header.tpl
+++ b/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)}
--- a/ui/ui/user-dashboard.tpl
+++ b/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>
--- a/ui/ui/user-login.tpl
+++ b/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>
--- a/ui/ui/users-edit.tpl
+++ b/ui/ui/users-edit.tpl
@ -65,7 +65,7 @@
                        <div class="form-group">
                            <label class="col-md-3 control-label">{Lang::T('User Type')}</label>
                            <div class="col-md-9">
-                                <select name="user_type" id="user_type" class="form-control">
+                                <select name="user_type" id="user_type" class="form-control" onchange="checkUserType(this)">
                                    {if $_admin['user_type'] eq 'Agent'}
                                        <option value="Sales" {if $d['user_type'] eq 'Sales'}selected="selected" {/if}>Sales
                                        </option>
@ -87,7 +87,7 @@
                                </select>
                            </div>
                        </div>
-                        <div class="form-group {if $d['user_type'] eq 'Sales'}hidden{/if}" id="agentChooser">
+                        <div class="form-group {if $d['user_type'] neq 'Sales'}hidden{/if}" id="agentChooser">
                            <label class="col-md-3 control-label">{Lang::T('Agent')}</label>
                            <div class="col-md-9">
                                <select name="root" id="root" class="form-control">
--- a/version.json
+++ b/version.json
@ -1,3 +1,3 @@
 {
-    "version": "2024.2.29"
+    "version": "2024.3.6"
 }
Author	SHA1	Message	Date
Ibnu Maksum	37a5ee8566	Change the view of Attributes Customer	2024-03-06 11:15:45 +07:00
Ibnu Maksum	e5c8aae758	2024.3.5	2024-03-05 16:20:18 +07:00
iBNu Maksum	99d393d0c0	Merge pull request #118 from gerandonk/Development change due date for period plan to customer field attribute	2024-03-05 16:18:32 +07:00
gerandonk	e6280d597b	change due date for period plan to customer field attribute admin can change expired date for period plan as wish before recharger customer	2024-03-05 16:08:33 +07:00
Ibnu Maksum	18db9cd280	hide if balance off	2024-03-05 11:15:38 +07:00
Ibnu Maksum	6aab647f48	Company name in login	2024-03-05 11:15:26 +07:00
Ibnu Maksum	b8b4623078	notification variable fix	2024-03-04 14:26:36 +07:00
Ibnu Maksum	6a79cff233	checkUserType when edit is neq	2024-03-04 11:30:09 +07:00
Ibnu Maksum	4c02283fd0	add full name in telegram notification	2024-03-04 10:06:19 +07:00
Ibnu Maksum	403de91fba	sendPackageNotification with customer variable	2024-03-04 10:02:23 +07:00
Ibnu Maksum	4ee3743cf3	Fix Password send to admin	2024-03-04 09:57:12 +07:00
Ibnu Maksum	77e48dae8b	add is file exists	2024-03-03 19:54:04 +07:00
Ibnu Maksum	0745532951	2024.3.3	2024-03-03 17:29:53 +07:00
Ibnu Maksum	b53116d22a	Customer Announcement	2024-03-03 17:24:01 +07:00
iBNu Maksum	f7df824145	Merge pull request #116 from gerandonk/Development Development	2024-03-03 17:11:38 +07:00
iBNu Maksum	f154322f99	Merge pull request #115 from Focuslinkstech/master improvement	2024-03-03 17:10:06 +07:00
gerandonk	a76ba6ee8b	update db for validity period	2024-03-03 11:30:34 +07:00
gerandonk	61b3f5b5f5	Add planwith validity period	2024-03-03 11:03:25 +07:00
gerandonk	b153e5b595	distinguish between announcements on the user dashboard and the login page	2024-03-03 11:00:42 +07:00
Focuslinkstech	9ab0b6a0fa	improvement just replace the save loading with css for better loading feature	2024-03-02 12:40:04 +01:00
iBNu Maksum	a7f191f058	damn, that curly bracket make error :))	2024-03-01 19:42:59 +07:00
iBNu Maksum	012a1ecfab	allow purchase = no, but can recharge	2024-03-01 16:10:01 +07:00
Ibnu Maksum	dc70a49f52	upload path	2024-03-01 13:44:46 +07:00
Ibnu Maksum	bc7380eab7	add variable to global	2024-03-01 10:36:24 +07:00
Ibnu Maksum	f4da09a26e	move hook before sending notification	2024-03-01 10:11:18 +07:00
Ibnu Maksum	de3312055a	add hook when recharge	2024-03-01 09:57:59 +07:00
Ibnu Maksum	699289662b	Fix Upload URL	2024-03-01 09:37:13 +07:00