diff --git a/install/phpnuxbill.sql b/install/phpnuxbill.sql
index 28903fe6..c2c2127b 100644
--- a/install/phpnuxbill.sql
+++ b/install/phpnuxbill.sql
@@ -228,6 +228,7 @@ CREATE TABLE
         `plan_name` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
         `price` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
         `recharged_on` date NOT NULL,
+        `recharged_time` time NOT NULL DEFAULT '00:00:00',
         `expiration` date NOT NULL,
         `time` time NOT NULL,
         `method` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
@@ -271,6 +272,7 @@ CREATE TABLE
         `plan_id` int(10) NOT NULL,
         `namebp` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
         `recharged_on` date NOT NULL,
+        `recharged_time` time NOT NULL DEFAULT '00:00:00',
         `expiration` date NOT NULL,
         `time` time NOT NULL,
         `status` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
diff --git a/system/autoload/Package.php b/system/autoload/Package.php
index 97fbda01..e99bf889 100644
--- a/system/autoload/Package.php
+++ b/system/autoload/Package.php
@@ -22,6 +22,7 @@ class Package
         global $_c, $_L, $_notifmsg;
         $date_now = date("Y-m-d H:i:s");
         $date_only = date("Y-m-d");
+        $time_only = date("H:i:s");
         $time = date("H:i:s");
 
         if ($id_customer == '' or $router_name == '' or $plan_id == '') {
@@ -40,6 +41,7 @@ class Package
             $t->plan_name = $p['name_plan'];
             $t->price = $p['price'];
             $t->recharged_on = $date_only;
+            $t->recharge_time = date("H:i:s");
             $t->expiration = $date_only;
             $t->time = $time;
             $t->method = "$gateway - $channel";
@@ -105,6 +107,7 @@ class Package
                 $b->plan_id = $plan_id;
                 $b->namebp = $p['name_plan'];
                 $b->recharged_on = $date_only;
+                $b->recharge_time = $time_only;
                 $b->expiration = $date_exp;
                 $b->time = $time;
                 $b->status = "on";
@@ -120,6 +123,7 @@ class Package
                 $t->plan_name = $p['name_plan'];
                 $t->price = $p['price'];
                 $t->recharged_on = $date_only;
+                $t->recharge_time = $time_only;
                 $t->expiration = $date_exp;
                 $t->time = $time;
                 $t->method = "$gateway - $channel";
@@ -139,6 +143,7 @@ class Package
                 $d->plan_id = $plan_id;
                 $d->namebp = $p['name_plan'];
                 $d->recharged_on = $date_only;
+                $d->recharge_time = $time_only;
                 $d->expiration = $date_exp;
                 $d->time = $time;
                 $d->status = "on";
@@ -154,6 +159,7 @@ class Package
                 $t->plan_name = $p['name_plan'];
                 $t->price = $p['price'];
                 $t->recharged_on = $date_only;
+                $t->recharge_time = $time_only;
                 $t->expiration = $date_exp;
                 $t->time = $time;
                 $t->method = "$gateway - $channel";
@@ -181,6 +187,7 @@ class Package
                 $b->plan_id = $plan_id;
                 $b->namebp = $p['name_plan'];
                 $b->recharged_on = $date_only;
+                $b->recharge_time = $time_only;
                 $b->expiration = $date_exp;
                 $b->time = $time;
                 $b->status = "on";
@@ -196,6 +203,7 @@ class Package
                 $t->plan_name = $p['name_plan'];
                 $t->price = $p['price'];
                 $t->recharged_on = $date_only;
+                $t->recharge_time = $time_only;
                 $t->expiration = $date_exp;
                 $t->time = $time;
                 $t->method = "$gateway - $channel";
@@ -215,6 +223,7 @@ class Package
                 $d->plan_id = $plan_id;
                 $d->namebp = $p['name_plan'];
                 $d->recharged_on = $date_only;
+                $d->recharge_time = $time_only;
                 $d->expiration = $date_exp;
                 $d->time = $time;
                 $d->status = "on";
@@ -230,6 +239,7 @@ class Package
                 $t->plan_name = $p['name_plan'];
                 $t->price = $p['price'];
                 $t->recharged_on = $date_only;
+                $t->recharge_time = $time_only;
                 $t->expiration = $date_exp;
                 $t->time = $time;
                 $t->method = "$gateway - $channel";
diff --git a/system/controllers/prepaid.php b/system/controllers/prepaid.php
index b3cf7e32..28c85ccd 100644
--- a/system/controllers/prepaid.php
+++ b/system/controllers/prepaid.php
@@ -181,7 +181,7 @@ switch ($action) {
             run_hook('edit_customer_plan'); #HOOK
             $d->username = $username;
             $d->plan_id = $id_plan;
-            $d->recharged_on = $recharged_on;
+            //$d->recharged_on = $recharged_on;
             $d->expiration = $expiration;
             $d->time = $time;
             $d->save();
diff --git a/system/controllers/voucher.php b/system/controllers/voucher.php
index eb322db4..f40ee9a5 100644
--- a/system/controllers/voucher.php
+++ b/system/controllers/voucher.php
@@ -26,187 +26,16 @@ switch ($action) {
     case 'activation-post':
         $code = _post('code');
         $v1 = ORM::for_table('tbl_voucher')->where('code', $code)->where('status', 0)->find_one();
-
-        $c = ORM::for_table('tbl_customers')->find_one($user['id']);
-        $p = ORM::for_table('tbl_plans')->find_one($v1['id_plan']);
-        $b = ORM::for_table('tbl_user_recharges')->where('customer_id', $user['id'])->find_one();
-
-        $date_now = date("Y-m-d H:i:s");
-        $date_only = date("Y-m-d");
-        $time = date("H:i:s");
-
-        $mikrotik = Mikrotik::info($v1['routers']);
-        if ($p['validity_unit'] == 'Months') {
-            $date_exp = date("Y-m-d", strtotime('+' . $p['validity'] . ' month'));
-        } else if ($p['validity_unit'] == 'Days') {
-            $date_exp = date("Y-m-d", strtotime('+' . $p['validity'] . ' day'));
-        } else if ($p['validity_unit'] == 'Hrs') {
-            $datetime = explode(' ', date("Y-m-d H:i:s", strtotime('+' . $p['validity'] . ' hour')));
-            $date_exp = $datetime[0];
-            $time = $datetime[1];
-        } else if ($p['validity_unit'] == 'Mins') {
-            $datetime = explode(' ', date("Y-m-d H:i:s", strtotime('+' . $p['validity'] . ' minute')));
-            $date_exp = $datetime[0];
-            $time = $datetime[1];
-        }
         run_hook('customer_activate_voucher'); #HOOK
         if ($v1) {
-            if ($v1['type'] == 'Hotspot') {
-                if ($b) {
-                    if (!$config['radius_mode']) {
-                        $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
-                        Mikrotik::removeHotspotUser($client, $c['username']);
-                        Mikrotik::addHotspotUser($client, $p, $c);
-                    }
-                    $b->customer_id = $user['id'];
-                    $b->username = $c['username'];
-                    $b->plan_id = $v1['id_plan'];
-                    $b->namebp = $p['name_plan'];
-                    $b->recharged_on = $date_only;
-                    $b->expiration = $date_exp;
-                    $b->time = $time;
-                    $b->status = "on";
-                    $b->method = "voucher";
-                    $b->routers = $v1['routers'];
-                    $b->type = "Hotspot";
-                    $b->save();
-
-                    // 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'];
-                    $t->price = $p['price'];
-                    $t->recharged_on = $date_only;
-                    $t->expiration = $date_exp;
-                    $t->time = $time;
-                    $t->method = "voucher";
-                    $t->routers = $v1['routers'];
-                    $t->type = "Hotspot";
-                    $t->save();
-                } else {
-                    if (!$config['radius_mode']) {
-                        $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
-                        Mikrotik::addHotspotUser($client, $p, $c);
-                    }
-
-                    $d = ORM::for_table('tbl_user_recharges')->create();
-                    $d->customer_id = $user['id'];
-                    $d->username = $c['username'];
-                    $d->plan_id = $v1['id_plan'];
-                    $d->namebp = $p['name_plan'];
-                    $d->recharged_on = $date_only;
-                    $d->expiration = $date_exp;
-                    $d->time = $time;
-                    $d->status = "on";
-                    $d->method = "voucher";
-                    $d->routers = $v1['routers'];
-                    $d->type = "Hotspot";
-                    $d->save();
-
-                    // 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'];
-                    $t->price = $p['price'];
-                    $t->recharged_on = $date_only;
-                    $t->expiration = $date_exp;
-                    $t->time = $time;
-                    $t->method = "voucher";
-                    $t->routers = $v1['routers'];
-                    $t->type = "Hotspot";
-                    $t->save();
-                }
-
+            if (Package::rechargeUser($user, $v1['routers'], $v1['id_plan'], "Activation", "Voucher")) {
                 $v1->status = "1";
                 $v1->user = $c['username'];
                 $v1->save();
-                // Telegram to Admin
-                Message::sendTelegram('#u' . $c['username'] . " Activate #Voucher #Hotspot\n" . $p['name_plan'] .
-                    "\nCode: " . $code .
-                    "\nRouter: " . $v1['routers'] .
-                    "\nPrice: " . $p['price']);
+                r2(U . "voucher/list-activated", 's', $_L['Activation_Vouchers_Successfully']);
             } else {
-                if ($b) {
-                    if (!$config['radius_mode']) {
-                        $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
-                        Mikrotik::removePpoeUser($client, $c['username']);
-                        Mikrotik::addPpoeUser($client, $p, $c);
-                    }
-
-                    $b->customer_id = $user['id'];
-                    $b->username = $c['username'];
-                    $b->plan_id = $v1['id_plan'];
-                    $b->namebp = $p['name_plan'];
-                    $b->recharged_on = $date_only;
-                    $b->expiration = $date_exp;
-                    $b->time = $time;
-                    $b->status = "on";
-                    $b->method = "voucher";
-                    $b->routers = $v1['routers'];
-                    $b->type = "PPPOE";
-                    $b->save();
-
-                    // 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'];
-                    $t->price = $p['price'];
-                    $t->recharged_on = $date_only;
-                    $t->expiration = $date_exp;
-                    $t->time = $time;
-                    $t->method = "voucher";
-                    $t->routers = $v1['routers'];
-                    $t->type = "PPPOE";
-                    $t->save();
-                } else {
-                    if (!$config['radius_mode']) {
-                        $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
-                        Mikrotik::addPpoeUser($client, $p, $c);
-                    }
-
-                    $d = ORM::for_table('tbl_user_recharges')->create();
-                    $d->customer_id = $user['id'];
-                    $d->username = $c['username'];
-                    $d->plan_id = $v1['id_plan'];
-                    $d->namebp = $p['name_plan'];
-                    $d->recharged_on = $date_only;
-                    $d->expiration = $date_exp;
-                    $d->time = $time;
-                    $d->status = "on";
-                    $d->method = "voucher";
-                    $d->routers = $v1['routers'];
-                    $d->type = "PPPOE";
-                    $d->save();
-
-                    // 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'];
-                    $t->price = $p['price'];
-                    $t->recharged_on = $date_only;
-                    $t->expiration = $date_exp;
-                    $t->time = $time;
-                    $t->method = "voucher";
-                    $t->routers = $v1['routers'];
-                    $t->type = "PPPOE";
-                    $t->save();
-                }
-
-                $v1->status = "1";
-                $v1->user = $c['username'];
-                $v1->save();
-                // Telegram to Admin
-                Message::sendTelegram('#u' . $c['username'] . " Activate #Voucher #PPPOE\n" . $p['name_plan'] .
-                    "\nCode: " . $code .
-                    "\nRouter: " . $v1['routers'] .
-                    "\nPrice: " . $p['price']);
+                r2(U . 'voucher/activation', 'e', "Failed to refill account");
             }
-
-            r2(U . "voucher/list-activated", 's', $_L['Activation_Vouchers_Successfully']);
         } else {
             r2(U . 'voucher/activation', 'e', $_L['Voucher_Not_Valid']);
         }
diff --git a/system/updates.json b/system/updates.json
index 2e9b9530..6269b896 100644
--- a/system/updates.json
+++ b/system/updates.json
@@ -15,6 +15,7 @@
         "ALTER TABLE `tbl_customers` CHANGE `pppoe_password` `pppoe_password` VARCHAR(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '0' COMMENT 'For PPPOE Login';"
     ],
     "2023.8.28" : [
-        "ALTER TABLE `tbl_user_recharges` CHANGE `recharged_on` `recharged_on` DATETIME NOT NULL;"
+        "ALTER TABLE `tbl_user_recharges` ADD `recharged_time` time NOT NULL DEFAULT '00:00:00' AFTER `recharged_on`;",
+        "ALTER TABLE `tbl_transactions` ADD `recharged_time` time NOT NULL DEFAULT '00:00:00' AFTER `recharged_on`;"
     ]
 }
\ No newline at end of file
diff --git a/ui/ui/customers-view.tpl b/ui/ui/customers-view.tpl
index c990fa1f..422aaadb 100644
--- a/ui/ui/customers-view.tpl
+++ b/ui/ui/customers-view.tpl
@@ -73,7 +73,8 @@
                                 class="pull-right">{if $package['status']=='on'}yes{else}no{/if}</span>
                         </li>
                         <li class="list-group-item">
-                            {$_L['Created_On']} <span class="pull-right">{Lang::dateFormat($package['recharged_on'])}</span>
+                            {$_L['Created_On']} <span
+                                class="pull-right">{Lang::dateAndTimeFormat($package['recharged_on'],$package['recharged_time'])}</span>
                         </li>
                         <li class="list-group-item">
                             {$_L['Expires_On']} <span
@@ -116,9 +117,9 @@
                                 <td>{$ds['plan_name']}</td>
                                 <td>{Lang::moneyFormat($ds['price'])}</td>
                                 <td>{$ds['type']}</td>
-                                <td class="text-success">{date($_c['date_format'], strtotime($ds['recharged_on']))}</td>
-                                <td class="text-danger">{date($_c['date_format'], strtotime($ds['expiration']))}
-                                    {$ds['time']}</td>
+                                <td class="text-success">{Lang::dateAndTimeFormat($ds['recharged_on'],$ds['recharged_time'])}
+                                </td>
+                                <td class="text-danger">{Lang::dateAndTimeFormat($ds['expiration'],$ds['time'])}</td>
                                 <td>{$ds['method']}</td>
                             </tr>
                         {/foreach}
@@ -146,12 +147,9 @@
                                 <td>{$ds['routers']}</td>
                                 <td>{$ds['payment_channel']}</td>
                                 <td>{Lang::moneyFormat($ds['price'])}</td>
-                                <td class="text-primary">{date("{$_c['date_format']} H:i",
-                                    strtotime($ds['created_date']))}</td>
-                                <td class="text-danger">{date("{$_c['date_format']} H:i",
-                                    strtotime($ds['expired_date']))}</td>
-                                <td class="text-success">{if $ds['status']!=1}{date("{$_c['date_format']} H:i",
-                                    strtotime($ds['paid_date']))}{/if}</td>
+                                <td class="text-primary">{Lang::dateTimeFormat($ds['created_date'])}</td>
+                                <td class="text-danger">{Lang::dateTimeFormat($ds['expired_date'])}</td>
+                                <td class="text-success">{if $ds['status']!=1}{Lang::dateTimeFormat($ds['paid_date'])}{/if}</td>
                                 <td>{if $ds['status']==1}{$_L['UNPAID']}
                                     {elseif $ds['status']==2}{$_L['PAID']}
                                     {elseif $ds['status']==3}{$_L['FAILED']}
diff --git a/ui/ui/dashboard.tpl b/ui/ui/dashboard.tpl
index 6d8151fc..873d4ee0 100644
--- a/ui/ui/dashboard.tpl
+++ b/ui/ui/dashboard.tpl
@@ -108,9 +108,9 @@
                             <tr>
                                 <td>{$no++}</td>
                                 <td><a href="{$_url}customers/viewu/{$expired['username']}">{$expired['username']}</a></td>
-                                <td>{date($_c['date_format'], strtotime($expired['recharged_on']))}
+                                <td>{Lang::dateAndTimeFormat($expired['recharged_on'],$expired['recharged_time'])}
                                 </td>
-                                <td>{date($_c['date_format'], strtotime($expired['expiration']))} {$expired['time']}
+                                <td>{Lang::dateAndTimeFormat($expired['expiration'],$expired['time'])}
                                 </td>
                             </tr>
                         </tbody>
diff --git a/ui/ui/invoice-print.tpl b/ui/ui/invoice-print.tpl
index 8da794d5..942692ec 100644
--- a/ui/ui/invoice-print.tpl
+++ b/ui/ui/invoice-print.tpl
@@ -39,9 +39,8 @@
                             {$_L['Password']} : **********<br>
                             {if $in['type'] != 'Balance'}
                                 <br>
-                                {$_L['Created_On']} : <b>{date($_c['date_format'], strtotime($d['recharged_on']))}</b><br>
-                                {$_L['Expires_On']} : <b>{date($_c['date_format'], strtotime($d['expiration']))}
-                                    {$d['time']}</b><br>
+                                {$_L['Created_On']} : <b>{Lang::dateAndTimeFormat($d['recharged_on'],$d['recharged_time'])}</b><br>
+                                {$_L['Expires_On']} : <b>{Lang::dateAndTimeFormat($d['expiration'],$d['time'])}</b><br>
                             {/if}
                             ============================================<br>
                             <center>{$_c['note']}</center>
diff --git a/ui/ui/invoice.tpl b/ui/ui/invoice.tpl
index 5f4a9d3f..fdb48984 100644
--- a/ui/ui/invoice.tpl
+++ b/ui/ui/invoice.tpl
@@ -24,9 +24,8 @@
                         {$_L['Password']} : **********<br>
                         {if $in['type'] != 'Balance'}
                             <br>
-                            {$_L['Created_On']} : <b>{date($_c['date_format'], strtotime($in['recharged_on']))}</b><br>
-                            {$_L['Expires_On']} : <b>{date($_c['date_format'], strtotime($in['expiration']))}
-                                {$in['time']}</b><br>
+                            {$_L['Created_On']} : <b>{Lang::dateAndTimeFormat($in['recharged_on'],$in['recharged_time'])}</b><br>
+                            {$_L['Expires_On']} : <b>{Lang::dateAndTimeFormat($in['expiration'],$in['time'])}</b><br>
                         {/if}
                         =====================================================<br>
                         <center>{$_c['note']}</center>
diff --git a/ui/ui/prepaid-edit.tpl b/ui/ui/prepaid-edit.tpl
index d95009cc..07080688 100644
--- a/ui/ui/prepaid-edit.tpl
+++ b/ui/ui/prepaid-edit.tpl
@@ -32,8 +32,8 @@
                     <div class="form-group">
                         <label class="col-md-2 control-label">{$_L['Created_On']}</label>
                         <div class="col-md-6">
-                            <input type="date" class="form-control" id="recharged_on" name="recharged_on"
-                                value="{$d['recharged_on']}">
+                            <input type="date" class="form-control" id="recharged_on" name="recharged_on" readonly
+                                value="{$d['recharged_on']} {$d['recharged_time']}">
                         </div>
                     </div>
                     <div class="form-group">
diff --git a/ui/ui/prepaid.tpl b/ui/ui/prepaid.tpl
index a80aabcb..3a8ad2be 100644
--- a/ui/ui/prepaid.tpl
+++ b/ui/ui/prepaid.tpl
@@ -1,66 +1,70 @@
 {include file="sections/header.tpl"}
 
-					<div class="row">
-						<div class="col-sm-12">
-							<div class="panel panel-hovered mb20 panel-primary">
-								<div class="panel-heading">{$_L['Prepaid_User']}</div>
-								<div class="panel-body">
-									<div class="md-whiteframe-z1 mb20 text-center" style="padding: 15px">
-										<div class="col-md-8">
-											<form id="site-search" method="post" action="{$_url}prepaid/list/">
-											<div class="input-group">
-												<div class="input-group-addon">
-													<span class="fa fa-search"></span>
-												</div>
-												<input type="text" name="username" class="form-control" placeholder="{$_L['Search_by_Username']}..." value="{$cari}">
-												<div class="input-group-btn">
-													<button class="btn btn-success" type="submit">{$_L['Search']}</button>
-												</div>
-											</div>
-											</form>
-										</div>
-										<div class="col-md-4">
-											<a href="{$_url}prepaid/recharge" class="btn btn-primary btn-block waves-effect"><i class="ion ion-android-add"> </i> {$_L['Recharge_Account']}</a>
-										</div>&nbsp;
-									</div>
-                                    <div class="table-responsive">
-                                        <table id="datatable" class="table table-bordered table-striped table-condensed">
-                                            <thead>
-                                                <tr>
-                                                    <th>{$_L['Username']}</th>
-                                                    <th>{$_L['Plan_Name']}</th>
-                                                    <th>{$_L['Type']}</th>
-                                                    <th>{$_L['Created_On']}</th>
-                                                    <th>{$_L['Expires_On']}</th>
-                                                    <th>{$_L['Method']}</th>
-                                                    <th>{$_L['Routers']}</th>
-                                                    <th>{$_L['Manage']}</th>
-                                                </tr>
-                                            </thead>
-                                            <tbody>
-                                            {foreach $d as $ds}
-                                                <tr>
-                                                    <td>{$ds['username']}</td>
-                                                    <td>{$ds['namebp']}</td>
-                                                    <td>{$ds['type']}</td>
-                                                    <td>{$ds['recharged_on']}</td>
-                                                    <td>{$ds['expiration']} {$ds['time']}</td>
-                                                    <td>{$ds['method']}</td>
-                                                    <td>{$ds['routers']}</td>
-                                                    <td>
-                                                        <a href="{$_url}prepaid/edit/{$ds['id']}" class="btn btn-warning btn-xs">{$_L['Edit']}</a>
-                                                        <a href="{$_url}prepaid/delete/{$ds['id']}" id="{$ds['id']}" class="btn btn-danger btn-xs">{$_L['Delete']}</a>
-                                                    </td>
-                                                </tr>
-                                            {/foreach}
-                                            </tbody>
-                                        </table>
-                                    </div>
-                                    {$paginator['contents']}
-								</div>
-							</div>
-						</div>
-					</div>
+<div class="row">
+    <div class="col-sm-12">
+        <div class="panel panel-hovered mb20 panel-primary">
+            <div class="panel-heading">{$_L['Prepaid_User']}</div>
+            <div class="panel-body">
+                <div class="md-whiteframe-z1 mb20 text-center" style="padding: 15px">
+                    <div class="col-md-8">
+                        <form id="site-search" method="post" action="{$_url}prepaid/list/">
+                            <div class="input-group">
+                                <div class="input-group-addon">
+                                    <span class="fa fa-search"></span>
+                                </div>
+                                <input type="text" name="username" class="form-control"
+                                    placeholder="{$_L['Search_by_Username']}..." value="{$cari}">
+                                <div class="input-group-btn">
+                                    <button class="btn btn-success" type="submit">{$_L['Search']}</button>
+                                </div>
+                            </div>
+                        </form>
+                    </div>
+                    <div class="col-md-4">
+                        <a href="{$_url}prepaid/recharge" class="btn btn-primary btn-block waves-effect"><i
+                                class="ion ion-android-add"> </i> {$_L['Recharge_Account']}</a>
+                    </div>&nbsp;
+                </div>
+                <div class="table-responsive">
+                    <table id="datatable" class="table table-bordered table-striped table-condensed">
+                        <thead>
+                            <tr>
+                                <th>{$_L['Username']}</th>
+                                <th>{$_L['Plan_Name']}</th>
+                                <th>{$_L['Type']}</th>
+                                <th>{$_L['Created_On']}</th>
+                                <th>{$_L['Expires_On']}</th>
+                                <th>{$_L['Method']}</th>
+                                <th>{$_L['Routers']}</th>
+                                <th>{$_L['Manage']}</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            {foreach $d as $ds}
+                                <tr>
+                                    <td><a href="{$_url}customers/viewu/{$ds['username']}">{$ds['username']}</a></td>
+                                    <td>{$ds['namebp']}</td>
+                                    <td>{$ds['type']}</td>
+                                    <td>{Lang::dateAndTimeFormat($ds['recharged_on'],$ds['recharged_time'])}</td>
+                                    <td>{Lang::dateAndTimeFormat($ds['expiration'],$ds['time'])}</td>
+                                    <td>{$ds['method']}</td>
+                                    <td>{$ds['routers']}</td>
+                                    <td>
+                                        <a href="{$_url}prepaid/edit/{$ds['id']}"
+                                            class="btn btn-warning btn-xs">{$_L['Edit']}</a>
+                                        <a href="{$_url}prepaid/delete/{$ds['id']}" id="{$ds['id']}"
+                                            class="btn btn-danger btn-xs">{$_L['Delete']}</a>
+                                    </td>
+                                </tr>
+                            {/foreach}
+                        </tbody>
+                    </table>
+                </div>
+                {$paginator['contents']}
+            </div>
+        </div>
+    </div>
+</div>
 
 
-{include file="sections/footer.tpl"}
+{include file="sections/footer.tpl"}
\ No newline at end of file
diff --git a/ui/ui/print-by-date.tpl b/ui/ui/print-by-date.tpl
index fd8f3d9a..ed7e96ee 100644
--- a/ui/ui/print-by-date.tpl
+++ b/ui/ui/print-by-date.tpl
@@ -39,8 +39,8 @@
                             <td class="text-center">{$ds['plan_name']}</td>
                             <td class="text-center">{$ds['type']}</td>
                             <td class="text-right">{Lang::moneyFormat($ds['price'])}</td>
-                            <td>{date($_c['date_format'], strtotime($ds['recharged_on']))}</td>
-                            <td>{date($_c['date_format'], strtotime($ds['expiration']))} {$ds['time']}</td>
+                            <td>{Lang::dateAndTimeFormat($ds['recharged_on'],$ds['recharged_time'])}</td>
+                            <td>{Lang::dateAndTimeFormat($ds['expiration'],$ds['time'])}</td>
                             <td class="text-center">{$ds['method']}</td>
                             <td class="text-center">{$ds['routers']}</td>
                         </tr>
diff --git a/ui/ui/print-by-period.tpl b/ui/ui/print-by-period.tpl
index 95f47a51..ec8d0ab6 100644
--- a/ui/ui/print-by-period.tpl
+++ b/ui/ui/print-by-period.tpl
@@ -39,8 +39,8 @@
                             <td class="text-center">{$ds['plan_name']}</td>
                             <td class="text-center">{$ds['type']}</td>
                             <td class="text-right">{Lang::moneyFormat($ds['price'])}</td>
-                            <td>{date($_c['date_format'], strtotime($ds['recharged_on']))}</td>
-                            <td>{date($_c['date_format'], strtotime($ds['expiration']))} {$ds['time']}</td>
+                            <td>{Lang::dateAndTimeFormat($ds['recharged_on'],$ds['recharged_time'])}</td>
+                            <td>{Lang::dateAndTimeFormat($ds['expiration'],$ds['time'])}</td>
                             <td class="text-center">{$ds['method']}</td>
                             <td class="text-center">{$ds['routers']}</td>
                         </tr>
diff --git a/ui/ui/reports-daily.tpl b/ui/ui/reports-daily.tpl
index 116a342c..53525a83 100644
--- a/ui/ui/reports-daily.tpl
+++ b/ui/ui/reports-daily.tpl
@@ -42,8 +42,8 @@
                                 <td>{$ds['type']}</td>
                                 <td>{$ds['plan_name']}</td>
                                 <td class="text-right">{Lang::moneyFormat($ds['price'])}</td>
-                                <td>{date($_c['date_format'], strtotime($ds['recharged_on']))}</td>
-                                <td>{date($_c['date_format'], strtotime($ds['expiration']))} {$ds['time']}</td>
+                                <td>{Lang::dateAndTimeFormat($ds['recharged_on'],$ds['recharged_time'])}</td>
+                                <td>{Lang::dateAndTimeFormat($ds['expiration'],$ds['time'])}</td>
                                 <td>{$ds['method']}</td>
                                 <td>{$ds['routers']}</td>
                             </tr>
diff --git a/ui/ui/reports-period-view.tpl b/ui/ui/reports-period-view.tpl
index 1082f1b5..69a5f43c 100644
--- a/ui/ui/reports-period-view.tpl
+++ b/ui/ui/reports-period-view.tpl
@@ -53,8 +53,8 @@
                                 <td>{$ds['type']}</td>
                                 <td>{$ds['plan_name']}</td>
                                 <td class="text-right">{Lang::moneyFormat($ds['price'])}</td>
-                                <td>{date($_c['date_format'], strtotime($ds['recharged_on']))}</td>
-                                <td>{date($_c['date_format'], strtotime($ds['expiration']))} {$ds['time']}</td>
+                                <td>{Lang::dateAndTimeFormat($ds['recharged_on'],$ds['recharged_time'])}</td>
+                                <td>{Lang::dateAndTimeFormat($ds['expiration'],$ds['time'])}</td>
                                 <td>{$ds['method']}</td>
                                 <td>{$ds['routers']}</td>
                             </tr>
diff --git a/ui/ui/user-activation-list.tpl b/ui/ui/user-activation-list.tpl
index e0a4542e..8d6c8841 100644
--- a/ui/ui/user-activation-list.tpl
+++ b/ui/ui/user-activation-list.tpl
@@ -26,9 +26,8 @@
                                     <td>{$ds['plan_name']}</td>
                                     <td>{Lang::moneyFormat($ds['price'])}</td>
                                     <td>{$ds['type']}</td>
-                                    <td class="text-success">{date($_c['date_format'], strtotime($ds['recharged_on']))}</td>
-                                    <td class="text-danger">{date($_c['date_format'], strtotime($ds['expiration']))}
-                                        {$ds['time']}</td>
+                                    <td>{Lang::dateAndTimeFormat($ds['recharged_on'],$ds['recharged_time'])}</td>
+                                    <td>{Lang::dateAndTimeFormat($ds['expiration'],$ds['time'])}</td>
                                     <td>{$ds['method']}</td>
                                 </tr>
                             {/foreach}
diff --git a/ui/ui/user-dashboard.tpl b/ui/ui/user-dashboard.tpl
index 39a63c31..12941cd7 100644
--- a/ui/ui/user-dashboard.tpl
+++ b/ui/ui/user-dashboard.tpl
@@ -84,14 +84,14 @@
                 <tr>
                     <td class="small text-info text-uppercase text-normal">{$_L['Created_On']}</td>
                     <td class="small mb15">
-                        {if $_bill['time'] ne ''}{date($_c['date_format'], strtotime($_bill['recharged_on']))}
+                        {if $_bill['time'] ne ''}{Lang::dateAndTimeFormat($_bill['recharged_on'],$_bill['recharged_time'])}
                         {/if}&nbsp;</td>
                 </tr>
                 <tr>
                     <td class="small text-danger text-uppercase text-normal">{$_L['Expires_On']}</td>
                     <td class="small mb15">
-                        {if $_bill['time'] ne ''}{date($_c['date_format'], strtotime($_bill['expiration']))}
-                        {$_bill['time']}{/if}&nbsp;</td>
+                        {if $_bill['time'] ne ''}{Lang::dateAndTimeFormat($_bill['expiration'],$_bill['time'])}{/if}&nbsp;
+                    </td>
                 </tr>
                 {if $_bill['type'] == 'Hotspot' && $_bill['status'] == 'on'}
                     {if $nux_ip}
@@ -151,23 +151,24 @@
                                     placeholder="{$_L['Username']}">
                             </div>
                             <div class="col-sm-5">
-                                <input type="number" id="balance" name="balance" autocomplete="off" class="form-control" required
-                                    placeholder="{$_L['Balance']}">
+                                <input type="number" id="balance" name="balance" autocomplete="off" class="form-control"
+                                    required placeholder="{$_L['Balance']}">
                             </div>
                             <div class="form-group col-sm-2" align="center">
-                                <button class="btn btn-success btn-block" id="sendBtn" type="submit" name="send" value="balance"><i class="glyphicon glyphicon-send"></i></button>
+                                <button class="btn btn-success btn-block" id="sendBtn" type="submit" name="send"
+                                    value="balance"><i class="glyphicon glyphicon-send"></i></button>
                             </div>
                         </div>
                     </form>
                     <script>
-                        function askConfirm(){
+                        function askConfirm() {
                             if(confirm('{Lang::T('Send your balance?')}')){
-                                setTimeout(() => {
-                                    document.getElementById('sendBtn').setAttribute('disabled', '');
-                                }, 1000);
-                                return true;
-                            }
-                            return false;
+                            setTimeout(() => {
+                                document.getElementById('sendBtn').setAttribute('disabled', '');
+                            }, 1000);
+                            return true;
+                        }
+                        return false;
                         }
                     </script>
                 </div>