Merge branch 'Development'

This commit is contained in:
Ibnu Maksum
2024-08-19 16:23:28 +07:00
47 changed files with 483 additions and 231 deletions

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">

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"}

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>

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"}

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"}

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"}

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"}

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"}

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"}

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"}

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"}

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"}

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"}

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>

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"}

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"}

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"}

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"}

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"}

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"}

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"}

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"}

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"}

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"}