kevinowino869/mitrobill
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'Development'

Browse Source
This commit is contained in:
Ibnu Maksum 2024-08-19 16:23:28 +07:00
commit b7d88e9b8d
No known key found for this signature in database
GPG Key ID: 7FC82848810579E5
47 changed files with 483 additions and 231 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGELOG.md
View File

@ -2,6 +2,14 @@
# CHANGELOG
## 2024.8.19
- New Page, Payment Info, To Inform Customer, which payment gateway is good
- Move Customer UI to user-ui folder
- Voucher Template
- Change editor to summernote
- Customer can change language
## 2024.8.6
- Fix QRCode Scanner

5
init.php
View File

@ -136,6 +136,11 @@ if (!empty($_SESSION['user_language'])) {
$config['language'] = $_SESSION['user_language'];
}else if (!empty($_COOKIE['user_language'])) {
$config['language'] = $_COOKIE['user_language'];
}else if(User::getID()>0){
$lang = User::getAttribute("Language");
if(!empty($lang)){
$config['language'] = $lang;
}
}
if (empty($_SESSION['Lang'])) {

4
system/autoload/Message.php
View File

@ -96,7 +96,7 @@ class Message
public static function sendEmail($to, $subject, $body)
{
global $config, $PAGES_PATH, $_app_stage;
global $config, $PAGES_PATH, $debug_mail;
if (empty($body)) {
return "";
}
@ -116,7 +116,7 @@ class Message
} else {
$mail = new PHPMailer();
$mail->isSMTP();
if ($_app_stage == 'Dev') {
if (isset($debug_mail) && $debug_mail == 'Dev') {
$mail->SMTPDebug = SMTP::DEBUG_SERVER;
}
$mail->Host = $config['smtp_host'];

4
system/autoload/User.php
View File

@ -123,7 +123,7 @@ class User
return 0;
}
public static function getAttribute($name, $id = 0)
public static function getAttribute($name, $id = 0, $default = '')
{
if (!$id) {
$id = User::getID();
@ -135,7 +135,7 @@ class User
if ($f) {
return $f['field_value'];
}
return '';
return $default;
}
public static function getAttributes($endWith, $id = 0)

299
system/controllers/accounts.php
View File

@ -18,7 +18,7 @@ switch ($action) {
case 'change-password':
run_hook('customer_view_change_password'); #HOOK
$ui->display('user-change-password.tpl');
$ui->display('user-ui/change-password.tpl');
break;
case 'change-password-post':
@ -67,16 +67,9 @@ switch ($action) {
break;
case 'profile':
$d = ORM::for_table('tbl_customers')->find_one($user['id']);
if ($d) {
run_hook('customer_view_edit_profile'); #HOOK
$ui->assign('d', $d);
$ui->display('user-profile.tpl');
} else {
r2(U . 'home', 'e', Lang::T('Account Not Found'));
}
run_hook('customer_view_edit_profile'); #HOOK
$ui->display('user-ui/profile.tpl');
break;
case 'edit-profile-post':
$fullname = _post('fullname');
$address = _post('address');
@ -84,45 +77,32 @@ switch ($action) {
$phonenumber = _post('phonenumber');
run_hook('customer_edit_profile'); #HOOK
$msg = '';
if (Validator::Length($fullname, 31, 2) == false) {
$msg .= 'Full Name should be between 3 to 30 characters' . '<br>';
if (Validator::Length($fullname, 31, 1) == false) {
$msg .= 'Full Name should be between 1 to 30 characters' . '<br>';
}
if (Validator::UnsignedNumber($phonenumber) == false) {
$msg .= 'Phone Number must be a number' . '<br>';
}
$d = ORM::for_table('tbl_customers')->find_one($user['id']);
if ($d) {
} else {
$msg .= Lang::T('Data Not Found') . '<br>';
$user->fullname = $fullname;
$user->address = $address;
if ($_c['allow_phone_otp'] != 'yes') {
$user->phonenumber = $phonenumber;
}
if ($_c['allow_email_otp'] != 'yes') {
$user->email = $email;
}
if ($msg == '') {
$d->fullname = $fullname;
$d->address = $address;
$d->email = $email;
$d->phonenumber = $phonenumber;
$d->save();
$user->save();
_log('[' . $user['username'] . ']: ' . Lang::T('User Updated Successfully'), 'User', $user['id']);
r2(U . 'accounts/profile', 's', Lang::T('User Updated Successfully'));
} else {
r2(U . 'accounts/profile', 'e', $msg);
}
_log('[' . $user['username'] . ']: ' . Lang::T('User Updated Successfully'), 'User', $user['id']);
r2(U . 'accounts/profile', 's', Lang::T('User Updated Successfully'));
break;
case 'phone-update':
$d = ORM::for_table('tbl_customers')->find_one($user['id']);
if ($d) {
//run_hook('customer_view_edit_profile'); #HOOK
$ui->assign('d', $d);
$ui->assign('new_phone', $_SESSION['new_phone']);
$ui->display('user-phone-update.tpl');
} else {
r2(U . 'home', 'e', Lang::T('Account Not Found'));
}
$ui->assign('new_phone', $_SESSION['new_phone']);
$ui->display('user-ui/phone-update.tpl');
break;
case 'phone-update-otp':
@ -131,7 +111,7 @@ switch ($action) {
$otpPath = $CACHE_PATH . '/sms/';
$_SESSION['new_phone'] = $phone;
// Validate the phone number format
if (!preg_match('/^[0-9]{10,}$/', $phone)) {
if (!preg_match('/^[0-9]{10,}$/', $phone) || empty($phone)) {
r2(U . 'accounts/phone-update', 'e', Lang::T('Invalid phone number format'));
}
@ -139,39 +119,35 @@ switch ($action) {
r2(U . 'accounts/phone-update', 'e', Lang::T('SMS server not Available, Please try again later'));
}
if (!empty($config['sms_url'])) {
if (!empty($phone)) {
$d = ORM::for_table('tbl_customers')->where('username', $username)->where('phonenumber', $phone)->find_one();
if ($d) {
r2(U . 'accounts/phone-update', 'e', Lang::T('You cannot use your current phone number'));
}
if (!file_exists($otpPath)) {
mkdir($otpPath);
touch($otpPath . 'index.html');
}
$otpFile = $otpPath . sha1($username . $db_pass) . ".txt";
$phoneFile = $otpPath . sha1($username . $db_pass) . "_phone.txt";
$d = ORM::for_table('tbl_customers')->whereNotEqual('username', $username)->where('phonenumber', $phone)->find_one();
if ($d) {
r2(U . 'accounts/phone-update', 'e', Lang::T('Phone number already registered by another customer'));
}
if (!file_exists($otpPath)) {
mkdir($otpPath);
touch($otpPath . 'index.html');
}
$otpFile = $otpPath . sha1($username . $db_pass) . ".txt";
$phoneFile = $otpPath . sha1($username . $db_pass) . "_phone.txt";
// expired 10 minutes
if (file_exists($otpFile) && time() - filemtime($otpFile) < 600) {
r2(U . 'accounts/phone-update', 'e', Lang::T('Please wait ' . (600 - (time() - filemtime($otpFile))) . ' seconds before sending another SMS'));
} else {
$otp = rand(100000, 999999);
file_put_contents($otpFile, $otp);
file_put_contents($phoneFile, $phone);
// send send OTP to user
if ($config['phone_otp_type'] === 'sms') {
Message::sendSMS($phone, $config['CompanyName'] . "\n Your Verification code is: $otp");
} elseif ($config['phone_otp_type'] === 'whatsapp') {
Message::sendWhatsapp($phone, $config['CompanyName'] . "\n Your Verification code is: $otp");
} elseif ($config['phone_otp_type'] === 'both') {
Message::sendSMS($phone, $config['CompanyName'] . "\n Your Verification code is: $otp");
Message::sendWhatsapp($phone, $config['CompanyName'] . "\n Your Verification code is: $otp");
}
//redirect after sending OTP
r2(U . 'accounts/phone-update', 'e', Lang::T('Verification code has been sent to your phone'));
}
// expired 10 minutes
if (file_exists($otpFile) && time() - filemtime($otpFile) < 600) {
r2(U . 'accounts/phone-update', 'e', Lang::T('Please wait ') . (600 - (time() - filemtime($otpFile))) . Lang::T(' seconds before sending another SMS'));
} else {
$otp = rand(100000, 999999);
file_put_contents($otpFile, $otp);
file_put_contents($phoneFile, $phone);
// send send OTP to user
if ($config['phone_otp_type'] === 'sms') {
Message::sendSMS($phone, $config['CompanyName'] . "\n Your Verification code is: $otp");
} elseif ($config['phone_otp_type'] === 'whatsapp') {
Message::sendWhatsapp($phone, $config['CompanyName'] . "\n Your Verification code is: $otp");
} elseif ($config['phone_otp_type'] === 'both') {
Message::sendSMS($phone, $config['CompanyName'] . "\n Your Verification code is: $otp");
Message::sendWhatsapp($phone, $config['CompanyName'] . "\n Your Verification code is: $otp");
}
//redirect after sending OTP
r2(U . 'accounts/phone-update', 'e', Lang::T('Verification code has been sent to your phone'));
}
break;
@ -185,60 +161,157 @@ switch ($action) {
// Validate the phone number format
if (!preg_match('/^[0-9]{10,}$/', $phone)) {
r2(U . 'accounts/phone-update', 'e', Lang::T('Invalid phone number format'));
}
if (empty($config['sms_url'])) {
r2(U . 'accounts/phone-update', 'e', Lang::T('SMS server not Available, Please try again later'));
}
$otpFile = $otpPath . sha1($username . $db_pass) . ".txt";
$phoneFile = $otpPath . sha1($username . $db_pass) . "_phone.txt";
// Check if OTP file exists
if (!file_exists($otpFile)) {
r2(U . 'accounts/phone-update', 'e', Lang::T('Please request OTP first'));
exit();
}
if (!empty($config['sms_url'])) {
$otpFile = $otpPath . sha1($username . $db_pass) . ".txt";
$phoneFile = $otpPath . sha1($username . $db_pass) . "_phone.txt";
// Check if OTP file exists
if (!file_exists($otpFile)) {
r2(U . 'accounts/phone-update', 'e', Lang::T('Please request OTP first'));
exit();
}
// expired 10 minutes
if (time() - filemtime($otpFile) > 1200) {
unlink($otpFile);
unlink($phoneFile);
r2(U . 'accounts/phone-update', 'e', Lang::T('Verification code expired'));
exit();
} else {
$code = file_get_contents($otpFile);
// Check if OTP code matches
if ($code != $otp_code) {
r2(U . 'accounts/phone-update', 'e', Lang::T('Wrong Verification code'));
exit();
}
// Check if the phone number matches the one that requested the OTP
$savedPhone = file_get_contents($phoneFile);
if ($savedPhone !== $phone) {
r2(U . 'accounts/phone-update', 'e', Lang::T('The phone number does not match the one that requested the OTP'));
exit();
}
// OTP verification successful, delete OTP and phone number files
unlink($otpFile);
unlink($phoneFile);
}
} else {
r2(U . 'accounts/phone-update', 'e', Lang::T('SMS server not available'));
// expired 10 minutes
if (time() - filemtime($otpFile) > 1200) {
unlink($otpFile);
unlink($phoneFile);
r2(U . 'accounts/phone-update', 'e', Lang::T('Verification code expired'));
exit();
} else {
$code = file_get_contents($otpFile);
// Check if OTP code matches
if ($code != $otp_code) {
r2(U . 'accounts/phone-update', 'e', Lang::T('Wrong Verification code'));
exit();
}
// Check if the phone number matches the one that requested the OTP
$savedPhone = file_get_contents($phoneFile);
if ($savedPhone !== $phone) {
r2(U . 'accounts/phone-update', 'e', Lang::T('The phone number does not match the one that requested the OTP'));
exit();
}
// OTP verification successful, delete OTP and phone number files
unlink($otpFile);
unlink($phoneFile);
}
// Update the phone number in the database
$d = ORM::for_table('tbl_customers')->where('username', $username)->find_one();
if ($d) {
$d->phonenumber = Lang::phoneFormat($phone);
$d->save();
}
$user->phonenumber = Lang::phoneFormat($phone);
$user->save();
r2(U . 'accounts/profile', 's', Lang::T('Phone number updated successfully'));
break;
case 'email-update':
$ui->assign('new_email', $_SESSION['new_email']);
$ui->display('user-ui/email-update.tpl');
break;
case 'email-update-otp':
$email = trim(_post('email'));
$username = $user['username'];
$otpPath = $CACHE_PATH . '/email/';
$_SESSION['new_email'] = $email;
// Validate the phone number format
if (!Validator::Email($email)) {
r2(U . 'accounts/email-update', 'e', Lang::T('Invalid Email address format'));
}
if (empty($config['smtp_host'])) {
r2(U . 'accounts/email-update', 'e', Lang::T('Email server not Available, Please ask admin to configure it'));
}
$d = ORM::for_table('tbl_customers')->whereNotEqual('username', $username)->where('email', $email)->find_one();
if ($d) {
r2(U . 'accounts/email-update', 'e', Lang::T('Email already used by another Customer'));
}
if (!file_exists($otpPath)) {
mkdir($otpPath);
touch($otpPath . 'index.html');
}
$otpFile = $otpPath . sha1($username . $db_pass) . ".txt";
$emailFile = $otpPath . sha1($username . $db_pass) . "_email.txt";
// expired 10 minutes
if (file_exists($otpFile) && time() - filemtime($otpFile) < 600) {
r2(U . 'accounts/email-update', 'e', Lang::T('Please wait ') . (600 - (time() - filemtime($otpFile))) . Lang::T(' seconds before sending another Email'));
} else {
$otp = rand(100000, 999999);
file_put_contents($otpFile, $otp);
file_put_contents($emailFile, $email);
// send OTP to user
$body = Lang::T("Hello") . ' ' . $user['fullname'] . ",\n\n" . Lang::T("Your Email Verification Code is:") . " $otp";
Message::sendEmail($email, Lang::T('Change Email Verification Code'), $body);
//redirect after sending OTP
r2(U . 'accounts/email-update', 'e', Lang::T('Verification code has been sent to your email. Check Spam folder if not found.'));
}
break;
case 'email-update-post':
$email = trim(_post('email'));
$otp_code = _post('otp');
$username = $user['username'];
$otpPath = $CACHE_PATH . '/email/';
// Validate the phone number format
if (!Validator::Email($email)) {
r2(U . 'accounts/email-update', 'e', Lang::T('Invalid Email address format'));
exit();
}
if (empty($config['smtp_host'])) {
r2(U . 'accounts/email-update', 'e', Lang::T('Email server not Available, Please ask admin to configure it'));
}
$otpFile = $otpPath . sha1($username . $db_pass) . ".txt";
$emailFile = $otpPath . sha1($username . $db_pass) . "_email.txt";
// Check if OTP file exists
if (!file_exists($otpFile)) {
r2(U . 'accounts/email-update', 'e', Lang::T('Please request OTP first'));
exit();
}
// expired 10 minutes
if (time() - filemtime($otpFile) > 1200) {
unlink($otpFile);
unlink($emailFile);
r2(U . 'accounts/email-update', 'e', Lang::T('Verification code expired'));
exit();
} else {
$code = file_get_contents($otpFile);
// Check if OTP code matches
if ($code != $otp_code) {
r2(U . 'accounts/email-update', 'e', Lang::T('Wrong Verification code'));
exit();
}
// Check if the phone number matches the one that requested the OTP
$savedEmail = file_get_contents($emailFile);
if ($savedEmail !== $email) {
r2(U . 'accounts/email-update', 'e', Lang::T('The Email Address does not match the one that requested the OTP'));
exit();
}
// OTP verification successful, delete OTP and phone number files
unlink($otpFile);
unlink($emailFile);
}
$user->email = $email;
$user->save();
r2(U . 'accounts/profile', 's', Lang::T('Email Address updated successfully'));
break;
case 'language-update-post':
global $root_path;
$selected_language = _req('lang', 'english');
@ -255,7 +328,7 @@ switch ($action) {
$_SESSION['Lang'] = $_L;
file_put_contents($lan_file, json_encode($_L));
}
User::setAttribute("Language", $selected_language);
r2($_SERVER['HTTP_REFERER'], 's', ucwords($selected_language));

2
system/controllers/customers.php
View File

@ -440,7 +440,7 @@ switch ($action) {
// Send welcome message
if (isset($_POST['send_welcome_message']) && $_POST['send_welcome_message'] == true) {
$welcomeMessage = Lang::getNotifText('welcome_message');
$welcomeMessage = str_replace('[[company_name]]', $config['CompanyName'], $welcomeMessage);
$welcomeMessage = str_replace('[[company]]', $config['CompanyName'], $welcomeMessage);
$welcomeMessage = str_replace('[[name]]', $d['fullname'], $welcomeMessage);
$welcomeMessage = str_replace('[[username]]', $d['username'], $welcomeMessage);
$welcomeMessage = str_replace('[[password]]', $d['password'], $welcomeMessage);

2
system/controllers/home.php
View File

@ -325,4 +325,4 @@ $abills = User::getAttributes("Bill");
$ui->assign('abills', $abills);
run_hook('view_customer_dashboard'); #HOOK
$ui->display('user-dashboard.tpl');
$ui->display('user-ui/dashboard.tpl');

4
system/controllers/login.php
View File

@ -291,9 +291,9 @@ switch ($do) {
run_hook('customer_view_login'); #HOOK
if ($config['disable_registration'] == 'yes') {
$ui->assign('code', alphanumeric(_get('code'), "-"));
$ui->display('user-login-noreg.tpl');
$ui->display('user-ui/login-noreg.tpl');
} else {
$ui->display('user-login.tpl');
$ui->display('user-ui/login.tpl');
}
break;
}

4
system/controllers/mail.php
View File

@ -29,7 +29,7 @@ switch ($action) {
$ui->assign('tipe', 'view');
$ui->assign('_system_menu', 'inbox');
$ui->assign('_title', Lang::T('Inbox'));
$ui->display('user-inbox.tpl');
$ui->display('user-ui/inbox.tpl');
break;
case 'delete':
if($routes['2']){
@ -57,5 +57,5 @@ switch ($action) {
$ui->assign('mails', $mails);
$ui->assign('_system_menu', 'inbox');
$ui->assign('_title', Lang::T('Inbox'));
$ui->display('user-inbox.tpl');
$ui->display('user-ui/inbox.tpl');
}

77
system/controllers/order.php
View File

@ -15,7 +15,7 @@ switch ($action) {
$ui->assign('_system_menu', 'voucher');
$ui->assign('_title', Lang::T('Order Voucher'));
run_hook('customer_view_order'); #HOOK
$ui->display('user-order.tpl');
$ui->display('user-ui/order.tpl');
break;
case 'history':
$ui->assign('_system_menu', 'history');
@ -24,7 +24,7 @@ switch ($action) {
$ui->assign('d', $d);
$ui->assign('_title', Lang::T('Order History'));
run_hook('customer_view_order_history'); #HOOK
$ui->display('user-orderHistory.tpl');
$ui->display('user-ui/orderHistory.tpl');
break;
case 'balance':
if (strpos($user['email'], '@') === false) {
@ -34,7 +34,7 @@ switch ($action) {
$ui->assign('_system_menu', 'balance');
$plans_balance = ORM::for_table('tbl_plans')->where('enabled', '1')->where('type', 'Balance')->where('prepaid', 'yes')->find_many();
$ui->assign('plans_balance', $plans_balance);
$ui->display('user-orderBalance.tpl');
$ui->display('user-ui/orderBalance.tpl');
break;
case 'package':
if (strpos($user['email'], '@') === false) {
@ -48,24 +48,71 @@ switch ($action) {
}
if (!empty($_SESSION['nux-router'])) {
if ($_SESSION['nux-router'] == 'radius') {
$radius_pppoe = ORM::for_table('tbl_plans')->where('plan_type', $account_type)->where('enabled', '1')->where('is_radius', 1)->where('type', 'PPPOE')->where('prepaid', 'yes')->find_many();
$radius_hotspot = ORM::for_table('tbl_plans')->where('plan_type', $account_type)->where('enabled', '1')->where('is_radius', 1)->where('type', 'Hotspot')->where('prepaid', 'yes')->find_many();
$radius_pppoe = ORM::for_table('tbl_plans')
->where('plan_type', $account_type)
->where('enabled', '1')
->where('is_radius', 1)
->where('type', 'PPPOE')
->where('prepaid', 'yes')->find_many();
$radius_hotspot = ORM::for_table('tbl_plans')
->where('plan_type', $account_type)
->where('enabled', '1')
->where('is_radius', 1)
->where('type', 'Hotspot')
->where('prepaid', 'yes')->find_many();
} else {
$routers = ORM::for_table('tbl_routers')->where('id', $_SESSION['nux-router'])->find_many();
$rs = [];
foreach ($routers as $r) {
$rs[] = $r['name'];
}
$plans_pppoe = ORM::for_table('tbl_plans')->where('plan_type', $account_type)->where('enabled', '1')->where_in('routers', $rs)->where('is_radius', 0)->where('type', 'PPPOE')->where('prepaid', 'yes')->find_many();
$plans_hotspot = ORM::for_table('tbl_plans')->where('plan_type', $account_type)->where('enabled', '1')->where_in('routers', $rs)->where('is_radius', 0)->where('type', 'Hotspot')->where('prepaid', 'yes')->find_many();
$plans_pppoe = ORM::for_table('tbl_plans')
->where('plan_type', $account_type)
->where('enabled', '1')
->where_in('routers', $rs)
->where('is_radius', 0)
->where('type', 'PPPOE')
->where('prepaid', 'yes')
->find_many();
$plans_hotspot = ORM::for_table('tbl_plans')
->where('plan_type', $account_type)
->where('enabled', '1')
->where_in('routers', $rs)
->where('is_radius', 0)
->where('type', 'Hotspot')
->where('prepaid', 'yes')
->find_many();
}
} else {
$radius_pppoe = ORM::for_table('tbl_plans')->where('plan_type', $account_type)->where('enabled', '1')->where('is_radius', 1)->where('type', 'PPPOE')->where('prepaid', 'yes')->find_many();
$radius_hotspot = ORM::for_table('tbl_plans')->where('plan_type', $account_type)->where('enabled', '1')->where('is_radius', 1)->where('type', 'Hotspot')->where('prepaid', 'yes')->find_many();
$radius_pppoe = ORM::for_table('tbl_plans')
->where('plan_type', $account_type)
->where('enabled', '1')
->where('is_radius', 1)
->where('type', 'PPPOE')
->where('prepaid', 'yes')
->find_many();
$radius_hotspot = ORM::for_table('tbl_plans')
->where('plan_type', $account_type)
->where('enabled', '1')
->where('is_radius', 1)
->where('type', 'Hotspot')
->where('prepaid', 'yes')
->find_many();
$routers = ORM::for_table('tbl_routers')->find_many();
$plans_pppoe = ORM::for_table('tbl_plans')->where('plan_type', $account_type)->where('enabled', '1')->where('is_radius', 0)->where('type', 'PPPOE')->where('prepaid', 'yes')->find_many();
$plans_hotspot = ORM::for_table('tbl_plans')->where('plan_type', $account_type)->where('enabled', '1')->where('is_radius', 0)->where('type', 'Hotspot')->where('prepaid', 'yes')->find_many();
$plans_pppoe = ORM::for_table('tbl_plans')
->where('plan_type', $account_type)
->where('enabled', '1')
->where('is_radius', 0)
->where('type', 'PPPOE')
->where('prepaid', 'yes')
->find_many();
$plans_hotspot = ORM::for_table('tbl_plans')
->where('plan_type', $account_type)
->where('enabled', '1')->where('is_radius', 0)
->where('type', 'Hotspot')
->where('prepaid', 'yes')
->find_many();
}
$ui->assign('routers', $routers);
$ui->assign('radius_pppoe', $radius_pppoe);
@ -73,7 +120,7 @@ switch ($action) {
$ui->assign('plans_pppoe', $plans_pppoe);
$ui->assign('plans_hotspot', $plans_hotspot);
run_hook('customer_view_order_plan'); #HOOK
$ui->display('user-orderPlan.tpl');
$ui->display('user-ui/orderPlan.tpl');
break;
case 'unpaid':
$d = ORM::for_table('tbl_payment_gateway')
@ -138,7 +185,7 @@ switch ($action) {
$ui->assign('plan', $plan);
$ui->assign('bandw', $bandw);
$ui->assign('_title', 'TRX #' . $trxid);
$ui->display('user-orderView.tpl');
$ui->display('user-ui/orderView.tpl');
break;
case 'pay':
if ($config['enable_balance'] != 'yes') {
@ -328,7 +375,7 @@ switch ($action) {
$ui->assign('router', $router_name);
$ui->assign('plan', $plan);
$ui->assign('tax', $tax);
$ui->display('user-sendPlan.tpl');
$ui->display('user-ui/sendPlan.tpl');
break;
case 'gateway':
$ui->assign('_title', Lang::T('Select Payment Gateway'));
@ -366,7 +413,7 @@ switch ($action) {
$ui->assign('add_cost', $add_cost);
$ui->assign('bills', $bills);
$ui->assign('plan', $plan);
$ui->display('user-selectGateway.tpl');
$ui->display('user-ui/selectGateway.tpl');
break;
} else {
sendTelegram("Payment Gateway not set, please set it in Settings");

4
system/controllers/page.php
View File

@ -16,6 +16,6 @@ if(file_exists(__DIR__."/../../pages/".str_replace(".","",$action).".html")){
$ui->assign("PageFile",$action);
$ui->assign("pageHeader",$action);
run_hook('customer_view_page'); #HOOK
$ui->display('user-pages.tpl');
$ui->display('user-ui/pages.tpl');
}else
$ui->display('404.tpl');
$ui->display('user-ui/404.tpl');

16
system/controllers/pages.php
View File

@ -17,7 +17,7 @@ if (strpos($action, "-reset") !== false) {
_alert(Lang::T('You do not have permission to access this page'), 'danger', "dashboard");
}
$action = str_replace("-reset", "", $action);
$path = $PAGES_PATH . "/" . str_replace(".", "", $action) . ".html";
$path = "$PAGES_PATH/" . str_replace(".", "", $action) . ".html";
$temp = "pages_template/" . str_replace(".", "", $action) . ".html";
if (file_exists($temp)) {
if (!copy($temp, $path)) {
@ -31,7 +31,7 @@ if (strpos($action, "-reset") !== false) {
if (!in_array($admin['user_type'], ['SuperAdmin', 'Admin'])) {
_alert(Lang::T('You do not have permission to access this page'), 'danger', "dashboard");
}
$path = $PAGES_PATH . "/" . str_replace(".", "", $action) . ".html";
$path = "$PAGES_PATH/" . str_replace(".", "", $action) . ".html";
$ui->assign("action", $action);
//echo $path;
run_hook('view_edit_pages'); #HOOK
@ -47,13 +47,13 @@ if (strpos($action, "-reset") !== false) {
}
if (file_exists($path)) {
if ($action == 'Voucher') {
if (!file_exists($PAGES_PATH . "/vouchers/")) {
mkdir($PAGES_PATH . "/vouchers/");
if (!file_exists("$PAGES_PATH/vouchers/")) {
mkdir("$PAGES_PATH/vouchers/");
if (file_exists("pages_template/vouchers/")) {
File::copyFolder("pages_template/vouchers/", $PAGES_PATH . "/vouchers/");
File::copyFolder("pages_template/vouchers/", "$PAGES_PATH/vouchers/");
}
}
$ui->assign("vouchers", scandir($PAGES_PATH . "/vouchers/"));
$ui->assign("vouchers", scandir("$PAGES_PATH/vouchers/"));
}
$html = file_get_contents($path);
$ui->assign("htmls", str_replace(["<div", "</div>"], "", $html));
@ -68,14 +68,14 @@ if (strpos($action, "-reset") !== false) {
_alert(Lang::T('You do not have permission to access this page'), 'danger', "dashboard");
}
$action = str_replace("-post", "", $action);
$path = $PAGES_PATH . "/" . str_replace(".", "", $action) . ".html";
$path = "$PAGES_PATH/" . str_replace(".", "", $action) . ".html";
if (file_exists($path)) {
$html = _post("html");
run_hook('save_pages'); #HOOK
if (file_put_contents($path, $html)) {
if (_post('template_save') == 'yes') {
if (!empty(_post('template_name'))) {
file_put_contents($PAGES_PATH . "/vouchers/" . _post('template_name') . '.html', $html);
file_put_contents("$PAGES_PATH/vouchers/" . _post('template_name') . '.html', $html);
}
}
r2(U . 'pages/' . $action, 's', Lang::T("Saving page success"));

20
system/controllers/register.php
View File

@ -22,7 +22,7 @@ switch ($do) {
$password = _post('password');
$cpassword = _post('cpassword');
$address = _post('address');
if (!empty($config['sms_url'])) {
if (!empty($config['sms_url']) && $_c['allow_phone_otp'] == 'yes') {
$phonenumber = Lang::phoneFormat($username);
$username = $phonenumber;
} else if (strlen($username) < 21) {
@ -45,7 +45,7 @@ switch ($do) {
$msg .= Lang::T('Passwords does not match') . '<br>';
}
if (!empty($config['sms_url'])) {
if (!empty($config['sms_url']) && $_c['allow_phone_otp'] == 'yes') {
$otpPath .= sha1($username . $db_pass) . ".txt";
run_hook('validate_otp'); #HOOK
//expired 10 minutes
@ -62,7 +62,7 @@ switch ($do) {
$ui->assign('phonenumber', $phonenumber);
$ui->assign('notify', 'Wrong Verification code');
$ui->assign('notify_t', 'd');
$ui->display('register-otp.tpl');
$ui->display('user-ui/register-otp.tpl');
exit();
} else {
unlink($otpPath);
@ -96,7 +96,7 @@ switch ($do) {
$ui->assign('notify', 'Failed to register');
$ui->assign('notify_t', 'd');
run_hook('view_otp_register'); #HOOK
$ui->display('register-rotp.tpl');
$ui->display('user-ui/register-rotp.tpl');
}
} else {
$ui->assign('username', $username);
@ -106,12 +106,12 @@ switch ($do) {
$ui->assign('phonenumber', $phonenumber);
$ui->assign('notify', $msg);
$ui->assign('notify_t', 'd');
$ui->display('register.tpl');
$ui->display('user-ui/register.tpl');
}
break;
default:
if (!empty($config['sms_url'])) {
if (!empty($config['sms_url']) && $_c['allow_phone_otp'] == 'yes') {
$username = _post('username');
if (!empty($username)) {
$d = ORM::for_table('tbl_customers')->where('username', $username)->find_one();
@ -128,7 +128,7 @@ switch ($do) {
$ui->assign('username', $username);
$ui->assign('notify', 'Please wait ' . (600 - (time() - filemtime($otpPath))) . ' seconds before sending another SMS');
$ui->assign('notify_t', 'd');
$ui->display('register-otp.tpl');
$ui->display('user-ui/register-otp.tpl');
} else {
$otp = rand(100000, 999999);
file_put_contents($otpPath, $otp);
@ -136,11 +136,11 @@ switch ($do) {
$ui->assign('username', $username);
$ui->assign('notify', 'Verification code has been sent to your phone');
$ui->assign('notify_t', 's');
$ui->display('register-otp.tpl');
$ui->display('user-ui/register-otp.tpl');
}
} else {
run_hook('view_otp_register'); #HOOK
$ui->display('register-rotp.tpl');
$ui->display('user-ui/register-rotp.tpl');
}
} else {
$ui->assign('username', "");
@ -149,7 +149,7 @@ switch ($do) {
$ui->assign('email', "");
$ui->assign('otp', false);
run_hook('view_register'); #HOOK
$ui->display('register.tpl');
$ui->display('user-ui/register.tpl');
}
break;
}

6
system/controllers/voucher.php
View File

@ -17,7 +17,7 @@ switch ($action) {
case 'activation':
run_hook('view_activate_voucher'); #HOOK
$ui->assign('code', alphanumeric(_get('code'), "-_.,"));
$ui->display('user-activation.tpl');
$ui->display('user-ui/activation.tpl');
break;
case 'activation-post':
@ -46,7 +46,7 @@ switch ($action) {
$ui->assign('d', $d);
run_hook('customer_view_activation_list'); #HOOK
$ui->display('user-activation-list.tpl');
$ui->display('user-ui/activation-list.tpl');
break;
case 'invoice':
@ -58,7 +58,7 @@ switch ($action) {
}
if ($in) {
Package::createInvoice($in);
$ui->display('invoice-customer.tpl');
$ui->display('user-ui/invoice-customer.tpl');
} else {
r2(U . 'voucher/list-activated', 'e', Lang::T('Not Found'));
}

18
ui/ui/app-settings.tpl
View File

@ -626,7 +626,7 @@
</p>
</div>
<div class="form-group">
<label class="col-md-2 control-label">{Lang::T('OTP Required')}</label>
<label class="col-md-2 control-label">{Lang::T('Phone OTP Required')}</label>
<div class="col-md-6">
<select name="allow_phone_otp" id="allow_phone_otp" class="form-control">
<option value="no" {if $_c['allow_phone_otp']=='no' }selected="selected" {/if}>
@ -636,7 +636,7 @@
</select>
</div>
<p class="help-block col-md-4">
{Lang::T('OTP is required when user want to change phone number')}
{Lang::T('OTP is required when user want to change phone number and registration')}
</p>
</div>
<div class="form-group">
@ -654,6 +654,20 @@
</div>
<p class="help-block col-md-4">{Lang::T('The method which OTP will be sent to user')}</p>
</div>
<div class="form-group">
<label class="col-md-2 control-label">{Lang::T('Email OTP Required')}</label>
<div class="col-md-6">
<select name="allow_email_otp" id="allow_email_otp" class="form-control">
<option value="no" {if $_c['allow_email_otp']=='no' }selected="selected" {/if}>
No</option>
<option value="yes" {if $_c['allow_email_otp']=='yes' }selected="selected" {/if}>Yes
</option>
</select>
</div>
<p class="help-block col-md-4">
{Lang::T('OTP is required when user want to change Email Address')}
</p>
</div>
<div class="form-group">
<label class="col-md-2 control-label">{Lang::T('Extend Package Expiry')}</label>
<div class="col-md-6">

6
ui/ui/bandwidth.tpl
View File

@ -31,7 +31,7 @@
<tr>
<th>{Lang::T('Bandwidth Name')}</th>
<th>{Lang::T('Rate')}</th>
<th>{Lang::T('Burst')}</th>
<th>Burst</th>
<th>{Lang::T('Manage')}</th>
</tr>
</thead>
@ -57,7 +57,7 @@
</div>
{include file="pagination.tpl"}
<div class="bs-callout bs-callout-info" id="callout-navbar-role">
<h4>{Lang::T('Create Bandwitdh Plan for expired Internet Plan')}</h4>
<h4>{Lang::T('Create Bandwidth Plan for expired Internet Plan')}</h4>
<p>{Lang::T('When customer expired, you can move it to Expired Internet Plan')}</p>
</div>
</div>
@ -66,4 +66,4 @@
</div>
</div>
{include file="sections/footer.tpl"}
{include file="sections/footer.tpl"}

6
ui/ui/dbstatus.tpl
View File

@ -3,7 +3,7 @@
<div class="row">
<div class="col-sm-7">
<div class="panel panel-primary">
<div class="panel-heading">Backup Database</div>
<div class="panel-heading">{Lang::T('Backup Database')}</div>
<form method="post" action="{$_url}settings/dbbackup">
<div class="table-responsive">
<table class="table table-bordered">
@ -27,7 +27,7 @@
</div>
<div class="panel-body">
<div class="row">
<div class="col-md-6">Dont select logs if it failed</div>
<div class="col-md-6">{Lang::T('Dont select logs if it failed')}</div>
<div class="col-md-4 text-right">
<button type="submit" class="btn btn-primary btn-xs btn-block"><i
class="fa fa-download"></i>
@ -53,7 +53,7 @@
</div>
</div>
</form>
<div class="panel-footer">Restoring database will clean up data and then restore all the data</div>
<div class="panel-footer">{Lang::T('Restoring database will clean up data and then restore all the data')}</div>
</div>
</div>
</div>

6
ui/ui/hotspot-add.tpl
View File

@ -13,8 +13,8 @@
data-content="Customer cannot buy disabled Plan, but admin can recharge it, use it if you want only admin recharge it">?</a>
</label>
<div class="col-md-10">
<input type="radio" name="enabled" value="1" checked> Enable
<input type="radio" name="enabled" value="0"> Disable
<input type="radio" name="enabled" value="1" checked> {Lang::T('Enable')}
<input type="radio" name="enabled" value="0"> {Lang::T('Disable')}
</div>
</div>
<div class="form-group">
@ -247,4 +247,4 @@
{/literal}
{/if}
{include file="sections/footer.tpl"}
{include file="sections/footer.tpl"}

6
ui/ui/hotspot.tpl
View File

@ -174,12 +174,12 @@
<div class="panel-footer">
{include file="pagination.tpl"}
<div class="bs-callout bs-callout-info" id="callout-navbar-role">
<h4>Create expired Internet Plan</h4>
<p>When customer expired, you can move it to Expired Internet Plan</p>
<h4>{Lang::T('Create expired Internet Plan')}</h4>
<p>{Lang::T('When customer expired, you can move it to Expired Internet Plan')}</p>
</div>
</div>
</div>
</div>
</div>
{include file="sections/footer.tpl"}
{include file="sections/footer.tpl"}

14
ui/ui/page-edit.tpl
View File

@ -29,7 +29,7 @@
{/if}
<button type="submit" class="btn btn-primary btn-block">SAVE</button>
<br>
<p class="help-block">{Lang::T("Sometimes you need to refresh 3 times until content change")}</p>
<p class="help-block">{Lang::T('Sometimes you need to refresh 3 times until content change')}</p>
<input type="text" class="form-control" onclick="this.select()" readonly
value="{$app_url}/{$PAGES_PATH}/{$PageFile}.html">
</div>
@ -41,11 +41,11 @@
{if $PageFile=='Voucher'}
<div class="panel-footer">
<p class="help-block">
<b>[[company_name]]</b> Your Company Name at Settings.<br>
<b>[[price]]</b> Plan Price.<br>
<b>[[voucher_code]]</b> Voucher Code.<br>
<b>[[plan]]</b> Voucher Plan.<br>
<b>[[counter]]</b> Counter.<br>
<b>[[company_name]]</b> {Lang::T('Your Company Name at Settings')}.<br>
<b>[[price]]</b> {Lang::T('Plan Price')}.<br>
<b>[[voucher_code]]</b> {Lang::T('Voucher Code')}.<br>
<b>[[plan]]</b> {Lang::T('Voucher Plan')}.<br>
<b>[[counter]]</b> {Lang::T('Counter')}.<br>
</p>
</div>
{/if}
@ -80,4 +80,4 @@
</script>
{/literal}
{include file="sections/footer.tpl"}
{include file="sections/footer.tpl"}

6
ui/ui/reports.tpl
View File

@ -137,8 +137,8 @@
{include file="pagination.tpl"}
<div class="bs-callout bs-callout-warning bg-gray">
<h4>Information</h4>
<p>Export and Print will show all data without pagination.</p>
<h4>{Lang::T('Information')}</h4>
<p>{Lang::T('Export and Print will show all data without pagination')}.</p>
</div>
<script src="https://cdn.jsdelivr.net/npm/chart.js@3.5.1/dist/chart.min.js"></script>
@ -265,4 +265,4 @@
</script>
{/literal}
{include file="sections/footer.tpl"}
{include file="sections/footer.tpl"}

4
ui/ui/404.tpl → ui/ui/user-ui/404.tpl
View File

@ -1,4 +1,4 @@
{include file="sections/user-header.tpl"}
{include file="user-ui/header.tpl"}
<div class="page page-err clearfix">
<div class="err-container">
@ -7,4 +7,4 @@
</div>
</div>
{include file="sections/user-footer.tpl"}
{include file="user-ui/footer.tpl"}

4
ui/ui/user-activation-list.tpl → ui/ui/user-ui/activation-list.tpl
View File

@ -1,4 +1,4 @@
{include file="sections/user-header.tpl"}
{include file="user-ui/header.tpl"}
<!-- user-activation-list -->
<div class="row">
@ -41,4 +41,4 @@
</div>
{include file="sections/user-footer.tpl"}
{include file="user-ui/footer.tpl"}

4
ui/ui/user-activation.tpl → ui/ui/user-ui/activation.tpl
View File

@ -1,4 +1,4 @@
{include file="sections/user-header.tpl"}
{include file="user-ui/header.tpl"}
<!-- user-activation -->
<div class="row">
@ -38,4 +38,4 @@
</div>
</div>
{include file="sections/user-footer.tpl"}
{include file="user-ui/footer.tpl"}

4
ui/ui/user-change-password.tpl → ui/ui/user-ui/change-password.tpl
View File

@ -1,4 +1,4 @@
{include file="sections/user-header.tpl"}
{include file="user-ui/header.tpl"}
<!-- user-change-password -->
<div class="row">
@ -40,4 +40,4 @@
</div>
</div>
{include file="sections/user-footer.tpl"}
{include file="user-ui/footer.tpl"}

4
ui/ui/user-dashboard.tpl → ui/ui/user-ui/dashboard.tpl
View File

@ -1,4 +1,4 @@
{include file="sections/user-header.tpl"}
{include file="user-ui/header.tpl"}
<!-- user-dashboard -->
<div class="row">
@ -398,4 +398,4 @@
document.write('<meta http-equiv="refresh" target="_blank" content="' + authdly + '; url=' + auth + '">');
</script>
{/if}
{include file="sections/user-footer.tpl"}
{include file="user-ui/footer.tpl"}

79
ui/ui/user-ui/email-update.tpl Normal file
View File

@ -0,0 +1,79 @@
{include file="user-ui/header.tpl"}
<!-- user-phone-update -->
<div class="box box-danger">
<div class="box-header with-border">
<h3 class="box-title">{Lang::T('Change Email Address')}</h3>
</div>
<div class="box-body">
<div class="form-horizontal">
<div class="form-group">
<label class="col-md-2 control-label">{Lang::T('Current Email')}</label>
<div class="col-md-6">
<div class="input-group">
<span class="input-group-addon" id="basic-addon1">+</span>
<input type="text" class="form-control" name="email"
value="{$_user['email']}" readonly placeholder="{Lang::T('Email')}">
</div>
</div>
</div>
<form method="post" role="form" action="{$_url}accounts/email-update-otp">
<div class="form-group">
<label class="col-md-2 control-label">{Lang::T('New Email')}</label>
<div class="col-md-6">
<div class="input-group">
<span class="input-group-addon" id="basic-addon1">+</span>
<input type="text" class="form-control" name="email" id="email" value="{$new_email}" required
placeholder="{Lang::T('Input your Email')}">
<span class="input-group-btn">
<button type="submit" class="btn btn-info btn-flat">{Lang::T('Request OTP')}</button>
</span>
</div>
</div>
</div>
</form>
<form method="post" role="form" action="{$_url}accounts/email-update-post">
<!-- Form 2 -->
<div class="form-group">
<label class="col-md-2 control-label">{Lang::T('OTP')}</label>
<div class="col-md-6">
<input type="number" class="form-control" id="otp" name="otp"
placeholder="{Lang::T('Enter OTP that was sent to your email')}" required>
</div>
</div>
<!-- Hidden field to store the phone number value -->
<input type="hidden" name="email" id="hidden_email">
<center>
<button class="btn btn-success" type="submit"
onclick="return validateForm()">{Lang::T('Update')}</button>
Or <a href="{$_url}home">{Lang::T('Cancel')}</a>
</center>
</form>
<script>
function validateForm() {
var email = document.getElementById("email").value;
var otp = document.getElementById("otp").value;
if (email.trim() === "") {
alert("Email Address is required.");
return false; // Prevent form submission
}
if (otp.trim() === "") {
alert("OTP code is required.");
return false; // Prevent form submission
}
// Set the phone number value in the hidden field
document.getElementById("hidden_email").value = email;
return true; // Allow form submission
}
</script>
</div>
</div>
</div>
{include file="user-ui/footer.tpl"}

0
ui/ui/sections/user-footer.tpl → ui/ui/user-ui/footer.tpl
View File

0
ui/ui/sections/user-header.tpl → ui/ui/user-ui/header.tpl
View File

4
ui/ui/user-inbox.tpl → ui/ui/user-ui/inbox.tpl
View File

@ -1,4 +1,4 @@
{include file="sections/user-header.tpl"}
{include file="user-ui/header.tpl"}
{if $tipe == 'view'}
<div class="box box-primary">
@ -110,4 +110,4 @@
{/if}
{include file="sections/user-footer.tpl"}
{include file="user-ui/footer.tpl"}

8
ui/ui/user-ui/index.html Normal file
View File

@ -0,0 +1,8 @@
<html>
<head>
<title>403 Forbidden</title>
</head>
<body>
<p>Directory access is forbidden.</p>
</body>
</html>

4
ui/ui/invoice-customer.tpl → ui/ui/user-ui/invoice-customer.tpl
View File

@ -1,4 +1,4 @@
{include file="sections/user-header.tpl"}
{include file="user-ui/header.tpl"}
<div class="row">
<div class="col-lg-12">
@ -18,4 +18,4 @@
</div>
</div>
</div>
{include file="sections/user-footer.tpl"}
{include file="user-ui/footer.tpl"}

0
ui/ui/user-login-noreg.tpl → ui/ui/user-ui/login-noreg.tpl
View File

0
ui/ui/user-login.tpl → ui/ui/user-ui/login.tpl
View File

4
ui/ui/user-orderBalance.tpl → ui/ui/user-ui/orderBalance.tpl
View File

@ -1,4 +1,4 @@
{include file="sections/user-header.tpl"}
{include file="user-ui/header.tpl"}
<!-- user-orderPlan -->
<div class="row">
<div class="col-sm-12">
@ -34,4 +34,4 @@
</div>
</div>
</div>
{include file="sections/user-footer.tpl"}
{include file="user-ui/footer.tpl"}

4
ui/ui/user-orderHistory.tpl → ui/ui/user-ui/orderHistory.tpl
View File

@ -1,4 +1,4 @@
{include file="sections/user-header.tpl"}
{include file="user-ui/header.tpl"}
<!-- user-orderHistory -->
<div class="row">
@ -53,4 +53,4 @@
</div>
{include file="sections/user-footer.tpl"}
{include file="user-ui/footer.tpl"}

4
ui/ui/user-orderPlan.tpl → ui/ui/user-ui/orderPlan.tpl
View File

@ -1,4 +1,4 @@
{include file="sections/user-header.tpl"}
{include file="user-ui/header.tpl"}
<!-- user-orderPlan -->
<div class="row">
<div class="col-sm-12">
@ -421,4 +421,4 @@
{/foreach}
</div>
</div>
{include file="sections/user-footer.tpl"}
{include file="user-ui/footer.tpl"}

4
ui/ui/user-orderView.tpl → ui/ui/user-ui/orderView.tpl
View File

@ -1,4 +1,4 @@
{include file="sections/user-header.tpl"}
{include file="user-ui/header.tpl"}
<!-- user-orderView -->
<div class="row">
<div class="col-md-3"></div>
@ -150,4 +150,4 @@
</div>
</div>
</div>
{include file="sections/user-footer.tpl"}
{include file="user-ui/footer.tpl"}

4
ui/ui/user-pages.tpl → ui/ui/user-ui/pages.tpl
View File

@ -1,4 +1,4 @@
{include file="sections/user-header.tpl"}
{include file="user-ui/header.tpl"}
<!-- user-pages -->
<div class="row">
@ -12,4 +12,4 @@
</div>
</div>
{include file="sections/user-footer.tpl"}
{include file="user-ui/footer.tpl"}

6
ui/ui/user-phone-update.tpl → ui/ui/user-ui/phone-update.tpl
View File

@ -1,4 +1,4 @@
{include file="sections/user-header.tpl"}
{include file="user-ui/header.tpl"}
<!-- user-phone-update -->
@ -14,7 +14,7 @@
<div class="input-group">
<span class="input-group-addon" id="basic-addon1">+</span>
<input type="text" class="form-control" name="phonenumber" id="phonenumber"
value="{$d['phonenumber']}" readonly placeholder="{Lang::T('Phone Number')}">
value="{$_user['phonenumber']}" readonly placeholder="{Lang::T('Phone Number')}">
</div>
</div>
</div>
@ -77,4 +77,4 @@
</div>
</div>
</div>
{include file="sections/user-footer.tpl"}
{include file="user-ui/footer.tpl"}

44
ui/ui/user-profile.tpl → ui/ui/user-ui/profile.tpl
View File

@ -1,4 +1,4 @@
{include file="sections/user-header.tpl"}
{include file="user-ui/header.tpl"}
<!-- user-profile -->
<div class="row">
@ -8,14 +8,14 @@
<div class="panel-body">
<form class="form-horizontal" method="post" role="form" action="{$_url}accounts/edit-profile-post">
<input type="hidden" name="id" value="{$d['id']}">
<input type="hidden" name="id" value="{$_user['id']}">
<div class="form-group">
<label class="col-md-2 control-label">{Lang::T('Username')}</label>
<div class="col-md-6">
<div class="input-group">
<span class="input-group-addon" id="basic-addon1">+</span>
<input type="text" class="form-control" name="username" id="username" readonly
value="{$d['username']}"
value="{$_user['username']}"
placeholder="{if $_c['country_code_phone']!= ''}{$_c['country_code_phone']}{/if} {Lang::T('Phone Number')}">
</div>
</div>
@ -24,14 +24,14 @@
<label class="col-md-2 control-label">{Lang::T('Full Name')}</label>
<div class="col-md-6">
<input type="text" class="form-control" id="fullname" name="fullname"
value="{$d['fullname']}">
value="{$_user['fullname']}">
</div>
</div>
<div class="form-group">
<label class="col-md-2 control-label">{Lang::T('Address')}</label>
<div class="col-md-6">
<textarea name="address" id="address" class="form-control">{$d['address']}</textarea>
<textarea name="address" id="address" class="form-control">{$_user['address']}</textarea>
</div>
</div>
{if $_c['allow_phone_otp'] != 'yes'}
@ -41,7 +41,7 @@
<div class="input-group">
<span class="input-group-addon" id="basic-addon1">+</span>
<input type="text" class="form-control" name="phonenumber" id="phonenumber"
value="{$d['phonenumber']}"
value="{$_user['phonenumber']}"
placeholder="{if $_c['country_code_phone']!= ''}{$_c['country_code_phone']}{/if} {Lang::T('Phone Number')}">
</div>
</div>
@ -53,7 +53,7 @@
<div class="input-group">
<span class="input-group-addon" id="basic-addon1">+</span>
<input type="text" class="form-control" name="phonenumber" id="phonenumber"
value="{$d['phonenumber']}" readonly
value="{$_user['phonenumber']}" readonly
placeholder="{if $_c['country_code_phone']!= ''}{$_c['country_code_phone']}{/if} {Lang::T('Phone Number')}">
<span class="input-group-btn">
<a href="{$_url}accounts/phone-update" type="button"
@ -63,12 +63,30 @@
</div>
</div>
{/if}
<div class="form-group">
<label class="col-md-2 control-label">{Lang::T('Email')}</label>
<div class="col-md-6">
<input type="text" class="form-control" id="email" name="email" value="{$d['email']}">
{if $_c['allow_email_otp'] != 'yes'}
<div class="form-group">
<label class="col-md-2 control-label">{Lang::T('Email')}</label>
<div class="col-md-6">
<input type="text" class="form-control" id="email" name="email" value="{$_user['email']}">
</div>
</div>
</div>
{else}
<div class="form-group">
<label class="col-md-2 control-label">{Lang::T('Email Address')}</label>
<div class="col-md-6">
<div class="input-group">
<span class="input-group-addon"><i class="glyphicon glyphicon-envelope"></i></span>
<input type="text" class="form-control" name="email" id="email"
value="{$_user['email']}" readonly>
<span class="input-group-btn">
<a href="{$_url}accounts/email-update" type="button"
class="btn btn-info btn-flat">{Lang::T('Change')}</a>
</span>
</div>
</div>
</div>
{/if}
<div class="form-group">
<div class="col-lg-offset-2 col-lg-10">
@ -84,4 +102,4 @@
</div>
</div>
{include file="sections/user-footer.tpl"}
{include file="user-ui/footer.tpl"}

0
ui/ui/register-otp.tpl → ui/ui/user-ui/register-otp.tpl
View File

0
ui/ui/register-rotp.tpl → ui/ui/user-ui/register-rotp.tpl
View File

0
ui/ui/register.tpl → ui/ui/user-ui/register.tpl
View File

6
ui/ui/user-selectGateway.tpl → ui/ui/user-ui/selectGateway.tpl
View File

@ -1,4 +1,4 @@
{include file="sections/user-header.tpl"}
{include file="user-ui/header.tpl"}
<div class="row">
{if file_exists("$PAGES_PATH/Payment_Info.html")}
@ -35,7 +35,7 @@
{if $plan['is_radius'] or $plan['routers']}
<li class="list-group-item">
<b>{Lang::T('Location')}</b> <span class="pull-right">{if
$plan['is_radius']}Radius{else}{$plan['routers']}
$plan['is_radius']}Radius{else}{$plan['routers']}
{/if}</span>
</li>
{/if}
@ -121,4 +121,4 @@
</div>
</div>
{include file="sections/user-footer.tpl"}
{include file="user-ui/footer.tpl"}

4
ui/ui/user-sendPlan.tpl → ui/ui/user-ui/sendPlan.tpl
View File

@ -1,4 +1,4 @@
{include file="sections/user-header.tpl"}
{include file="user-ui/header.tpl"}
<!-- user-orderView -->
<div class="row">
<div class="col-md-3"></div>
@ -64,4 +64,4 @@
</div>
</div>
</div>
{include file="sections/user-footer.tpl"}
{include file="suser-ui/footer.tpl"}

2
version.json
View File

@ -1,3 +1,3 @@
{
"version": "2024.8.17"
"version": "2024.8.19"
}