Modal Privacy and Toc

User extend plan
loading gif
2023-09-21 16:36:43 +07:00 · 2023-09-21 16:04:18 +07:00 · 2023-09-21 14:54:00 +07:00 · 2023-09-21 14:14:33 +07:00 · 2023-09-21 14:12:49 +07:00 · 2023-09-21 13:51:50 +07:00
94 changed files with 2678 additions and 1375 deletions
--- a/.gitignore
+++ b/.gitignore
@ -20,7 +20,9 @@ system/plugin/ui/*
 ui/ui_custom/**
 !ui/ui_custom/index.html
 !ui/ui_custom/README.md
-system/uploads/admin.png
-system/uploads/logo.png
-system/uploads/user.jpg
-system/uploads/notifications.json
+system/uploads/**
+!system/uploads/*.default.png
+system/uploads/sms/**
+!system/uploads/sms/index.html
+system/uploads/system/**
+!system/uploads/system/index.html
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -2,6 +2,70 @@

 # CHANGELOG

+## 2023.9.21
+
+- Customer can extend Plan
+- Customer can Deactivate active plan
+- add variable nux-router to select  only plan from that router
+- Show user expired until 30 items
+
+## 2023.9.20
+
+- Fix Customer balance header
+- Deactivate Customer active plan
+- Sync Customer Plan to Mikrotik
+- Recharge Customer from Customer Details
+- Add Privacy Policy and Terms and Conditions Pages
+
+## 2023.9.13
+
+- add Current balance in notification
+- Buy Plan for Friend
+- Recharge Friend plan
+- Fix recharge Plan
+- Show Customer active plan in Customer list
+- Fix Customer counter in dashboard
+- Show Customer Balance in header
+- Fix Plugin Manager using Http::Get
+- Show Some error page when crash
+## 2023.9.7
+
+- Fix PPPOE Delete Customer
+- Remove active Customer before deleting
+- Show IP and Mac even if it not Hotspot
+
+## 2023.9.6
+
+- Expired Pool
+Customer can be move to expired pool after plan expired by cron
+- Fix Delete customer
+- tbl_language removed
+
+## 2023.9.1.1
+
+- Fix cronjob Delete customer
+- Fix reminder text
+
+## 2023.9.1
+
+- Critical bug fixes, bug happen when user buy package, expired time will be calculated from last expired, not from when they buy the package
+- Time not change after user buy package for extending
+- Add Cancel Button to user dashboard when it show unpaid package
+- Fix username in user dashboard
+
+## 2023.8.30
+
+- Upload Logo from settings
+- Fix Print value
+- Fix Time when editing prepaid
+
+## 2023.8.28
+
+- Extend expiration if buy same package
+- Fix calendar
+- Add recharge time
+- Fix allow balance transfer
+
 ## 2023.8.24

 - Balance transfer between Customer
--- a/Sample/Voucher_after_print.jpg
+++ b/Sample/Voucher_after_print.jpg
--- a/Sample/Voucher_before_Printed.png
+++ b/Sample/Voucher_before_Printed.png
--- a/Sample/dont_upload_to_server
+++ b/Sample/dont_upload_to_server
--- a/index.php
+++ b/index.php
@ -11,6 +11,11 @@ if(isset($_GET['nux-mac']) && !empty($_GET['nux-mac'])){
 if(isset($_GET['nux-ip']) && !empty($_GET['nux-ip'])){
    $_SESSION['nux-ip'] = $_GET['nux-ip'];
 }
+
+if(isset($_GET['nux-router']) && !empty($_GET['nux-router'])){
+    $_SESSION['nux-router'] = $_GET['nux-router'];
+}
+
 require_once 'system/vendor/autoload.php';
 require_once 'system/boot.php';
 App::_run();
--- a/install/index.php
+++ b/install/index.php
@ -16,11 +16,8 @@

 <body style='background-color: #FBFBFB;'>
    <div id='main-container'>
-        <div class='header'>
-            <div class="header-box wrapper">
-                <div class="hd-logo"><a href="#"><img src="img/logo.png" alt="Logo" /></a></div>
-            </div>
-        </div>
+        <img src="img/logo.png" class="img-responsive" alt="Logo" />
+        <hr>
        <!--  contents area start  -->
        <div class="row">
            <div class="col-md-12">
--- a/install/phpnuxbill.sql
+++ b/install/phpnuxbill.sql
@ -65,22 +65,6 @@ CREATE TABLE

 --

-- Struktur dari tabel `tbl_language`
-
--
-
-CREATE TABLE
-    `tbl_language` (
-        `id` int(10) NOT NULL,
-        `name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-        `folder` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-        `author` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL
-    ) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_general_ci;
-
-- --------------------------------------------------------
-
--
-
 -- Struktur dari tabel `tbl_logs`

 --
@ -174,6 +158,7 @@ CREATE TABLE
        `shared_users` int(10) DEFAULT NULL,
        `routers` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
        `pool` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+        `pool_expired` varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '',
        `enabled` tinyint(1) NOT NULL DEFAULT '1' COMMENT '0 disabled\r\n'
    ) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_general_ci;

@ -228,6 +213,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 +257,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,
@ -343,14 +330,6 @@ ALTER TABLE `tbl_customers` ADD PRIMARY KEY (`id`);

 --

-- Indeks untuk tabel `tbl_language`
-
--
-
-ALTER TABLE `tbl_language` ADD PRIMARY KEY (`id`);
-
--
-
 -- Indeks untuk tabel `tbl_logs`

 --
@ -464,15 +443,6 @@ ALTER TABLE

 --

-- AUTO_INCREMENT untuk tabel `tbl_language`
-
--
-
-ALTER TABLE
-    `tbl_language` MODIFY `id` int(10) NOT NULL AUTO_INCREMENT;
-
--
-
 -- AUTO_INCREMENT untuk tabel `tbl_logs`

 --
@ -608,39 +578,4 @@ VALUES (
        'Active',
        '2022-09-06 16:09:50',
        '2014-06-23 01:43:07'
-    );
-
--
-
-- Dumping data untuk tabel `tbl_language`
-
--
-
-INSERT INTO
-    `tbl_language` (
-        `id`,
-        `name`,
-        `folder`,
-        `author`
-    )
-VALUES (
-        1,
-        'Indonesia',
-        'indonesia',
-        'Ismail Marzuqi'
-    ), (
-        2,
-        'English',
-        'english',
-        'Ismail Marzuqi'
-    ), (
-        3,
-        'Spanish',
-        'spanish',
-        'Luis Hernandez'
-    ), (
-        4,
-        'Türkçe',
-        'turkish',
-        'Goktug Bogac Ogel'
    );
--- a/install/step2.php
+++ b/install/step2.php
@ -16,11 +16,8 @@

 <body style='background-color: #FBFBFB;'>
    <div id='main-container'>
-        <div class='header'>
-            <div class="header-box wrapper">
-                <div class="hd-logo"><a href="#"><img src="img/logo.png" alt="Logo" /></a></div>
-            </div>
-        </div>
+        <img src="img/logo.png" class="img-responsive" alt="Logo" />
+        <hr>

        <div class="span12">
            <h4> PHPNuxBill Installer </h4>
--- a/install/step3.php
+++ b/install/step3.php
@ -15,11 +15,8 @@

 <body style='background-color: #FBFBFB;'>
 	<div id='main-container'>
-		<div class='header'>
-			<div class="header-box wrapper">
-				<div class="hd-logo"><a href="#"><img src="img/logo.png" alt="Logo"/></a></div>
-			</div>
-		</div>
+        <img src="img/logo.png" class="img-responsive" alt="Logo" />
+        <hr>

 		<div class="span12">
 			<h4> PHPNuxBill  Installer </h4>
--- a/install/step4.php
+++ b/install/step4.php
@ -82,11 +82,8 @@ $wConfig = "../config.php";

 <body style='background-color: #FBFBFB;'>
 	<div id='main-container'>
-		<div class='header'>
-			<div class="header-box wrapper">
-				<div class="hd-logo"><a href="#"><img src="img/logo.png" alt="Logo"/></a></div>
-			</div>
-		</div>
+        <img src="img/logo.png" class="img-responsive" alt="Logo" />
+        <hr>

 		<div class="span12">
 			<h4> PHPNuxBill  Installer </h4>
--- a/install/step5.php
+++ b/install/step5.php
@ -1,7 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
+
 <head>
-    <title>PHPNuxBill  Installer</title>
+    <title>PHPNuxBill Installer</title>
    <link rel="shortcut icon" type="image/x-icon" href="img/favicon.ico">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">

@ -9,38 +10,46 @@
    <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
    <![endif]-->

-    <link type='text/css' href='css/style.css' rel='stylesheet'/>
+    <link type='text/css' href='css/style.css' rel='stylesheet' />
    <link type='text/css' href="css/bootstrap.min.css" rel="stylesheet">
 </head>
+<?php if (!file_exists('../pages')) rename('../pages_template', '../pages'); ?>

 <body style='background-color: #FBFBFB;'>
-	<div id='main-container'>
-		<div class='header'>
-			<div class="header-box wrapper">
-				<div class="hd-logo"><a href="#"><img src="img/logo.png" alt="Logo"/></a></div>
-			</div>
-		</div>
-
-		<div class="span12">
-			<h4> PHPNuxBill  Installer </h4>
-			<p>
-				<strong>Congratulations!</strong><br>
-				You have just install PHPNuxBill !<br>
-				To Login Admin Portal:<br>
-				Use this link -
-				<?php
-				$cururl = (((!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off')|| $_SERVER['SERVER_PORT'] == 443)?'https':'http').'://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
-				$appurl = str_replace('/install/step5.php', '', $cururl);
-				$appurl = str_replace('/system', '', $appurl);
-				echo '<a href="' . $appurl . '/admin">' . $appurl . '/admin</a>';
-				?>
-				<br>
-				Username: admin<br>
-				Password: admin<br>
-				For security, Delete the <b>install</b> directory inside system folder.
-			</p>
-		</div>
-	</div>
-	<div class="footer">Copyright &copy; 2021 PHPNuxBill. All Rights Reserved<br/><br/></div>
+    <div id='main-container'>
+        <img src="img/logo.png" class="img-responsive" alt="Logo" />
+        <hr>
+        <div class="span12">
+            <h4> PHPNuxBill Installer </h4>
+            <p>
+                <strong>Congratulations!</strong><br>
+                You have just install PHPNuxBill !<br><br>
+                <span class="text-danger">But wait!!<br>
+                    <ol>
+                        <li>Don't forget to rename folder <b>pages_example</b> to <b>pages</b>.<br>
+                            if it not yet renamed</li>
+                        <li>Activate <a href="https://github.com/hotspotbilling/phpnuxbill/wiki/Cron-Jobs" target="_blank">Cronjob</a> for Expired and Reminder.</li>
+                        <li>Check <a href="https://github.com/hotspotbilling/phpnuxbill/wiki/How-It-Works---Cara-kerja" target="_blank">how PHPNuxbill Works</a></li>
+                        <li><a href="https://github.com/hotspotbilling/phpnuxbill/wiki#login-page-mikrotik" target="_blank">how to link Mikrotik Login to PHPNuxBill</a></li>
+                        <li>or use <a href="https://github.com/hotspotbilling/phpnuxbill-mikrotik-login-template" target="_blank">Mikrotik Login Template for PHPNuxBill</a></li>
+                    </ol>
+                </span><br><br>
+                To Login Admin Portal:<br>
+                Use this link -
+                <?php
+                $cururl = (((!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') || $_SERVER['SERVER_PORT'] == 443) ? 'https' : 'http') . '://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+                $appurl = str_replace('/install/step5.php', '', $cururl);
+                $appurl = str_replace('/system', '', $appurl);
+                echo '<a href="' . $appurl . '/admin">' . $appurl . '/admin</a>';
+                ?>
+                <br>
+                Username: admin<br>
+                Password: admin<br>
+                For security, Delete the <b>install</b> directory inside system folder.
+            </p>
+        </div>
+    </div>
+    <div class="footer">Copyright &copy; 2021 PHPNuxBill. All Rights Reserved<br /><br /></div>
 </body>
+
 </html>
--- a/install/update.php
+++ b/install/update.php
@ -16,11 +16,8 @@

 <body style='background-color: #FBFBFB;'>
    <div id='main-container'>
-        <div class='header'>
-            <div class="header-box wrapper">
-                <div class="hd-logo"><a href="#"><img src="img/logo.png" alt="Logo" /></a></div>
-            </div>
-        </div>
+        <img src="img/logo.png" class="img-responsive" alt="Logo" />
+        <hr>

        <div class="span12">
            <h4> PHPNuxBill Updater </h4>
--- a/pages_template/Privacy_Policy.html
+++ b/pages_template/Privacy_Policy.html
@ -0,0 +1,62 @@
+<h1>Privacy Policy for PHPNuxBill</h1>
+
+<p>At PHPNuxBill, accessible from https://github.com/hotspotbilling/phpnuxbill, one of our main priorities is the
+    privacy of our visitors. This Privacy Policy document contains types of information that is collected and recorded
+    by PHPNuxBill and how we use it.</p>
+
+<p>If you have additional questions or require more information about our Privacy Policy, do not hesitate to contact us.
+</p>
+
+<h2>Log Files</h2>
+
+<p>PHPNuxBill follows a standard procedure of using log files. These files log visitors when they visit websites. All
+    hosting companies do this and a part of hosting services' analytics. The information collected by log files include
+    internet protocol (IP) addresses, browser type, Internet Service Provider (ISP), date and time stamp, referring/exit
+    pages, and possibly the number of clicks. These are not linked to any information that is personally identifiable.
+    The purpose of the information is for analyzing trends, administering the site, tracking users' movement on the
+    website, and gathering demographic information. Our Privacy Policy was created with the help of the <a
+        href="https://www.privacypolicyonline.com/privacy-policy-generator/">Privacy Policy Generator</a>.</p>
+
+
+
+
+<h2>Privacy Policies</h2>
+
+<P>You may consult this list to find the Privacy Policy for each of the advertising partners of PHPNuxBill.</p>
+
+<p>Third-party ad servers or ad networks uses technologies like cookies, JavaScript, or Web Beacons that are used in
+    their respective advertisements and links that appear on PHPNuxBill, which are sent directly to users' browser. They
+    automatically receive your IP address when this occurs. These technologies are used to measure the effectiveness of
+    their advertising campaigns and/or to personalize the advertising content that you see on websites that you visit.
+</p>
+
+<p>Note that PHPNuxBill has no access to or control over these cookies that are used by third-party advertisers.</p>
+
+<h2>Third Party Privacy Policies</h2>
+
+<p>PHPNuxBill's Privacy Policy does not apply to other advertisers or websites. Thus, we are advising you to consult the
+    respective Privacy Policies of these third-party ad servers for more detailed information. It may include their
+    practices and instructions about how to opt-out of certain options. </p>
+
+<p>You can choose to disable cookies through your individual browser options. To know more detailed information about
+    cookie management with specific web browsers, it can be found at the browsers' respective websites. What Are
+    Cookies?</p>
+
+<h2>Children's Information</h2>
+
+<p>Another part of our priority is adding protection for children while using the internet. We encourage parents and
+    guardians to observe, participate in, and/or monitor and guide their online activity.</p>
+
+<p>PHPNuxBill does not knowingly collect any Personal Identifiable Information from children under the age of 13. If you
+    think that your child provided this kind of information on our website, we strongly encourage you to contact us
+    immediately and we will do our best efforts to promptly remove such information from our records.</p>
+
+<h2>Online Privacy Policy Only</h2>
+
+<p>This Privacy Policy applies only to our online activities and is valid for visitors to our website with regards to
+    the information that they shared and/or collect in PHPNuxBill. This policy is not applicable to any information
+    collected offline or via channels other than this website.</p>
+
+<h2>Consent</h2>
+
+<p>By using our website, you hereby consent to our Privacy Policy and agree to its Terms and Conditions.</p>
--- a/pages_template/Terms_and_Conditions.html
+++ b/pages_template/Terms_and_Conditions.html
@ -0,0 +1,119 @@
+<h2><strong>Terms and Conditions</strong></h2>
+
+<p>Welcome to PHPNuxBill!</p>
+
+<p>These terms and conditions outline the rules and regulations for the use of PHPNuxBill's Website, located at https://github.com/hotspotbilling/phpnuxbill.</p>
+
+<p>By accessing this website we assume you accept these terms and conditions. Do not continue to use PHPNuxBill if you do not agree to take all of the terms and conditions stated on this page.</p>
+
+<p>The following terminology applies to these Terms and Conditions, Privacy Statement and Disclaimer Notice and all Agreements: "Client", "You" and "Your" refers to you, the person log on this website and compliant to the Company’s terms and conditions. "The Company", "Ourselves", "We", "Our" and "Us", refers to our Company. "Party", "Parties", or "Us", refers to both the Client and ourselves. All terms refer to the offer, acceptance and consideration of payment necessary to undertake the process of our assistance to the Client in the most appropriate manner for the express purpose of meeting the Client’s needs in respect of provision of the Company’s stated services, in accordance with and subject to, prevailing law of Netherlands. Any use of the above terminology or other words in the singular, plural, capitalization and/or he/she or they, are taken as interchangeable and therefore as referring to same. Our Terms and Conditions were created with the help of the <a href="https://www.privacypolicyonline.com/terms-conditions-generator/">Terms & Conditions Generator</a>.</p>
+
+<h3><strong>Cookies</strong></h3>
+
+<p>We employ the use of cookies. By accessing PHPNuxBill, you agreed to use cookies in agreement with the PHPNuxBill's Privacy Policy.</p>
+
+<p>Most interactive websites use cookies to let us retrieve the user's details for each visit. Cookies are used by our website to enable the functionality of certain areas to make it easier for people visiting our website. Some of our affiliate/advertising partners may also use cookies.</p>
+
+<h3><strong>License</strong></h3>
+
+<p>Unless otherwise stated, PHPNuxBill and/or its licensors own the intellectual property rights for all material on PHPNuxBill. All intellectual property rights are reserved. You may access this from PHPNuxBill for your own personal use subjected to restrictions set in these terms and conditions.</p>
+
+<p>You must not:</p>
+<ul>
+    <li>Republish material from PHPNuxBill</li>
+    <li>Sell, rent or sub-license material from PHPNuxBill</li>
+    <li>Reproduce, duplicate or copy material from PHPNuxBill</li>
+    <li>Redistribute content from PHPNuxBill</li>
+</ul>
+
+<p>This Agreement shall begin on the date hereof.</p>
+
+<p>Parts of this website offer an opportunity for users to post and exchange opinions and information in certain areas of the website. PHPNuxBill does not filter, edit, publish or review Comments prior to their presence on the website. Comments do not reflect the views and opinions of PHPNuxBill,its agents and/or affiliates. Comments reflect the views and opinions of the person who post their views and opinions. To the extent permitted by applicable laws, PHPNuxBill shall not be liable for the Comments or for any liability, damages or expenses caused and/or suffered as a result of any use of and/or posting of and/or appearance of the Comments on this website.</p>
+
+<p>PHPNuxBill reserves the right to monitor all Comments and to remove any Comments which can be considered inappropriate, offensive or causes breach of these Terms and Conditions.</p>
+
+<p>You warrant and represent that:</p>
+
+<ul>
+    <li>You are entitled to post the Comments on our website and have all necessary licenses and consents to do so;</li>
+    <li>The Comments do not invade any intellectual property right, including without limitation copyright, patent or trademark of any third party;</li>
+    <li>The Comments do not contain any defamatory, libelous, offensive, indecent or otherwise unlawful material which is an invasion of privacy</li>
+    <li>The Comments will not be used to solicit or promote business or custom or present commercial activities or unlawful activity.</li>
+</ul>
+
+<p>You hereby grant PHPNuxBill a non-exclusive license to use, reproduce, edit and authorize others to use, reproduce and edit any of your Comments in any and all forms, formats or media.</p>
+
+<h3><strong>Hyperlinking to our Content</strong></h3>
+
+<p>The following organizations may link to our Website without prior written approval:</p>
+
+<ul>
+    <li>Government agencies;</li>
+    <li>Search engines;</li>
+    <li>News organizations;</li>
+    <li>Online directory distributors may link to our Website in the same manner as they hyperlink to the Websites of other listed businesses; and</li>
+    <li>System wide Accredited Businesses except soliciting non-profit organizations, charity shopping malls, and charity fundraising groups which may not hyperlink to our Web site.</li>
+</ul>
+
+<p>These organizations may link to our home page, to publications or to other Website information so long as the link: (a) is not in any way deceptive; (b) does not falsely imply sponsorship, endorsement or approval of the linking party and its products and/or services; and (c) fits within the context of the linking party's site.</p>
+
+<p>We may consider and approve other link requests from the following types of organizations:</p>
+
+<ul>
+    <li>commonly-known consumer and/or business information sources;</li>
+    <li>dot.com community sites;</li>
+    <li>associations or other groups representing charities;</li>
+    <li>online directory distributors;</li>
+    <li>internet portals;</li>
+    <li>accounting, law and consulting firms; and</li>
+    <li>educational institutions and trade associations.</li>
+</ul>
+
+<p>We will approve link requests from these organizations if we decide that: (a) the link would not make us look unfavorably to ourselves or to our accredited businesses; (b) the organization does not have any negative records with us; (c) the benefit to us from the visibility of the hyperlink compensates the absence of PHPNuxBill; and (d) the link is in the context of general resource information.</p>
+
+<p>These organizations may link to our home page so long as the link: (a) is not in any way deceptive; (b) does not falsely imply sponsorship, endorsement or approval of the linking party and its products or services; and (c) fits within the context of the linking party's site.</p>
+
+<p>If you are one of the organizations listed in paragraph 2 above and are interested in linking to our website, you must inform us by sending an e-mail to PHPNuxBill. Please include your name, your organization name, contact information as well as the URL of your site, a list of any URLs from which you intend to link to our Website, and a list of the URLs on our site to which you would like to link. Wait 2-3 weeks for a response.</p>
+
+<p>Approved organizations may hyperlink to our Website as follows:</p>
+
+<ul>
+    <li>By use of our corporate name; or</li>
+    <li>By use of the uniform resource locator being linked to; or</li>
+    <li>By use of any other description of our Website being linked to that makes sense within the context and format of content on the linking party's site.</li>
+</ul>
+
+<p>No use of PHPNuxBill's logo or other artwork will be allowed for linking absent a trademark license agreement.</p>
+
+<h3><strong>iFrames</strong></h3>
+
+<p>Without prior approval and written permission, you may not create frames around our Webpages that alter in any way the visual presentation or appearance of our Website.</p>
+
+<h3><strong>Content Liability</strong></h3>
+
+<p>We shall not be hold responsible for any content that appears on your Website. You agree to protect and defend us against all claims that is rising on your Website. No link(s) should appear on any Website that may be interpreted as libelous, obscene or criminal, or which infringes, otherwise violates, or advocates the infringement or other violation of, any third party rights.</p>
+
+<h3><strong>Reservation of Rights</strong></h3>
+
+<p>We reserve the right to request that you remove all links or any particular link to our Website. You approve to immediately remove all links to our Website upon request. We also reserve the right to amen these terms and conditions and it's linking policy at any time. By continuously linking to our Website, you agree to be bound to and follow these linking terms and conditions.</p>
+
+<h3><strong>Removal of links from our website</strong></h3>
+
+<p>If you find any link on our Website that is offensive for any reason, you are free to contact and inform us any moment. We will consider requests to remove links but we are not obligated to or so or to respond to you directly.</p>
+
+<p>We do not ensure that the information on this website is correct, we do not warrant its completeness or accuracy; nor do we promise to ensure that the website remains available or that the material on the website is kept up to date.</p>
+
+<h3><strong>Disclaimer</strong></h3>
+
+<p>To the maximum extent permitted by applicable law, we exclude all representations, warranties and conditions relating to our website and the use of this website. Nothing in this disclaimer will:</p>
+
+<ul>
+    <li>limit or exclude our or your liability for death or personal injury;</li>
+    <li>limit or exclude our or your liability for fraud or fraudulent misrepresentation;</li>
+    <li>limit any of our or your liabilities in any way that is not permitted under applicable law; or</li>
+    <li>exclude any of our or your liabilities that may not be excluded under applicable law.</li>
+</ul>
+
+<p>The limitations and prohibitions of liability set in this Section and elsewhere in this disclaimer: (a) are subject to the preceding paragraph; and (b) govern all liabilities arising under the disclaimer, including liabilities arising in contract, in tort and for breach of statutory duty.</p>
+
+<p>As long as the website and the information and services on the website are provided free of charge, we will not be liable for any loss or damage of any nature.</p>
--- a/system/autoload/Balance.php
+++ b/system/autoload/Balance.php
@ -19,12 +19,7 @@ class Balance
    {
        global $config;
        if (Balance::min($id_customer, $amount)) {
-            if (Balance::plusByPhone($phoneTarget, $amount)) {
-                return true;
-            } else {
-                Balance::plus($id_customer, $amount);
-                return false;
-            }
+            return Balance::plusByPhone($phoneTarget, $amount);
        } else {
            return false;
        }
--- a/system/autoload/File.php
+++ b/system/autoload/File.php
@ -33,6 +33,63 @@ class File
        rmdir($path);
    }

+    public static function resizeCropImage($source_file, $dst_dir, $max_width, $max_height, $quality = 80)
+    {
+        $imgsize = getimagesize($source_file);
+        $width = $imgsize[0];
+        $height = $imgsize[1];
+        $mime = $imgsize['mime'];
+
+        switch ($mime) {
+            case 'image/gif':
+                $image_create = "imagecreatefromgif";
+                $image = "imagegif";
+                break;
+
+            case 'image/png':
+                $image_create = "imagecreatefrompng";
+                $image = "imagepng";
+                $quality = 7;
+                break;
+
+            case 'image/jpeg':
+                $image_create = "imagecreatefromjpeg";
+                $image = "imagejpeg";
+                $quality = 80;
+                break;
+
+            default:
+                return false;
+                break;
+        }
+
+        if ($max_width == 0) {
+            $max_width  = $width;
+        }
+
+        if ($max_height == 0) {
+            $max_height = $height;
+        }
+
+        $widthRatio = $max_width / $width;
+        $heightRatio = $max_height / $height;
+        $ratio = min($widthRatio, $heightRatio);
+        $nwidth  = (int)$width  * $ratio;
+        $nheight = (int)$height * $ratio;
+
+        $dst_img = imagecreatetruecolor($nwidth, $nheight);
+        $white = imagecolorallocate($dst_img, 255, 255, 255);
+        imagefill($dst_img, 0, 0, $white);
+        $src_img = $image_create($source_file);
+        imagecopyresampled($dst_img, $src_img, 0, 0, 0, 0, $nwidth, $nheight, $width, $height);
+
+        $image($dst_img, $dst_dir, $quality);
+
+        if ($dst_img) imagedestroy($dst_img);
+        if ($src_img) imagedestroy($src_img);
+        return file_exists($dst_dir);
+    }
+

    /**
     * file path fixer
--- a/system/autoload/Http.php
+++ b/system/autoload/Http.php
@ -2,12 +2,17 @@

 /**
 * PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)
+ * using proxy, add this variable in config.php
+ * $http_proxy  = '127.0.0.1:3128';
+ * if proxy using authentication, use this parameter
+ * $http_proxyauth = 'user:password';
 **/

 class Http
 {
-    public static function getData($url, $headers)
+    public static function getData($url, $headers = [])
    {
+        global $http_proxy, $http_proxyauth, $admin;
        $ch = curl_init();
        curl_setopt($ch, CURLOPT_URL, $url);
        curl_setopt($ch, CURLOPT_POST, 0);
@ -15,13 +20,26 @@ class Http
        curl_setopt($ch, CURLOPT_TIMEOUT, 15);
        curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        if (!empty($http_proxy)) {
+            curl_setopt($ch, CURLOPT_PROXY, $http_proxy);
+            if (!empty($http_proxyauth)) {
+                curl_setopt($ch, CURLOPT_PROXYUSERPWD, $http_proxyauth);
+            }
+        }
        $server_output = curl_exec($ch);
+        if (curl_errno($ch)) {
+            $error_msg = curl_error($ch);
+        }
        curl_close($ch);
-        return $server_output;
+        if($admin && $error_msg){
+            r2(U . 'dashboard', 'd', $error_msg);
+        }
+        return ($server_output) ? $server_output : $error_msg;
    }

    public static function postJsonData($url, $array_post, $headers = [], $basic = null)
    {
+        global $http_proxy, $http_proxyauth, $admin;
        $headers[] = 'Content-Type: application/json';
        $ch = curl_init();
        curl_setopt($ch, CURLOPT_URL, $url);
@ -30,6 +48,12 @@ class Http
        curl_setopt($ch, CURLOPT_TIMEOUT, 15);
        curl_setopt($ch, CURLOPT_VERBOSE, false);
        curl_setopt($ch, CURLINFO_HEADER_OUT, false);
+        if (!empty($http_proxy)) {
+            curl_setopt($ch, CURLOPT_PROXY, $http_proxy);
+            if (!empty($http_proxyauth)) {
+                curl_setopt($ch, CURLOPT_PROXYUSERPWD, $http_proxyauth);
+            }
+        }
        curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($array_post));
        curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
        if (!empty($basic)) {
@ -37,13 +61,20 @@ class Http
        }
        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
        $server_output = curl_exec($ch);
+        if (curl_errno($ch)) {
+            $error_msg = curl_error($ch);
+        }
        curl_close($ch);
-        return $server_output;
+        if($admin && $error_msg){
+            r2(U . 'dashboard', 'd', $error_msg);
+        }
+        return ($server_output) ? $server_output : $error_msg;
    }


    public static function postData($url, $array_post, $headers = [], $basic = null)
    {
+        global $http_proxy, $http_proxyauth, $admin;
        $headers[] = 'Content-Type: application/x-www-form-urlencoded';
        $ch = curl_init();
        curl_setopt($ch, CURLOPT_URL, $url);
@ -52,6 +83,12 @@ class Http
        curl_setopt($ch, CURLOPT_TIMEOUT, 15);
        curl_setopt($ch, CURLOPT_VERBOSE, false);
        curl_setopt($ch, CURLINFO_HEADER_OUT, false);
+        if (!empty($http_proxy)) {
+            curl_setopt($ch, CURLOPT_PROXY, $http_proxy);
+            if (!empty($http_proxyauth)) {
+                curl_setopt($ch, CURLOPT_PROXYUSERPWD, $http_proxyauth);
+            }
+        }
        curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($array_post));
        curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
        if (!empty($basic)) {
@ -59,7 +96,13 @@ class Http
        }
        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
        $server_output = curl_exec($ch);
+        if (curl_errno($ch)) {
+            $error_msg = curl_error($ch);
+        }
        curl_close($ch);
-        return $server_output;
+        if($admin && $error_msg){
+            r2(U . 'dashboard', 'd', $error_msg);
+        }
+        return ($server_output) ? $server_output : $error_msg;
    }
 }
--- a/system/autoload/Lang.php
+++ b/system/autoload/Lang.php
@ -39,7 +39,16 @@ class Lang

    public static function dateTimeFormat($date){
        global $config;
-        return date($config['date_format']. ' H:i', strtotime($date));
+        if(strtotime($date) < strtotime("2000-01-01 00:00:00")){
+            return "";
+        }else{
+            return date($config['date_format']. ' H:i', strtotime($date));
+        }
+    }
+
+    public static function dateAndTimeFormat($date, $time){
+        global $config;
+        return date($config['date_format']. ' H:i', strtotime("$date $time"));
    }

    public static function nl2br($text){
--- a/system/autoload/Message.php
+++ b/system/autoload/Message.php
@ -12,7 +12,7 @@ class Message
        global $config;
        run_hook('send_telegram'); #HOOK
        if (!empty($config['telegram_bot']) && !empty($config['telegram_target_id'])) {
-            file_get_contents('https://api.telegram.org/bot' . $config['telegram_bot'] . '/sendMessage?chat_id=' . $config['telegram_target_id'] . '&text=' . urlencode($txt));
+            Http::getData('https://api.telegram.org/bot' . $config['telegram_bot'] . '/sendMessage?chat_id=' . $config['telegram_target_id'] . '&text=' . urlencode($txt));
        }
    }

@ -24,7 +24,7 @@ class Message
        if (!empty($config['sms_url'])) {
            $smsurl = str_replace('[number]', urlencode($phone), $config['sms_url']);
            $smsurl = str_replace('[text]', urlencode($txt), $smsurl);
-            file_get_contents($smsurl);
+            Http::getData($smsurl);
        }
    }

@ -35,7 +35,7 @@ class Message
        if (!empty($config['wa_url'])) {
            $waurl = str_replace('[number]', urlencode($phone), $config['wa_url']);
            $waurl = str_replace('[text]', urlencode($txt), $waurl);
-            file_get_contents($waurl);
+            Http::getData($waurl);
        }
    }

@ -56,9 +56,10 @@ class Message
        return "$via: $msg";
    }

-    public static function sendBalanceNotification($phone, $name, $balance, $message, $via)
+    public static function sendBalanceNotification($phone, $name, $balance, $balance_now, $message, $via)
    {
        $msg = str_replace('[[name]]', "*$name*", $message);
+        $msg = str_replace('[[current_balance]]', Lang::moneyFormat($balance_now), $msg);
        $msg = str_replace('[[balance]]', "*" . Lang::moneyFormat($balance) . "*", $msg);
        if (
            !empty($phone) && strlen($phone) > 5
--- a/system/autoload/Mikrotik.php
+++ b/system/autoload/Mikrotik.php
@ -12,11 +12,15 @@ class Mikrotik

    public static function getClient($ip, $user, $pass)
    {
+        global $ui;
        try {
            $iport = explode(":", $ip);
            return new RouterOS\Client($iport[0], $user, $pass, ($iport[1]) ? $iport[1] : null);
        } catch (Exception $e) {
-            die("Unable to connect to the router.<br>" . $e->getMessage());
+            $ui->assign("error_title", "Mikrotik Connection Error");
+            $ui->assign("error_message", "Unable to connect to the router.<br>" . $e->getMessage());
+            $ui->display('router-error.tpl');
+            die();
        }
    }

@ -69,46 +73,77 @@ class Mikrotik
    public static function setHotspotPlan($client, $name, $sharedusers, $rate)
    {
        $printRequest = new RouterOS\Request(
-            '/ip hotspot user profile print .proplist=name',
+            '/ip hotspot user profile print .proplist=.id',
            RouterOS\Query::where('name', $name)
        );
-        $profileName = $client->sendSync($printRequest)->getProperty('name');
+        $profileID = $client->sendSync($printRequest)->getProperty('.id');
+        if (empty($profileID)) {
+            Mikrotik::addHotspotPlan($client, $name, $sharedusers, $rate);
+        }else{
+            $setRequest = new RouterOS\Request('/ip/hotspot/user/profile/set');
+            $client(
+                $setRequest
+                    ->setArgument('numbers', $profileID)
+                    ->setArgument('shared-users', $sharedusers)
+                    ->setArgument('rate-limit', $rate)
+            );
+        }
+    }

-        $setRequest = new RouterOS\Request('/ip/hotspot/user/profile/set');
-        $client(
-            $setRequest
-                ->setArgument('numbers', $profileName)
-                ->setArgument('shared-users', $sharedusers)
-                ->setArgument('rate-limit', $rate)
+    public static function setHotspotExpiredPlan($client, $name, $pool)
+    {
+        $printRequest = new RouterOS\Request(
+            '/ip hotspot user profile print .proplist=.id',
+            RouterOS\Query::where('name', $name)
        );
+        $profileID = $client->sendSync($printRequest)->getProperty('.id');
+        if (empty($profileID)) {
+            $addRequest = new RouterOS\Request('/ip/hotspot/user/profile/add');
+            $client->sendSync(
+                $addRequest
+                    ->setArgument('name', $name)
+                    ->setArgument('shared-users', 3)
+                    ->setArgument('address-pool', $pool)
+                    ->setArgument('rate-limit', '512K/512K')
+            );
+        }else{
+            $setRequest = new RouterOS\Request('/ip/hotspot/user/profile/set');
+            $client(
+                $setRequest
+                    ->setArgument('numbers', $profileID)
+                    ->setArgument('shared-users', 3)
+                    ->setArgument('address-pool', $pool)
+                    ->setArgument('rate-limit', '512K/512K')
+            );
+        }
    }

    public static function removeHotspotPlan($client, $name)
    {
        $printRequest = new RouterOS\Request(
-            '/ip hotspot user profile print .proplist=name',
+            '/ip hotspot user profile print .proplist=.id',
            RouterOS\Query::where('name', $name)
        );
-        $profileName = $client->sendSync($printRequest)->getProperty('name');
+        $profileID = $client->sendSync($printRequest)->getProperty('.id');

        $removeRequest = new RouterOS\Request('/ip/hotspot/user/profile/remove');
        $client(
            $removeRequest
-                ->setArgument('numbers', $profileName)
+                ->setArgument('numbers', $profileID)
        );
    }

    public static function removeHotspotUser($client, $username)
    {
        $printRequest = new RouterOS\Request(
-            '/ip hotspot user print .proplist=name',
+            '/ip hotspot user print .proplist=.id',
            RouterOS\Query::where('name', $username)
        );
-        $userName = $client->sendSync($printRequest)->getProperty('name');
+        $userID = $client->sendSync($printRequest)->getProperty('.id');
        $removeRequest = new RouterOS\Request('/ip/hotspot/user/remove');
        $client(
            $removeRequest
-                ->setArgument('numbers', $userName)
+                ->setArgument('numbers', $userID)
        );
    }

@ -176,7 +211,7 @@ class Mikrotik
        }
    }

-    public static function setHotspotUser($client, $user, $pass, $nuser = null)
+    public static function setHotspotUser($client, $user, $pass)
    {
        $printRequest = new RouterOS\Request('/ip/hotspot/user/print');
        $printRequest->setArgument('.proplist', '.id');
@ -189,6 +224,19 @@ class Mikrotik
        $client->sendSync($setRequest);
    }

+    public static function setHotspotUserPackage($client, $user, $plan)
+    {
+        $printRequest = new RouterOS\Request('/ip/hotspot/user/print');
+        $printRequest->setArgument('.proplist', '.id');
+        $printRequest->setQuery(RouterOS\Query::where('name', $user));
+        $id = $client->sendSync($printRequest)->getProperty('.id');
+
+        $setRequest = new RouterOS\Request('/ip/hotspot/user/set');
+        $setRequest->setArgument('numbers', $id);
+        $setRequest->setArgument('profile', $plan);
+        $client->sendSync($setRequest);
+    }
+
    public static function removeHotspotActiveUser($client, $username)
    {
        $onlineRequest = new RouterOS\Request('/ip/hotspot/active/print');
@ -201,32 +249,16 @@ class Mikrotik
        $client->sendSync($removeRequest);
    }

-    public static function setHotspotLimitUptime($client, $username)
-    {
-        $printRequest = new RouterOS\Request('/ip/hotspot/user/print');
-        $printRequest->setArgument('.proplist', '.id');
-        $printRequest->setQuery(RouterOS\Query::where('name', $username));
-        $id = $client->sendSync($printRequest)->getProperty('.id');
-
-        $setRequest = new RouterOS\Request('/ip/hotspot/user/set');
-        $setRequest->setArgument('numbers', $id);
-        $setRequest->setArgument('limit-uptime', '00:00:05');
-        $client->sendSync($setRequest);
-    }
-
    public static function removePpoeUser($client, $username)
    {
-        $printRequest = new RouterOS\Request(
-            '/ppp secret print .proplist=name',
-            RouterOS\Query::where('name', $username)
-        );
-        $id = $client->sendSync($printRequest)->getProperty('.id');

+        $printRequest = new RouterOS\Request('/ppp/secret/print');
+        //$printRequest->setArgument('.proplist', '.id');
+        $printRequest->setQuery(RouterOS\Query::where('name', $username));
+        $id = $client->sendSync($printRequest)->getProperty('.id');
        $removeRequest = new RouterOS\Request('/ppp/secret/remove');
-        $client(
-            $removeRequest
-                ->setArgument('numbers', $id)
-        );
+        $removeRequest->setArgument('numbers', $id);
+        $client->sendSync($removeRequest);
    }

    public static function addPpoeUser($client, $plan, $customer)
@ -247,7 +279,7 @@ class Mikrotik
        );
    }

-    public static function setPpoeUser($client, $user, $pass, $nuser = null)
+    public static function setPpoeUser($client, $user, $pass)
    {
        $printRequest = new RouterOS\Request('/ppp/secret/print');
        $printRequest->setArgument('.proplist', '.id');
@ -260,15 +292,16 @@ class Mikrotik
        $client->sendSync($setRequest);
    }

-    public static function disablePpoeUser($client, $username)
+    public static function setPpoeUserPlan($client, $user, $plan)
    {
        $printRequest = new RouterOS\Request('/ppp/secret/print');
        $printRequest->setArgument('.proplist', '.id');
-        $printRequest->setQuery(RouterOS\Query::where('name', $username));
+        $printRequest->setQuery(RouterOS\Query::where('name', $user));
        $id = $client->sendSync($printRequest)->getProperty('.id');

-        $setRequest = new RouterOS\Request('/ppp/secret/disable');
+        $setRequest = new RouterOS\Request('/ppp/secret/set');
        $setRequest->setArgument('numbers', $id);
+        $setRequest->setArgument('profile', $plan);
        $client->sendSync($setRequest);
    }

@ -287,15 +320,15 @@ class Mikrotik
    public static function removePool($client, $name)
    {
        $printRequest = new RouterOS\Request(
-            '/ip pool print .proplist=name',
+            '/ip pool print .proplist=.id',
            RouterOS\Query::where('name', $name)
        );
-        $poolName = $client->sendSync($printRequest)->getProperty('name');
+        $poolID = $client->sendSync($printRequest)->getProperty('.id');

        $removeRequest = new RouterOS\Request('/ip/pool/remove');
        $client(
            $removeRequest
-                ->setArgument('numbers', $poolName)
+                ->setArgument('numbers', $poolID)
        );
    }

@ -312,18 +345,18 @@ class Mikrotik
    public static function setPool($client, $name, $ip_address)
    {
        $printRequest = new RouterOS\Request(
-            '/ip pool print .proplist=name',
+            '/ip pool print .proplist=.id',
            RouterOS\Query::where('name', $name)
        );
-        $poolName = $client->sendSync($printRequest)->getProperty('name');
+        $poolID = $client->sendSync($printRequest)->getProperty('id');

-        if (empty($poolName)) {
+        if (empty($poolID)) {
            self::addPool($client, $name, $ip_address);
        } else {
            $setRequest = new RouterOS\Request('/ip/pool/set');
            $client(
                $setRequest
-                    ->setArgument('numbers', $poolName)
+                    ->setArgument('numbers', $poolID)
                    ->setArgument('ranges', $ip_address)
            );
        }
@ -345,17 +378,17 @@ class Mikrotik
    public static function setPpoePlan($client, $name, $pool, $rate)
    {
        $printRequest = new RouterOS\Request(
-            '/ppp profile print .proplist=name',
+            '/ppp profile print .proplist=.id',
            RouterOS\Query::where('name', $name)
        );
-        $profileName = $client->sendSync($printRequest)->getProperty('name');
-        if (empty($profileName)) {
+        $profileID = $client->sendSync($printRequest)->getProperty('.id');
+        if (empty($profileID)) {
            self::addPpoePlan($client, $name, $pool, $rate);
        } else {
            $setRequest = new RouterOS\Request('/ppp/profile/set');
            $client(
                $setRequest
-                    ->setArgument('numbers', $profileName)
+                    ->setArgument('numbers', $profileID)
                    ->setArgument('local-address', $pool)
                    ->setArgument('remote-address', $pool)
                    ->setArgument('rate-limit', $rate)
@ -366,15 +399,15 @@ class Mikrotik
    public static function removePpoePlan($client, $name)
    {
        $printRequest = new RouterOS\Request(
-            '/ppp profile print .proplist=name',
+            '/ppp profile print .proplist=.id',
            RouterOS\Query::where('name', $name)
        );
-        $profileName = $client->sendSync($printRequest)->getProperty('name');
+        $profileID = $client->sendSync($printRequest)->getProperty('.id');

        $removeRequest = new RouterOS\Request('/ppp/profile/remove');
        $client(
            $removeRequest
-                ->setArgument('numbers', $profileName)
+                ->setArgument('numbers', $profileID)
        );
    }
 }
--- a/system/autoload/Package.php
+++ b/system/autoload/Package.php
@ -5,8 +5,6 @@
 **/


-use PEAR2\Net\RouterOS;
-
 class Package
 {
    /**
@ -19,9 +17,10 @@ class Package
     */
    public static function rechargeUser($id_customer, $router_name, $plan_id, $gateway, $channel)
    {
-        global $_c, $_L, $_notifmsg;
+        global $_c;
        $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 +39,7 @@ class Package
            $t->plan_name = $p['name_plan'];
            $t->price = $p['price'];
            $t->recharged_on = $date_only;
+            $t->recharged_time = date("H:i:s");
            $t->expiration = $date_only;
            $t->time = $time;
            $t->method = "$gateway - $channel";
@ -47,22 +47,27 @@ class Package
            $t->type = "Balance";
            $t->save();

+            $balance_before = $c['balance'];
            Balance::plus($id_customer, $p['price']);
+            $balance = $c['balance'] + $p['price'];

            $textInvoice = Lang::getNotifText('invoice_balance');
            $textInvoice = str_replace('[[company_name]]', $_c['CompanyName'], $textInvoice);
            $textInvoice = str_replace('[[address]]', $_c['address'], $textInvoice);
            $textInvoice = str_replace('[[phone]]', $_c['phone'], $textInvoice);
            $textInvoice = str_replace('[[invoice]]', $inv, $textInvoice);
-            $textInvoice = str_replace('[[date]]', date($_c['date_format'], strtotime($date_only)) . " " . $time, $textInvoice);
+            $textInvoice = str_replace('[[date]]', Lang::dateTimeFormat($date_now), $textInvoice);
            $textInvoice = str_replace('[[payment_gateway]]', $_c['gateway'], $textInvoice);
            $textInvoice = str_replace('[[payment_channel]]', $_c['channel'], $textInvoice);
            $textInvoice = str_replace('[[type]]', 'Balance', $textInvoice);
            $textInvoice = str_replace('[[plan_name]]', $p['name_plan'], $textInvoice);
-            $textInvoice = str_replace('[[plan_price]]', $_c['currency_code'] . " " . number_format($p['price'], 2, $_c['dec_point'], $_c['thousands_sep']), $textInvoice);
+            $textInvoice = str_replace('[[plan_price]]', Lang::moneyFormat($p['price']), $textInvoice);
+            $textInvoice = str_replace('[[name]]', $c['fullname'], $textInvoice);
            $textInvoice = str_replace('[[user_name]]', $c['username'], $textInvoice);
            $textInvoice = str_replace('[[user_password]]', $c['password'], $textInvoice);
            $textInvoice = str_replace('[[footer]]', $_c['note'], $textInvoice);
+            $textInvoice = str_replace('[[balance_before]]', Lang::moneyFormat($balance_before), $textInvoice);
+            $textInvoice = str_replace('[[balance]]', Lang::moneyFormat($balance), $textInvoice);

            if ($_c['user_notification_payment'] == 'sms') {
                Message::sendSMS($c['phonenumber'], $textInvoice);
@ -97,14 +102,36 @@ class Package
                    $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
                    Mikrotik::removeHotspotUser($client, $c['username']);
                    Mikrotik::removePpoeUser($client, $c['username']);
+                    Mikrotik::removeHotspotActiveUser($client, $c['username']);
+                    Mikrotik::removePpoeActive($client, $c['username']);
                    Mikrotik::addHotspotUser($client, $p, $c);
                }

+                if ($b['namebp'] == $p['name_plan'] && $b['status'] == 'on') {
+                    // if it same internet plan, expired will extend
+                    if ($p['validity_unit'] == 'Months') {
+                        $date_exp = date("Y-m-d", strtotime($b['expiration'] . ' +' . $p['validity'] . ' months'));
+                        $time = $b['time'];
+                    } else if ($p['validity_unit'] == 'Days') {
+                        $date_exp = date("Y-m-d", strtotime($b['expiration'] . ' +' . $p['validity'] . ' days'));
+                        $time = $b['time'];
+                    } else if ($p['validity_unit'] == 'Hrs') {
+                        $datetime = explode(' ', date("Y-m-d H:i:s", strtotime($b['expiration'] . ' ' . $b['time'] . ' +' . $p['validity'] . ' hours')));
+                        $date_exp = $datetime[0];
+                        $time = $datetime[1];
+                    } else if ($p['validity_unit'] == 'Mins') {
+                        $datetime = explode(' ', date("Y-m-d H:i:s", strtotime($b['expiration'] . ' ' . $b['time'] . ' +' . $p['validity'] . ' minutes')));
+                        $date_exp = $datetime[0];
+                        $time = $datetime[1];
+                    }
+                }
+
                $b->customer_id = $id_customer;
                $b->username = $c['username'];
                $b->plan_id = $plan_id;
                $b->namebp = $p['name_plan'];
                $b->recharged_on = $date_only;
+                $b->recharged_time = $time_only;
                $b->expiration = $date_exp;
                $b->time = $time;
                $b->status = "on";
@ -120,6 +147,7 @@ class Package
                $t->plan_name = $p['name_plan'];
                $t->price = $p['price'];
                $t->recharged_on = $date_only;
+                $t->recharged_time = $time_only;
                $t->expiration = $date_exp;
                $t->time = $time;
                $t->method = "$gateway - $channel";
@ -129,7 +157,10 @@ class Package
            } else {
                if (!$_c['radius_mode']) {
                    $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
+                    Mikrotik::removeHotspotUser($client, $c['username']);
                    Mikrotik::removePpoeUser($client, $c['username']);
+                    Mikrotik::removeHotspotActiveUser($client, $c['username']);
+                    Mikrotik::removePpoeActive($client, $c['username']);
                    Mikrotik::addHotspotUser($client, $p, $c);
                }

@ -139,6 +170,7 @@ class Package
                $d->plan_id = $plan_id;
                $d->namebp = $p['name_plan'];
                $d->recharged_on = $date_only;
+                $d->recharged_time = $time_only;
                $d->expiration = $date_exp;
                $d->time = $time;
                $d->status = "on";
@ -154,6 +186,7 @@ class Package
                $t->plan_name = $p['name_plan'];
                $t->price = $p['price'];
                $t->recharged_on = $date_only;
+                $t->recharged_time = $time_only;
                $t->expiration = $date_exp;
                $t->time = $time;
                $t->method = "$gateway - $channel";
@ -173,14 +206,37 @@ class Package
                    $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
                    Mikrotik::removeHotspotUser($client, $c['username']);
                    Mikrotik::removePpoeUser($client, $c['username']);
+                    Mikrotik::removeHotspotActiveUser($client, $c['username']);
+                    Mikrotik::removePpoeActive($client, $c['username']);
                    Mikrotik::addPpoeUser($client, $p, $c);
                }

+
+                if ($b['namebp'] == $p['name_plan'] && $b['status'] == 'on') {
+                    // if it same internet plan, expired will extend
+                    if ($p['validity_unit'] == 'Months') {
+                        $date_exp = date("Y-m-d", strtotime($b['expiration'] . ' +' . $p['validity'] . ' months'));
+                        $time = $b['time'];
+                    } else if ($p['validity_unit'] == 'Days') {
+                        $date_exp = date("Y-m-d", strtotime($b['expiration'] . ' +' . $p['validity'] . ' days'));
+                        $time = $b['time'];
+                    } else if ($p['validity_unit'] == 'Hrs') {
+                        $datetime = explode(' ', date("Y-m-d H:i:s", strtotime($b['expiration'] . ' ' . $b['time'] . ' +' . $p['validity'] . ' hours')));
+                        $date_exp = $datetime[0];
+                        $time = $datetime[1];
+                    } else if ($p['validity_unit'] == 'Mins') {
+                        $datetime = explode(' ', date("Y-m-d H:i:s", strtotime($b['expiration'] . ' ' . $b['time'] . ' +' . $p['validity'] . ' minutes')));
+                        $date_exp = $datetime[0];
+                        $time = $datetime[1];
+                    }
+                }
+
                $b->customer_id = $id_customer;
                $b->username = $c['username'];
                $b->plan_id = $plan_id;
                $b->namebp = $p['name_plan'];
                $b->recharged_on = $date_only;
+                $b->recharged_time = $time_only;
                $b->expiration = $date_exp;
                $b->time = $time;
                $b->status = "on";
@ -196,6 +252,7 @@ class Package
                $t->plan_name = $p['name_plan'];
                $t->price = $p['price'];
                $t->recharged_on = $date_only;
+                $t->recharged_time = $time_only;
                $t->expiration = $date_exp;
                $t->time = $time;
                $t->method = "$gateway - $channel";
@ -206,6 +263,9 @@ class Package
                if (!$_c['radius_mode']) {
                    $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
                    Mikrotik::removeHotspotUser($client, $c['username']);
+                    Mikrotik::removePpoeUser($client, $c['username']);
+                    Mikrotik::removeHotspotActiveUser($client, $c['username']);
+                    Mikrotik::removePpoeActive($client, $c['username']);
                    Mikrotik::addPpoeUser($client, $p, $c);
                }

@ -215,6 +275,7 @@ class Package
                $d->plan_id = $plan_id;
                $d->namebp = $p['name_plan'];
                $d->recharged_on = $date_only;
+                $d->recharged_time = $time_only;
                $d->expiration = $date_exp;
                $d->time = $time;
                $d->status = "on";
@ -230,6 +291,7 @@ class Package
                $t->plan_name = $p['name_plan'];
                $t->price = $p['price'];
                $t->recharged_on = $date_only;
+                $t->recharged_time = $time_only;
                $t->expiration = $date_exp;
                $t->time = $time;
                $t->method = "$gateway - $channel";
@ -251,15 +313,16 @@ class Package
        $textInvoice = str_replace('[[address]]', $_c['address'], $textInvoice);
        $textInvoice = str_replace('[[phone]]', $_c['phone'], $textInvoice);
        $textInvoice = str_replace('[[invoice]]', $in['invoice'], $textInvoice);
-        $textInvoice = str_replace('[[date]]', date($_c['date_format'], strtotime($date_now)) . " " . $time, $textInvoice);
+        $textInvoice = str_replace('[[date]]', Lang::dateTimeFormat($date_now), $textInvoice);
        $textInvoice = str_replace('[[payment_gateway]]', $_c['gateway'], $textInvoice);
        $textInvoice = str_replace('[[payment_channel]]', $_c['channel'], $textInvoice);
        $textInvoice = str_replace('[[type]]', $in['type'], $textInvoice);
        $textInvoice = str_replace('[[plan_name]]', $in['plan_name'], $textInvoice);
-        $textInvoice = str_replace('[[plan_price]]', $_c['currency_code'] . " " . number_format($in['price'], 2, $_c['dec_point'], $_c['thousands_sep']), $textInvoice);
+        $textInvoice = str_replace('[[plan_price]]',  Lang::moneyFormat($in['price']), $textInvoice);
+        $textInvoice = str_replace('[[name]]', $c['fullname'], $textInvoice);
        $textInvoice = str_replace('[[user_name]]', $in['username'], $textInvoice);
        $textInvoice = str_replace('[[user_password]]', $c['password'], $textInvoice);
-        $textInvoice = str_replace('[[expired_date]]', date($_c['date_format'], strtotime($in['expiration'])) . " " . $in['time'], $textInvoice);
+        $textInvoice = str_replace('[[expired_date]]', Lang::dateAndTimeFormat($in['expiration'], $in['time']), $textInvoice);
        $textInvoice = str_replace('[[footer]]', $_c['note'], $textInvoice);

        if ($_c['user_notification_payment'] == 'sms') {
@ -282,11 +345,18 @@ class Package
                if (!$_c['radius_mode']) {
                    $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
                    Mikrotik::removeHotspotUser($client, $c['username']);
+                    Mikrotik::removePpoeUser($client, $c['username']);
+                    Mikrotik::removeHotspotActiveUser($client, $c['username']);
+                    Mikrotik::removePpoeActive($client, $c['username']);
                    Mikrotik::addHotspotUser($client, $p, $c);
                }
            } else {
                if (!$_c['radius_mode']) {
                    $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
+                    Mikrotik::removeHotspotUser($client, $c['username']);
+                    Mikrotik::removePpoeUser($client, $c['username']);
+                    Mikrotik::removeHotspotActiveUser($client, $c['username']);
+                    Mikrotik::removePpoeActive($client, $c['username']);
                    Mikrotik::addHotspotUser($client, $p, $c);
                }
            }
@ -294,12 +364,19 @@ class Package
            if ($b) {
                if (!$_c['radius_mode']) {
                    $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
+                    Mikrotik::removeHotspotUser($client, $c['username']);
                    Mikrotik::removePpoeUser($client, $c['username']);
+                    Mikrotik::removeHotspotActiveUser($client, $c['username']);
+                    Mikrotik::removePpoeActive($client, $c['username']);
                    Mikrotik::addPpoeUser($client, $p, $c);
                }
            } else {
                if (!$_c['radius_mode']) {
                    $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
+                    Mikrotik::removeHotspotUser($client, $c['username']);
+                    Mikrotik::removePpoeUser($client, $c['username']);
+                    Mikrotik::removeHotspotActiveUser($client, $c['username']);
+                    Mikrotik::removePpoeActive($client, $c['username']);
                    Mikrotik::addPpoeUser($client, $p, $c);
                }
            }
--- a/system/autoload/Validator.php
+++ b/system/autoload/Validator.php
@ -299,4 +299,23 @@ class Validator
        return (bool)in_array($format, $formats);
    }

+    public static function countRouterPlan($plans, $router){
+        $n = 0;
+        foreach ($plans as $plan){
+            if($plan['routers'] == $router){
+                $n++;
+            }
+        }
+        return $n;
+    }
+
+    public static function isRouterHasPlan($plans, $router){
+        foreach ($plans as $plan){
+            if($plan['routers'] == $router){
+                return true;
+            }
+        }
+        return false;
+    }
+
 }
--- a/system/boot.php
+++ b/system/boot.php
@ -4,6 +4,33 @@
 * PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)

 **/
+
+
+// on some server, it getting error because of slash is backwards
+function _autoloader($class)
+{
+    if (strpos($class, '_') !== false) {
+        $class = str_replace('_', DIRECTORY_SEPARATOR, $class);
+        if (file_exists('autoload' . DIRECTORY_SEPARATOR . $class . '.php')) {
+            include 'autoload' . DIRECTORY_SEPARATOR . $class . '.php';
+        } else {
+            $class = str_replace("\\", DIRECTORY_SEPARATOR, $class);
+            if (file_exists(__DIR__ . DIRECTORY_SEPARATOR . 'autoload' . DIRECTORY_SEPARATOR . $class . '.php'))
+                include __DIR__ . DIRECTORY_SEPARATOR . 'autoload' . DIRECTORY_SEPARATOR . $class . '.php';
+        }
+    } else {
+        if (file_exists('autoload' . DIRECTORY_SEPARATOR . $class . '.php')) {
+            include 'autoload' . DIRECTORY_SEPARATOR . $class . '.php';
+        } else {
+            $class = str_replace("\\", DIRECTORY_SEPARATOR, $class);
+            if (file_exists(__DIR__ . DIRECTORY_SEPARATOR . 'autoload' . DIRECTORY_SEPARATOR . $class . '.php'))
+                include __DIR__ . DIRECTORY_SEPARATOR . 'autoload' . DIRECTORY_SEPARATOR . $class . '.php';
+        }
+    }
+}
+
+spl_autoload_register('_autoloader');
+
 function r2($to, $ntype = 'e', $msg = '')
 {
    if ($msg == '') {
@ -46,33 +73,52 @@ function _get($param, $defvalue = '')
        return safedata($_GET[$param]);
    }
 }
+try {

+    require_once File::pathFixer('system/orm.php');

-require('system/orm.php');
+    ORM::configure("mysql:host=$db_host;dbname=$db_name");
+    ORM::configure('username', $db_user);
+    ORM::configure('password', $db_password);
+    ORM::configure('driver_options', array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));
+    ORM::configure('return_result_sets', true);
+    if ($_app_stage != 'Live') {
+        ORM::configure('logging', true);
+    }

-ORM::configure("mysql:host=$db_host;dbname=$db_name");
-ORM::configure('username', $db_user);
-ORM::configure('password', $db_password);
-ORM::configure('driver_options', array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));
-ORM::configure('return_result_sets', true);
-if ($_app_stage != 'Live') {
-    ORM::configure('logging', true);
-}
+    $result = ORM::for_table('tbl_appconfig')->find_many();
+    foreach ($result as $value) {
+        $config[$value['setting']] = $value['value'];
+    }

-$result = ORM::for_table('tbl_appconfig')->find_many();
-foreach ($result as $value) {
-    $config[$value['setting']] = $value['value'];
-}
+    date_default_timezone_set($config['timezone']);
+    $_c = $config;

-date_default_timezone_set($config['timezone']);
-$_c = $config;
-
-if ($config['radius_mode']) {
-    ORM::configure("mysql:host=$radius_host;dbname=$radius_name", null, 'radius');
-    ORM::configure('username', $radius_user, 'radius');
-    ORM::configure('password', $radius_password, 'radius');
-    ORM::configure('driver_options', array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'), 'radius');
-    ORM::configure('return_result_sets', true, 'radius');
+    // check if proxy setup in database
+    if (empty($http_proxy) && !empty($config['http_proxy'])) {
+        $http_proxy = $config['http_proxy'];
+        if (empty($http_proxyauth) && !empty($config['http_proxyauth'])) {
+            $http_proxyauth = $config['http_proxyauth'];
+        }
+    }
+    if ($config['radius_mode']) {
+        ORM::configure("mysql:host=$radius_host;dbname=$radius_name", null, 'radius');
+        ORM::configure('username', $radius_user, 'radius');
+        ORM::configure('password', $radius_password, 'radius');
+        ORM::configure('driver_options', array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'), 'radius');
+        ORM::configure('return_result_sets', true, 'radius');
+    }
+} catch (Exception $e) {
+    $ui = new Smarty();
+    $ui->setTemplateDir(['custom' => File::pathFixer('ui/ui_custom/'), 'default' => File::pathFixer('ui/ui/')]);
+    $ui->assign('_url', APP_URL . '/index.php?_route=');
+    $ui->setCompileDir(File::pathFixer('ui/compiled/'));
+    $ui->setConfigDir(File::pathFixer('ui/conf/'));
+    $ui->setCacheDir(File::pathFixer('ui/cache/'));
+    $ui->assign("error_title", "PHPNuxBill Crash");
+    $ui->assign("error_message", $e->getMessage());
+    $ui->display('router-error.tpl');
+    die();
 }

 function _notify($msg, $type = 'e')
@ -81,15 +127,15 @@ function _notify($msg, $type = 'e')
    $_SESSION['notify'] = $msg;
 }

-$lan_file = 'system/lan/' . $config['language'] . '/common.lan.php';
+$lan_file = File::pathFixer('system/lan/' . $config['language'] . '/common.lan.php');
 require($lan_file);
 $ui = new Smarty();
-$ui->setTemplateDir(['custom' => 'ui/ui_custom/', 'default' => 'ui/ui/']);
-$ui->addTemplateDir('system/paymentgateway/ui/', 'pg');
-$ui->addTemplateDir('system/plugin/ui/', 'plugin');
-$ui->setCompileDir('ui/compiled/');
-$ui->setConfigDir('ui/conf/');
-$ui->setCacheDir('ui/cache/');
+$ui->setTemplateDir(['custom' => File::pathFixer('ui/ui_custom/'), 'default' => File::pathFixer('ui/ui/')]);
+$ui->addTemplateDir(File::pathFixer('system/paymentgateway/ui/'), 'pg');
+$ui->addTemplateDir(File::pathFixer('system/plugin/ui/'), 'plugin');
+$ui->setCompileDir(File::pathFixer('ui/compiled/'));
+$ui->setConfigDir(File::pathFixer('ui/conf/'));
+$ui->setCacheDir(File::pathFixer('ui/cache/'));
 $ui->assign('app_url', APP_URL);
 $ui->assign('_domain', str_replace('www.', '', parse_url(APP_URL, PHP_URL_HOST)));
 define('U', APP_URL . '/index.php?_route=');
@ -129,40 +175,16 @@ if (isset($_SESSION['notify'])) {
 include "autoload/Hookers.php";

 // notification message
-if(file_exists("system/uploads/notifications.json")){
-    $_notifmsg =json_decode(file_get_contents('system/uploads/notifications.json'), true);
+if (file_exists(File::pathFixer("system/uploads/notifications.json"))) {
+    $_notifmsg = json_decode(file_get_contents(File::pathFixer('system/uploads/notifications.json')), true);
 }
-$_notifmsg_default = json_decode(file_get_contents('system/uploads/notifications.default.json'), true);
+$_notifmsg_default = json_decode(file_get_contents(File::pathFixer('system/uploads/notifications.default.json')), true);

 //register all plugin
-foreach (glob("system/plugin/*.php") as $filename) {
+foreach (glob(File::pathFixer("system/plugin/*.php")) as $filename) {
    include $filename;
 }

-// on some server, it getting error because of slash is backwards
-function _autoloader($class)
-{
-    if (strpos($class, '_') !== false) {
-        $class = str_replace('_', DIRECTORY_SEPARATOR, $class);
-        if (file_exists('autoload' . DIRECTORY_SEPARATOR . $class . '.php')) {
-            include 'autoload' . DIRECTORY_SEPARATOR . $class . '.php';
-        } else {
-            $class = str_replace("\\", DIRECTORY_SEPARATOR, $class);
-            if (file_exists(__DIR__ . DIRECTORY_SEPARATOR . 'autoload' . DIRECTORY_SEPARATOR . $class . '.php'))
-                include __DIR__ . DIRECTORY_SEPARATOR . 'autoload' . DIRECTORY_SEPARATOR . $class . '.php';
-        }
-    } else {
-        if (file_exists('autoload' . DIRECTORY_SEPARATOR . $class . '.php')) {
-            include 'autoload' . DIRECTORY_SEPARATOR . $class . '.php';
-        } else {
-            $class = str_replace("\\", DIRECTORY_SEPARATOR, $class);
-            if (file_exists(__DIR__ . DIRECTORY_SEPARATOR . 'autoload' . DIRECTORY_SEPARATOR . $class . '.php'))
-                include __DIR__ . DIRECTORY_SEPARATOR . 'autoload' . DIRECTORY_SEPARATOR . $class . '.php';
-        }
-    }
-}
-
-spl_autoload_register('_autoloader');

 function _auth($login = true)
 {
@ -281,34 +303,42 @@ $handler = $routes[0];
 if ($handler == '') {
    $handler = 'default';
 }
-$sys_render = 'system/controllers/' . $handler . '.php';
-if (file_exists($sys_render)) {
-    $menus = array();
-    // "name" => $name,
-    // "admin" => $admin,
-    // "position" => $position,
-    // "function" => $function
-    $ui->assign('_system_menu', $routes[0]);
-    foreach ($menu_registered as $menu) {
-        if ($menu['admin'] && _admin(false)) {
-            $menus[$menu['position']] .= '<li' . (($routes[1] == $menu['function']) ? ' class="active"' : '') . '><a href="' . U . 'plugin/' . $menu['function'] . '">';
-            if (!empty($menu['icon'])) {
-                $menus[$menu['position']] .= '<i class="' . $menu['icon'] . '"></i>';
+try {
+
+    $sys_render = File::pathFixer('system/controllers/' . $handler . '.php');
+    if (file_exists($sys_render)) {
+        $menus = array();
+        // "name" => $name,
+        // "admin" => $admin,
+        // "position" => $position,
+        // "function" => $function
+        $ui->assign('_system_menu', $routes[0]);
+        foreach ($menu_registered as $menu) {
+            if ($menu['admin'] && _admin(false)) {
+                $menus[$menu['position']] .= '<li' . (($routes[1] == $menu['function']) ? ' class="active"' : '') . '><a href="' . U . 'plugin/' . $menu['function'] . '">';
+                if (!empty($menu['icon'])) {
+                    $menus[$menu['position']] .= '<i class="' . $menu['icon'] . '"></i>';
+                }
+                $menus[$menu['position']] .= '<span class="text">' . $menu['name'] . '</span></a></li>';
+            } else if (!$menu['admin'] && _auth(false)) {
+                $menus[$menu['position']] .= '<li' . (($routes[1] == $menu['function']) ? ' class="active"' : '') . '><a href="' . U . 'plugin/' . $menu['function'] . '">';
+                if (!empty($menu['icon'])) {
+                    $menus[$menu['position']] .= '<i class="' . $menu['icon'] . '"></i>';
+                }
+                $menus[$menu['position']] .= '<span class="text">' . $menu['name'] . '</span></a></li>';
            }
-            $menus[$menu['position']] .= '<span class="text">' . $menu['name'] . '</span></a></li>';
-        } else if (!$menu['admin'] && _auth(false)) {
-            $menus[$menu['position']] .= '<li' . (($routes[1] == $menu['function']) ? ' class="active"' : '') . '><a href="' . U . 'plugin/' . $menu['function'] . '">';
-            if (!empty($menu['icon'])) {
-                $menus[$menu['position']] .= '<i class="' . $menu['icon'] . '"></i>';
-            }
-            $menus[$menu['position']] .= '<span class="text">' . $menu['name'] . '</span></a></li>';
        }
+        foreach ($menus as $k => $v) {
+            $ui->assign('_MENU_' . $k, $v);
+        }
+        unset($menus, $menu_registered);
+        include($sys_render);
+    } else {
+        r2(U . 'dashboard', 'e', 'not found');
    }
-    foreach ($menus as $k => $v) {
-        $ui->assign('_MENU_' . $k, $v);
-    }
-    unset($menus, $menu_registered);
-    include($sys_render);
-} else {
-    r2(U . 'dashboard', 'e', 'not found');
+} catch (Exception $e) {
+    $ui->assign("error_title", "PHPNuxBill Crash");
+    $ui->assign("error_message", $e->getMessage());
+    $ui->display('router-error.tpl');
+    die();
 }
--- a/system/controllers/autoload.php
+++ b/system/controllers/autoload.php
@ -36,6 +36,18 @@ switch ($action) {

        $ui->display('autoload.tpl');
        break;
+    case 'customer_is_active':
+        $d = ORM::for_table('tbl_user_recharges')->where('customer_id', $routes['2'])->findOne();
+        if ($d) {
+            if ($d['status'] == 'on') {
+                die('<span class="label label-success" title="Expired ' . Lang::dateAndTimeFormat($d['expiration'], $d['time']) . '">'.$d['namebp'].'</span>');
+            } else {
+                die('<span class="label label-danger" title="Expired ' . Lang::dateAndTimeFormat($d['expiration'], $d['time']) . '">'.$d['namebp'].'</span>');
+            }
+        } else {
+            die('<span class="label label-danger">&bull;</span>');
+        }
+        break;
    case 'customer_select2':

        $s = addslashes(_get('s'));
--- a/system/controllers/customers.php
+++ b/system/controllers/customers.php
@ -12,9 +12,6 @@ $action = $routes['1'];
 $admin = Admin::_info();
 $ui->assign('_admin', $admin);

-use PEAR2\Net\RouterOS;
-
-require_once 'system/autoload/PEAR2/Autoload.php';

 if ($admin['user_type'] != 'Admin' and $admin['user_type'] != 'Sales') {
    r2(U . "dashboard", 'e', $_L['Do_Not_Access']);
@ -34,7 +31,8 @@ switch ($action) {
                ->order_by_desc('id')->find_many();
        } else {
            $paginator = Paginator::bootstrap('tbl_customers');
-            $d = ORM::for_table('tbl_customers')->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
+            $d = ORM::for_table('tbl_customers')
+                ->offset($paginator['startpoint'])->limit($paginator['limit'])->order_by_desc('id')->find_many();
        }

        $ui->assign('search', htmlspecialchars($search));
@ -47,13 +45,69 @@ switch ($action) {
        run_hook('view_add_customer'); #HOOK
        $ui->display('customers-add.tpl');
        break;
-
+    case 'recharge':
+        $id_customer  = $routes['2'];
+        $b = ORM::for_table('tbl_user_recharges')->where('customer_id', $id_customer)->find_one();
+        if ($b) {
+            $mikrotik = Mikrotik::info($b['routers']);
+            $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
+            if (Package::rechargeUser($id_customer, $b['routers'], $b['plan_id'], "Recharge", $admin['fullname'])) {
+                r2(U . 'customers/view/' . $id_customer, 's', 'Success Recharge Customer');
+            } else {
+                r2(U . 'customers/view/' . $id_customer, 'e', 'Customer plan is inactive');
+            }
+        }
+        r2(U . 'customers/view/' . $id_customer, 'e', 'Cannot find active plan');
+    case 'deactivate':
+        $id_customer  = $routes['2'];
+        $b = ORM::for_table('tbl_user_recharges')->where('customer_id', $id_customer)->find_one();
+        if ($b) {
+            $mikrotik = Mikrotik::info($b['routers']);
+            $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
+            if ($b['type'] == 'Hotspot') {
+                Mikrotik::removeHotspotUser($client, $b['username']);
+                Mikrotik::removeHotspotActiveUser($client, $b['username']);
+            } else if ($b['type'] == 'PPPOE') {
+                Mikrotik::removePpoeUser($client, $b['username']);
+                Mikrotik::removePpoeActive($client, $b['username']);
+            }
+            $b->status = 'off';
+            $b->expiration = date('Y-m-d');
+            $b->time = date('H:i:s');
+            $b->save();
+            _log('Admin ' . $admin['username'] . ' Deactivate '.$b['namebp'].' for '.$b['username'], 'User', $b['customer_id']);
+            Message::sendTelegram('Admin ' . $admin['username'] . ' Deactivate '.$b['namebp'].' for u'.$b['username']);
+            r2(U . 'customers/view/' . $id_customer, 's', 'Success deactivate customer to Mikrotik');
+        }
+        r2(U . 'customers/view/' . $id_customer, 'e', 'Cannot find active plan');
+        break;
+    case 'sync':
+        $id_customer  = $routes['2'];
+        $b = ORM::for_table('tbl_user_recharges')->where('customer_id', $id_customer)->where('status', 'on')->find_one();
+        if ($b) {
+            $mikrotik = Mikrotik::info($b['routers']);
+            $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
+            $c = ORM::for_table('tbl_customers')->find_one($id_customer);
+            $p = ORM::for_table('tbl_plans')->where('id', $b['plan_id'])->where('enabled', '1')->find_one();
+            if ($p) {
+                if ($b['type'] == 'Hotspot') {
+                    Mikrotik::addHotspotUser($client, $p, $c);
+                } else if ($b['type'] == 'PPPOE') {
+                    Mikrotik::addPpoeUser($client, $p, $c);
+                }
+                r2(U . 'customers/view/' . $id_customer, 's', 'Success sync customer to Mikrotik');
+            } else {
+                r2(U . 'customers/view/' . $id_customer, 'e', 'Customer plan is inactive');
+            }
+        }
+        r2(U . 'customers/view/' . $id_customer, 'e', 'Cannot find active plan');
+        break;
    case 'viewu':
        $customer = ORM::for_table('tbl_customers')->where('username', $routes['2'])->find_one();
    case 'view':
        $id  = $routes['2'];
        run_hook('view_customer'); #HOOK
-        if(!$customer){
+        if (!$customer) {
            $customer = ORM::for_table('tbl_customers')->find_one($id);
        }
        if ($customer) {
@ -81,7 +135,7 @@ switch ($action) {
                // $ui->assign('paginator', $paginator);
                $ui->assign('activation', $activation);
            }
-            $package = ORM::for_table('tbl_user_recharges')->where('username',$customer['username'])->find_one();
+            $package = ORM::for_table('tbl_user_recharges')->where('username', $customer['username'])->find_one();
            $ui->assign('package', $package);
            $ui->assign('v', $v);
            $ui->assign('d', $customer);
@ -113,14 +167,14 @@ switch ($action) {
                if ($c['type'] == 'Hotspot') {
                    if (!$config['radius_mode']) {
                        $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
-                        Mikrotik::removeHotspotUser($client, $c['username']);
-                        Mikrotik::removeHotspotActiveUser($client, $c['username']);
+                        Mikrotik::removeHotspotUser($client, $d['username']);
+                        Mikrotik::removeHotspotActiveUser($client, $d['username']);
                    }
                } else {
                    if (!$config['radius_mode']) {
                        $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
-                        Mikrotik::removePpoeUser($client, $c['username']);
-                        Mikrotik::removePpoeActive($client, $c['username']);
+                        Mikrotik::removePpoeUser($client, $d['username']);
+                        Mikrotik::removePpoeActive($client, $d['username']);
                    }
                }
                try {
--- a/system/controllers/dashboard.php
+++ b/system/controllers/dashboard.php
@ -1,13 +1,14 @@
 <?php
+
 /**
-* PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)
-**/
+ * PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)
+ **/
 _admin();
 $ui->assign('_title', $_L['Dashboard']);
 $admin = Admin::_info();
 $ui->assign('_admin', $admin);
-if(!in_array($admin['user_type'],['Admin','Sales'])){
-	r2(U."home",'e',$_L['Do_Not_Access']);
+if (!in_array($admin['user_type'], ['Admin', 'Sales'])) {
+    r2(U . "home", 'e', $_L['Do_Not_Access']);
 }

 $fdate = date('Y-m-01');
@ -17,59 +18,67 @@ $first_day_month = date('Y-m-01');
 $mdate = date('Y-m-d');
 $month_n = date('n');

-$iday = ORM::for_table('tbl_transactions')->where('recharged_on',$mdate)->sum('price');
-if($iday == ''){
+$iday = ORM::for_table('tbl_transactions')->where('recharged_on', $mdate)->sum('price');
+if ($iday == '') {
    $iday = '0.00';
 }
-$ui->assign('iday',$iday);
+$ui->assign('iday', $iday);

-$imonth = ORM::for_table('tbl_transactions')->where_gte('recharged_on',$first_day_month)->where_lte('recharged_on',$mdate)->sum('price');
-if($imonth == ''){
+$imonth = ORM::for_table('tbl_transactions')->where_gte('recharged_on', $first_day_month)->where_lte('recharged_on', $mdate)->sum('price');
+if ($imonth == '') {
    $imonth = '0.00';
 }
-$ui->assign('imonth',$imonth);
+$ui->assign('imonth', $imonth);

-$u_act = ORM::for_table('tbl_user_recharges')->where('status','on')->count();
-if($u_act == ''){
+$u_act = ORM::for_table('tbl_user_recharges')->where('status', 'on')->count();
+if (empty($u_act)) {
    $u_act = '0';
 }
-$ui->assign('u_act',$u_act);
+$ui->assign('u_act', $u_act);

 $u_all = ORM::for_table('tbl_user_recharges')->count();
-if($u_all == ''){
+if (empty($u_all)) {
    $u_all = '0';
 }
-$ui->assign('u_all',$u_all);
+$ui->assign('u_all', $u_all);
+
+
+$c_all = ORM::for_table('tbl_customers')->count();
+if (empty($c_all)) {
+    $c_all = '0';
+}
+$ui->assign('c_all', $c_all);
+
 //user expire
-$expire = ORM::for_table('tbl_user_recharges')->where('expiration',$mdate)->order_by_desc('id')->find_many();
-$ui->assign('expire',$expire);
+$expire = ORM::for_table('tbl_user_recharges')->whereLte('expiration', $mdate)->order_by_desc('id')->limit(30)->find_many();
+$ui->assign('expire', $expire);

 //activity log
 $dlog = ORM::for_table('tbl_logs')->limit(5)->order_by_desc('id')->find_many();
-$ui->assign('dlog',$dlog);
+$ui->assign('dlog', $dlog);
 $log = ORM::for_table('tbl_logs')->count();
-$ui->assign('log',$log);
+$ui->assign('log', $log);

 // Count stock
 $tmp = $v = ORM::for_table('tbl_plans')->select('id')->select('name_plan')->find_many();
 $plans = array();
-$stocks = array("used"=>0,"unused"=>0);
+$stocks = array("used" => 0, "unused" => 0);
 $n = 0;
-foreach($tmp as $plan){
+foreach ($tmp as $plan) {
    $plans[$n]['name_plan'] = $plan['name_plan'];
    $plans[$n]['unused'] = ORM::for_table('tbl_voucher')
-                        ->where('id_plan',$plan['id'])
-                        ->where('status',0)->count();;
+        ->where('id_plan', $plan['id'])
+        ->where('status', 0)->count();;
    $stocks["unused"] += $plans[$n]['unused'];
    $plans[$n]['used'] = ORM::for_table('tbl_voucher')
-                        ->where('id_plan',$plan['id'])
-                        ->where('status',1)->count();;
+        ->where('id_plan', $plan['id'])
+        ->where('status', 1)->count();;
    $stocks["used"] += $plans[$n]['used'];
    $n++;
 }

-$ui->assign('stocks',$stocks);
-$ui->assign('plans',$plans);
+$ui->assign('stocks', $stocks);
+$ui->assign('plans', $plans);

 run_hook('view_dashboard'); #HOOK
-$ui->display('dashboard.tpl');
+$ui->display('dashboard.tpl');
--- a/system/controllers/home.php
+++ b/system/controllers/home.php
@ -15,7 +15,7 @@ if (isset($_GET['renewal'])) {
 }

 if (_post('send') == 'balance') {
-    if ($config['allow_balance_transfer'] == 'yes') {
+    if ($config['enable_balance'] == 'yes' && $config['allow_balance_transfer'] == 'yes') {
        $target = ORM::for_table('tbl_customers')->where('username', _post('username'))->find_one();
        if (!$target) {
            r2(U . 'home', 'd', Lang::T('Username not found'));
@ -25,7 +25,7 @@ if (_post('send') == 'balance') {
        if ($user['balance'] < $balance) {
            r2(U . 'home', 'd', Lang::T('insufficient balance'));
        }
-        if (intval($config['minimum_transfer']) >= intval($balance)) {
+        if (!empty($config['minimum_transfer']) && intval($balance) < intval($config['minimum_transfer'])) {
            r2(U . 'home', 'd', Lang::T('Minimum Transfer') . ' ' . Lang::moneyFormat($config['minimum_transfer']));
        }
        if ($user['username'] == $target['username']) {
@ -66,13 +66,23 @@ if (_post('send') == 'balance') {
            $d->pg_url_payment = 'balance';
            $d->status = 2;
            $d->save();
-            Message::sendBalanceNotification($user['phonenumber'], $target['fullname'] . ' (' . $target['username'] . ')', $balance, Lang::getNotifText('balance_send'), $config['user_notification_payment']);
-            Message::sendBalanceNotification($target['phonenumber'], $user['fullname'] . ' (' . $user['username'] . ')', $balance, Lang::getNotifText('balance_received'), $config['user_notification_payment']);
+            Message::sendBalanceNotification($user['phonenumber'], $target['fullname'] . ' (' . $target['username'] . ')', $balance, ($user['balance'] - $balance), Lang::getNotifText('balance_send'), $config['user_notification_payment']);
+            Message::sendBalanceNotification($target['phonenumber'], $user['fullname'] . ' (' . $user['username'] . ')', $balance, ($target['balance'] + $balance), Lang::getNotifText('balance_received'), $config['user_notification_payment']);
            Message::sendTelegram("#u$user[username] send balance to #u$target[username] \n" . Lang::moneyFormat($balance));
            r2(U . 'home', 's', Lang::T('Sending balance success'));
        }
    } else {
-        r2(U . 'home', 'd', 'Failed, balance is not available');
+        r2(U . 'home', 'd', Lang::T('Failed, balance is not available'));
+    }
+} else if (_post('send') == 'plan') {
+    $active = ORM::for_table('tbl_user_recharges')
+        ->where('username', _post('username'))
+        ->find_one();
+    $router = ORM::for_table('tbl_routers')->where('name', $active['routers'])->find_one();
+    if ($router) {
+        r2(U . "order/send/$router[id]/$active[plan_id]&u=" . trim(_post('username')), 's', Lang::T('Review package before recharge'));
+    } else {
+        r2(U . 'package/order', 'w', Lang::T('Your friend do not have active package'));
    }
 }

@ -80,6 +90,41 @@ if (_post('send') == 'balance') {
 $bill = User::_billing();
 $ui->assign('_bill', $bill);

+if(isset($_GET['recharge']) && $_GET['recharge'] == 1){
+    $router = ORM::for_table('tbl_routers')->where('name', $bill['routers'])->find_one();
+    if ($config['enable_balance'] == 'yes') {
+        $plan = ORM::for_table('tbl_plans')->find_one($bill['plan_id']);
+        if($user['balance']>$plan['price']){
+            r2(U . "order/pay/$router[id]/$bill[plan_id]", 'e', 'Order Plan');
+        }else{
+            r2(U . "order/buy/$router[id]/$bill[plan_id]", 'e', 'Order Plan');
+        }
+    }else{
+        r2(U . "order/buy/$router[id]/$bill[plan_id]", 'e', 'Order Plan');
+    }
+}else if(isset($_GET['deactivate']) && $_GET['deactivate'] == 1){
+    if ($bill) {
+        $mikrotik = Mikrotik::info($bill['routers']);
+        $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
+        if ($bill['type'] == 'Hotspot') {
+            Mikrotik::removeHotspotUser($client, $bill['username']);
+            Mikrotik::removeHotspotActiveUser($client, $bill['username']);
+        } else if ($bill['type'] == 'PPPOE') {
+            Mikrotik::removePpoeUser($client, $bill['username']);
+            Mikrotik::removePpoeActive($client, $bill['username']);
+        }
+        $bill->status = 'off';
+        $bill->expiration = date('Y-m-d');
+        $bill->time = date('H:i:s');
+        $bill->save();
+        _log('User ' . $bill['username'] . ' Deactivate '.$bill['namebp'], 'User', $bill['customer_id']);
+        Message::sendTelegram('User u' . $bill['username'] . ' Deactivate '.$bill['namebp']);
+        r2(U . 'home', 's', 'Success deactivate '.$bill['namebp']);
+    }else{
+        r2(U . 'home', 'e', 'No Active Plan');
+    }
+}
+
 if (!empty($_SESSION['nux-mac']) && !empty($_SESSION['nux-ip'])) {
    $ui->assign('nux_mac', $_SESSION['nux-mac']);
    $ui->assign('nux_ip', $_SESSION['nux-ip']);
--- a/system/controllers/order.php
+++ b/system/controllers/order.php
@ -35,9 +35,19 @@ switch ($action) {
        }
        $ui->assign('_title', 'Order Plan');
        $ui->assign('_system_menu', 'package');
-        $routers = ORM::for_table('tbl_routers')->find_many();
-        $plans_pppoe = ORM::for_table('tbl_plans')->where('enabled', '1')->where('type', 'PPPOE')->find_many();
-        $plans_hotspot = ORM::for_table('tbl_plans')->where('enabled', '1')->where('type', 'Hotspot')->find_many();
+        if(!empty($_SESSION['nux-router'])){
+            $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('enabled', '1')->where_in('routers', $rs)->where('type', 'PPPOE')->find_many();
+            $plans_hotspot = ORM::for_table('tbl_plans')->where('enabled', '1')->where_in('routers', $rs)->where('type', 'Hotspot')->find_many();
+        }else{
+            $routers = ORM::for_table('tbl_routers')->find_many();
+            $plans_pppoe = ORM::for_table('tbl_plans')->where('enabled', '1')->where('type', 'PPPOE')->find_many();
+            $plans_hotspot = ORM::for_table('tbl_plans')->where('enabled', '1')->where('type', 'Hotspot')->find_many();
+        }
        $plans_balance = ORM::for_table('tbl_plans')->where('enabled', '1')->where('type', 'Balance')->find_many();
        $ui->assign('routers', $routers);
        $ui->assign('plans_pppoe', $plans_pppoe);
@ -98,7 +108,7 @@ switch ($action) {
            }
        }
        if (empty($trx)) {
-            r2(U . "order", 'e', Lang::T("Transaction Not found"));
+            r2(U . "order/package", 'e', Lang::T("Transaction Not found"));
        }
        $router = ORM::for_table('tbl_routers')->find_one($trx['routers_id']);
        $plan = ORM::for_table('tbl_plans')->find_one($trx['plan_id']);
@ -111,8 +121,8 @@ switch ($action) {
        $ui->display('user-orderView.tpl');
        break;
    case 'pay':
-        if ($_c['enable_balance'] != 'yes'){
-            r2(U . "order", 'e', Lang::T("Balance not enabled"));
+        if ($_c['enable_balance'] != 'yes' && $config['allow_balance_transfer'] != 'yes') {
+            r2(U . "order/package", 'e', Lang::T("Balance not enabled"));
        }
        $plan = ORM::for_table('tbl_plans')->where('enabled', '1')->find_one($routes['3']);
        $router = ORM::for_table('tbl_routers')->where('enabled', '1')->find_one($routes['2']);
@ -130,10 +140,91 @@ switch ($action) {
                    "\nRouter: " . $router_name .
                    "\nPrice: " . $p['price']);
            }
-        }else{
+        } else {
            echo "no renewall | plan enabled: $p[enabled] | User balance: $c[balance] | price $p[price]\n";
        }
        break;
+    case 'send':
+        if ($_c['enable_balance'] != 'yes') {
+            r2(U . "order/package", 'e', Lang::T("Balance not enabled"));
+        }
+        $ui->assign('_title', Lang::T('Buy for friend'));
+        $ui->assign('_system_menu', 'package');
+        $plan = ORM::for_table('tbl_plans')->find_one($routes['3']);
+        if (empty($plan)) {
+            r2(U . "order/package", 'e', Lang::T("Plan Not found"));
+        }
+        if (isset($_POST['send']) && $_POST['send'] == 'plan') {
+            $target = ORM::for_table('tbl_customers')->where('username', _post('username'))->find_one();
+            if (!$target) {
+                r2(U . 'home', 'd', Lang::T('Username not found'));
+            }
+            if ($user['balance'] < $plan['price']) {
+                r2(U . 'home', 'd', Lang::T('insufficient balance'));
+            }
+            if ($user['username'] == $target['username']) {
+                r2(U . "order/pay/$routes[2]/$routes[3]", 's', '^_^ v');
+            }
+            $active = ORM::for_table('tbl_user_recharges')
+                ->where('username', _post('username'))
+                ->where('status', 'on')
+                ->find_one();
+
+            if ($active && $active['plan_id'] != $plan['id']) {
+                r2(U . "order/package", 'e', Lang::T("Target has active plan, different with current plant.")." [ <b>$active[namebp]</b> ]");
+            }
+            if (Package::rechargeUser($target['id'], $plan['routers'], $plan['id'], $user['fullname'], 'Balance')) {
+                // if success, then get the balance
+                Balance::min($user['id'], $plan['price']);
+                //sender
+                $d = ORM::for_table('tbl_payment_gateway')->create();
+                $d->username = $user['username'];
+                $d->gateway = $target['username'];
+                $d->plan_id = $plan['id'];
+                $d->plan_name = $plan['name_plan'];
+                $d->routers_id = $routes['2'];
+                $d->routers = $plan['routers'];
+                $d->price = $plan['price'];
+                $d->payment_method = "Balance";
+                $d->payment_channel = "Send Plan";
+                $d->created_date = date('Y-m-d H:i:s');
+                $d->paid_date = date('Y-m-d H:i:s');
+                $d->expired_date = date('Y-m-d H:i:s');
+                $d->pg_url_payment = 'balance';
+                $d->status = 2;
+                $d->save();
+                $trx_id = $d->id();
+                //receiver
+                $d = ORM::for_table('tbl_payment_gateway')->create();
+                $d->username = $target['username'];
+                $d->gateway = $user['username'];
+                $d->plan_id = $plan['id'];
+                $d->plan_name = $plan['name_plan'];
+                $d->routers_id = $routes['2'];
+                $d->routers = $plan['routers'];
+                $d->price = $plan['price'];
+                $d->payment_method = "Balance";
+                $d->payment_channel = "Received Plan";
+                $d->created_date = date('Y-m-d H:i:s');
+                $d->paid_date = date('Y-m-d H:i:s');
+                $d->expired_date = date('Y-m-d H:i:s');
+                $d->pg_url_payment = 'balance';
+                $d->status = 2;
+                $d->save();
+                r2(U . "order/view/$trx_id", 's', Lang::T("Success to send package"));
+            } else {
+                r2(U . "order/package", 'e', Lang::T("Failed to Send package"));
+                Message::sendTelegram("Send Package with Balance Failed\n\n#u$user[username] #send \n" . $plan['name_plan'] .
+                    "\nRouter: " . $plan['routers'] .
+                    "\nPrice: " . $plan['price']);
+            }
+        }
+
+        $ui->assign('username', $_GET['u']);
+        $ui->assign('router', $router);
+        $ui->assign('plan', $plan);
+        $ui->display('user-sendPlan.tpl');
+        break;
    case 'buy':
        if (strpos($user['email'], '@') === false) {
            r2(U . 'accounts/profile', 'e', Lang::T("Please enter your email address"));
@ -147,9 +238,9 @@ switch ($action) {
        run_hook('customer_buy_plan'); #HOOK
        include 'system/paymentgateway/' . $config['payment_gateway'] . '.php';
        call_user_func($config['payment_gateway'] . '_validate_config');
-        if ($routes['2']>0) {
+        if ($routes['2'] > 0) {
            $router = ORM::for_table('tbl_routers')->where('enabled', '1')->find_one($routes['2']);
-        }else{
+        } else {
            $router['id'] = 0;
            $router['name'] = 'balance';
        }
@ -205,5 +296,5 @@ switch ($action) {
        }
        break;
    default:
-    r2(U . "order/package/", 's','');
+        r2(U . "order/package/", 's', '');
 }
--- a/system/controllers/pages.php
+++ b/system/controllers/pages.php
@ -11,21 +11,31 @@ $admin = Admin::_info();
 $ui->assign('_admin', $admin);

 if(strpos($action,"-post")===false){
-    $path = __DIR__."/../../pages/".str_replace(".","",$action).".html";
+    $path = "pages/".str_replace(".","",$action).".html";
    //echo $path;
    run_hook('view_edit_pages'); #HOOK
+    if(!file_exists($path)){
+        $temp = "pages_template/".str_replace(".","",$action).".html";
+        if(file_exists($temp)){
+            if(!copy($temp, $path)){
+                touch($path);
+            }
+        }else{
+            touch($path);
+        }
+    }
    if(file_exists($path)){
        $html = file_get_contents($path);
        $ui->assign("htmls",str_replace(["<div","</div>"],"",$html));
        $ui->assign("writeable",is_writable($path));
-        $ui->assign("pageHeader",$action);
+        $ui->assign("pageHeader",str_replace('_', ' ', $action));
        $ui->assign("PageFile",$action);
        $ui->display('page-edit.tpl');
    }else
        $ui->display('a404.tpl');
 }else{
    $action = str_replace("-post","",$action);
-    $path = __DIR__."/../../pages/".str_replace(".","",$action).".html";
+    $path = "pages/".str_replace(".","",$action).".html";
    if(file_exists($path)){
        $html = _post("html");
        run_hook('save_pages'); #HOOK
--- a/system/controllers/pluginmanager.php
+++ b/system/controllers/pluginmanager.php
@ -21,9 +21,14 @@ if ($admin['user_type'] != 'Admin') {

 $cache = File::pathFixer('system/cache/plugin_repository.json');
 if (file_exists($cache) && time() - filemtime($cache) < (24 * 60 * 60)) {
-    $json = json_decode(file_get_contents($cache), true);
+    $txt = file_get_contents($cache);
+    $json = json_decode($txt, true);
+    if(empty($json['plugins']) && empty($json['payment_gateway'])){
+        unlink($cache);
+        r2(U . 'dashboard', 'd', $txt);
+    }
 } else {
-    $data = file_get_contents($plugin_repository);
+    $data = Http::getData($plugin_repository);
    file_put_contents($cache, $data);
    $json = json_decode($data, true);
 }
--- a/system/controllers/pool.php
+++ b/system/controllers/pool.php
@ -15,9 +15,6 @@ if ($admin['user_type'] != 'Admin') {
    r2(U . "dashboard", 'e', $_L['Do_Not_Access']);
 }

-use PEAR2\Net\RouterOS;
-
-require_once 'system/autoload/PEAR2/Autoload.php';

 switch ($action) {
    case 'list':
@ -73,6 +70,17 @@ switch ($action) {
        }
        break;

+    case 'sync':
+        $pools = ORM::for_table('tbl_pool')->find_many();
+        $log = '';
+        foreach($pools as $pool){
+            $mikrotik = Mikrotik::info($pool['routers']);
+            $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
+            Mikrotik::addPool($client, $pool['pool_name'], $pool['range_ip']);
+            $log .= 'DONE: '.$pool['pool_name'].': '.$pool['range_ip'].'<br>';
+        }
+        r2(U . 'pool/list', 's', $log);
+        break;
    case 'add-post':
        $name = _post('name');
        $ip_address = _post('ip_address');
--- a/system/controllers/prepaid.php
+++ b/system/controllers/prepaid.php
@ -40,9 +40,31 @@ EOT;
 require_once 'system/autoload/PEAR2/Autoload.php';

 switch ($action) {
+    case 'sync':
+        set_time_limit(-1);
+        $plans = ORM::for_table('tbl_user_recharges')->where('status', 'on')->find_many();
+        echo count($plans);
+        $log = '';
+        $router = '';
+        foreach ($plans as $plan) {
+            if ($router != $plan['routers']) {
+                $mikrotik = Mikrotik::info($plan['routers']);
+                $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
+                $router = $plan['routers'];
+            }
+            $p = ORM::for_table('tbl_plans')->findOne($plan['plan_id']);
+            $c = ORM::for_table('tbl_customers')->findOne($plan['customer_id']);
+            if ($plan['type'] == 'Hotspot') {
+                Mikrotik::addHotspotUser($client, $p, $c);
+            } else if ($plan['type'] == 'PPPOE') {
+                Mikrotik::addPpoeUser($client, $p, $c);
+            }
+            $log .= "DONE : $plan[username], $plan[namebp], $plan[type], $plan[routers]<br>";
+        }
+        r2(U . 'prepaid/list', 's', $log);
    case 'list':
        $ui->assign('xfooter', '<script type="text/javascript" src="ui/lib/c/prepaid.js"></script>');
-
+        $ui->assign('_title', $_L['Customers']);
        $username = _post('username');
        if ($username != '') {
            $paginator = Paginator::bootstrap('tbl_user_recharges', 'username', '%' . $username . '%');
@ -65,6 +87,9 @@ switch ($action) {
        $ui->assign('p', $p);
        $r = ORM::for_table('tbl_routers')->where('enabled', '1')->find_many();
        $ui->assign('r', $r);
+        if (isset($routes['2']) && !empty($routes['2'])) {
+            $ui->assign('cust', ORM::for_table('tbl_customers')->find_one($routes['2']));
+        }
        run_hook('view_recharge'); #HOOK
        $ui->display('recharge.tpl');
        break;
@ -114,7 +139,6 @@ switch ($action) {

    case 'print':
        $id = _post('id');
-
        $d = ORM::for_table('tbl_transactions')->where('id', $id)->find_one();
        $ui->assign('d', $d);

@ -147,14 +171,16 @@ switch ($action) {
            if ($d['type'] == 'Hotspot') {
                if (!$config['radius_mode']) {
                    $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
-                    Mikrotik::removeHotspotUser($client, $c['username']);
+                    Mikrotik::removeHotspotUser($client, $d['username']);
+                    Mikrotik::removeHotspotActiveUser($client, $d['username']);
                }

                $d->delete();
            } else {
                if (!$config['radius_mode']) {
                    $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
-                    Mikrotik::removePpoeUser($client, $c['username']);
+                    Mikrotik::removePpoeUser($client, $d['username']);
+                    Mikrotik::removePpoeActive($client, $d['username']);
                }
                $d->delete();
            }
@ -168,6 +194,7 @@ switch ($action) {
        $id_plan = _post('id_plan');
        $recharged_on = _post('recharged_on');
        $expiration = _post('expiration');
+        $time = _post('time');

        $id = _post('id');
        $d = ORM::for_table('tbl_user_recharges')->find_one($id);
@ -180,8 +207,9 @@ 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();
            Package::changeTo($username, $id_plan);
            _log('[' . $admin['username'] . ']: ' . 'Edit Plan for Customer ' . $d['username'] . ' to [' . $d['plan_name'] . '][' . Lang::moneyFormat($d['price']) . ']', 'Admin', $admin['id']);
@ -365,19 +393,17 @@ switch ($action) {
        break;

    case 'refill-post':
-        $user = _post('id_customer');
        $code = _post('code');
-
+        $user = ORM::for_table('tbl_customers')->where('id', _post('id_customer'))->find_one();
        $v1 = ORM::for_table('tbl_voucher')->where('code', $code)->where('status', 0)->find_one();

        run_hook('refill_customer'); #HOOK
        if ($v1) {
-            if (Package::rechargeUser($user, $v1['routers'], $v1['id_plan'], "Refill", "Voucher")) {
+            if (Package::rechargeUser($user['id'], $v1['routers'], $v1['id_plan'], "Refill", "Voucher")) {
                $v1->status = "1";
-                $v1->user = $c['username'];
+                $v1->user = $user['username'];
                $v1->save();
-                $c = ORM::for_table('tbl_customers')->where('id', $id_customer)->find_one();
-                $in = ORM::for_table('tbl_transactions')->where('username', $c['username'])->order_by_desc('id')->find_one();
+                $in = ORM::for_table('tbl_transactions')->where('username', $user['username'])->order_by_desc('id')->find_one();
                $ui->assign('in', $in);
                $ui->assign('date', date("Y-m-d H:i:s"));
                $ui->display('invoice.tpl');
--- a/system/controllers/services.php
+++ b/system/controllers/services.php
@ -21,6 +21,68 @@ use PEAR2\Net\RouterOS;
 require_once 'system/autoload/PEAR2/Autoload.php';

 switch ($action) {
+    case 'sync':
+        set_time_limit(-1);
+        if ($routes['2'] == 'hotspot') {
+            $plans = ORM::for_table('tbl_bandwidth')->join('tbl_plans', array('tbl_bandwidth.id', '=', 'tbl_plans.id_bw'))->where('tbl_plans.type', 'Hotspot')->where('tbl_plans.enabled', '1')->find_many();
+            $log = '';
+            $router = '';
+            foreach ($plans as $plan) {
+                if ($router != $plan['routers']) {
+                    $mikrotik = Mikrotik::info($plan['routers']);
+                    $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
+                    $router = $plan['routers'];
+                }
+                if ($plan['rate_down_unit'] == 'Kbps') {
+                    $unitdown = 'K';
+                } else {
+                    $unitdown = 'M';
+                }
+                if ($plan['rate_up_unit'] == 'Kbps') {
+                    $unitup = 'K';
+                } else {
+                    $unitup = 'M';
+                }
+                $rate = $plan['rate_up'] . $unitup . "/" . $plan['rate_down'] . $unitdown;
+                Mikrotik::addHotspotPlan($client, $plan['name_plan'], $plan['shared_users'], $rate);
+                $log .= "DONE : $plan[name_plan], $plan[shared_users], $rate<br>";
+                if (!empty($plan['pool_expired'])) {
+                    Mikrotik::setHotspotExpiredPlan($client, 'EXPIRED NUXBILL ' . $plan['pool_expired'], $plan['pool_expired']);
+                    $log .= "DONE Expired : EXPIRED NUXBILL $plan[pool_expired]<br>";
+                }
+            }
+            r2(U . 'services/hotspot', 's', $log);
+        }else if ($routes['2'] == 'pppoe') {
+            $plans = ORM::for_table('tbl_bandwidth')->join('tbl_plans', array('tbl_bandwidth.id', '=', 'tbl_plans.id_bw'))->where('tbl_plans.type', 'PPPOE')->where('tbl_plans.enabled', '1')->find_many();
+            $log = '';
+            $router = '';
+            foreach ($plans as $plan) {
+                if ($router != $plan['routers']) {
+                    $mikrotik = Mikrotik::info($plan['routers']);
+                    $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
+                    $router = $plan['routers'];
+                }
+                if ($plan['rate_down_unit'] == 'Kbps') {
+                    $unitdown = 'K';
+                } else {
+                    $unitdown = 'M';
+                }
+                if ($plan['rate_up_unit'] == 'Kbps') {
+                    $unitup = 'K';
+                } else {
+                    $unitup = 'M';
+                }
+                $rate = $plan['rate_up'] . $unitup . "/" . $plan['rate_down'] . $unitdown;
+                Mikrotik::addPpoePlan($client, $plan['name_plan'], $plan['pool'], $rate);
+                $log .= "DONE : $plan[name_plan], $plan[pool], $rate<br>";
+                if (!empty($plan['pool_expired'])) {
+                    Mikrotik::setPpoePlan($client, 'EXPIRED NUXBILL ' . $plan['pool_expired'], $plan['pool_expired'], '512K/512K');
+                    $log .= "DONE Expired : EXPIRED NUXBILL $plan[pool_expired]<br>";
+                }
+            }
+            r2(U . 'services/pppoe', 's', $log);
+        }
+        r2(U . 'services/hotspot', 'w', 'Unknown command');
    case 'hotspot':
        $ui->assign('xfooter', '<script type="text/javascript" src="ui/lib/c/hotspot.js"></script>');

@ -53,10 +115,10 @@ switch ($action) {
        $d = ORM::for_table('tbl_plans')->find_one($id);
        if ($d) {
            $ui->assign('d', $d);
+            $p = ORM::for_table('tbl_pool')->where('routers', $d['routers'])->find_many();
+            $ui->assign('p', $p);
            $b = ORM::for_table('tbl_bandwidth')->find_many();
            $ui->assign('b', $b);
-            $r = ORM::for_table('tbl_routers')->find_many();
-            $ui->assign('r', $r);
            run_hook('view_edit_plan'); #HOOK
            $ui->display('hotspot-edit.tpl');
        } else {
@ -96,6 +158,7 @@ switch ($action) {
        $validity = _post('validity');
        $validity_unit = _post('validity_unit');
        $routers = _post('routers');
+        $pool_expired = _post('pool_expired');
        $enabled = _post('enabled');

        $msg = '';
@ -134,8 +197,12 @@ switch ($action) {
                $mikrotik = Mikrotik::info($routers);
                $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
                Mikrotik::addHotspotPlan($client, $name, $sharedusers, $rate);
+                if (!empty($pool_expired)) {
+                    Mikrotik::setHotspotExpiredPlan($client, 'EXPIRED NUXBILL ' . $pool_expired, $pool_expired);
+                }
            }

+
            $d = ORM::for_table('tbl_plans')->create();
            $d->name_plan = $name;
            $d->id_bw = $id_bw;
@ -151,6 +218,7 @@ switch ($action) {
            $d->validity_unit = $validity_unit;
            $d->shared_users = $sharedusers;
            $d->routers = $routers;
+            $d->pool_expired = $pool_expired;
            $d->enabled = $enabled;
            $d->save();

@ -176,6 +244,7 @@ switch ($action) {
        $validity = _post('validity');
        $validity_unit = _post('validity_unit');
        $routers = _post('routers');
+        $pool_expired = _post('pool_expired');
        $enabled = _post('enabled');

        $msg = '';
@ -213,6 +282,9 @@ switch ($action) {
                $mikrotik = Mikrotik::info($routers);
                $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
                Mikrotik::setHotspotPlan($client, $name, $sharedusers, $rate);
+                if (!empty($pool_expired)) {
+                    Mikrotik::setHotspotExpiredPlan($client, 'EXPIRED NUXBILL ' . $pool_expired, $pool_expired);
+                }
            }

            $d->name_plan = $name;
@ -228,6 +300,7 @@ switch ($action) {
            $d->validity_unit = $validity_unit;
            $d->shared_users = $sharedusers;
            $d->routers = $routers;
+            $d->pool_expired = $pool_expired;
            $d->enabled = $enabled;
            $d->save();

@ -260,8 +333,6 @@ switch ($action) {
        $ui->assign('_title', $_L['PPPOE_Plans']);
        $d = ORM::for_table('tbl_bandwidth')->find_many();
        $ui->assign('d', $d);
-        $p = ORM::for_table('tbl_pool')->find_many();
-        $ui->assign('p', $p);
        $r = ORM::for_table('tbl_routers')->find_many();
        $ui->assign('r', $r);
        run_hook('view_add_ppoe'); #HOOK
@ -274,10 +345,10 @@ switch ($action) {
        $d = ORM::for_table('tbl_plans')->find_one($id);
        if ($d) {
            $ui->assign('d', $d);
+            $p = ORM::for_table('tbl_pool')->where('routers', $d['routers'])->find_many();
+            $ui->assign('p', $p);
            $b = ORM::for_table('tbl_bandwidth')->find_many();
            $ui->assign('b', $b);
-            $p = ORM::for_table('tbl_pool')->find_many();
-            $ui->assign('p', $p);
            $r = ORM::for_table('tbl_routers')->find_many();
            $ui->assign('r', $r);
            run_hook('view_edit_ppoe'); #HOOK
@ -312,6 +383,7 @@ switch ($action) {
        $validity_unit = _post('validity_unit');
        $routers = _post('routers');
        $pool = _post('pool_name');
+        $pool_expired = _post('pool_expired');
        $enabled = _post('enabled');

        $msg = '';
@ -348,6 +420,9 @@ switch ($action) {
                $mikrotik = Mikrotik::info($routers);
                $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
                Mikrotik::addPpoePlan($client, $name, $pool, $rate);
+                if (!empty($pool_expired)) {
+                    Mikrotik::setPpoePlan($client, 'EXPIRED NUXBILL ' . $pool_expired, $pool_expired, '512K/512K');
+                }
            }

            $d = ORM::for_table('tbl_plans')->create();
@ -359,6 +434,7 @@ switch ($action) {
            $d->validity_unit = $validity_unit;
            $d->routers = $routers;
            $d->pool = $pool;
+            $d->pool_expired = $pool_expired;
            $d->enabled = $enabled;
            $d->save();

@ -377,6 +453,7 @@ switch ($action) {
        $validity_unit = _post('validity_unit');
        $routers = _post('routers');
        $pool = _post('pool_name');
+        $pool_expired = _post('pool_expired');
        $enabled = _post('enabled');

        $msg = '';
@ -414,6 +491,9 @@ switch ($action) {
                $mikrotik = Mikrotik::info($routers);
                $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
                Mikrotik::setPpoePlan($client, $name, $pool, $rate);
+                if (!empty($pool_expired)) {
+                    Mikrotik::setPpoePlan($client, 'EXPIRED NUXBILL ' . $pool_expired, $pool_expired, '512K/512K');
+                }
            }

            $d->name_plan = $name;
@ -423,6 +503,7 @@ switch ($action) {
            $d->validity_unit = $validity_unit;
            $d->routers = $routers;
            $d->pool = $pool;
+            $d->pool_expired = $pool_expired;
            $d->enabled = $enabled;
            $d->save();

--- a/system/controllers/settings.php
+++ b/system/controllers/settings.php
@ -17,6 +17,12 @@ switch ($action) {
        if ($admin['user_type'] != 'Admin') {
            r2(U . "dashboard", 'e', $_L['Do_Not_Access']);
        }
+        if (file_exists('system/uploads/logo.png')) {
+            $logo = 'system/uploads/logo.png?' . time();
+        } else {
+            $logo = 'system/uploads/logo.default.png';
+        }
+        $ui->assign('logo', $logo);
        run_hook('view_app_settings'); #HOOK
        $ui->display('app-settings.tpl');
        break;
@ -25,8 +31,14 @@ switch ($action) {
        if ($admin['user_type'] != 'Admin') {
            r2(U . "dashboard", 'e', $_L['Do_Not_Access']);
        }
-        $lan = ORM::for_table('tbl_language')->find_many();
-        $ui->assign('lan', $lan);
+        $folders = [];
+        $files = scandir('system/lan/');
+        foreach ($files as $file) {
+            if(is_dir('system/lan/'.$file) && !in_array($file,['.','..'])){
+                $folders[] = $file;
+            }
+        }
+        $ui->assign('lan', $folders);

        $timezonelist = Timezone::timezoneList();
        $ui->assign('tlist', $timezonelist);
@ -219,8 +231,17 @@ switch ($action) {
        $user_notification_payment = _post('user_notification_payment');
        $address = _post('address');
        $tawkto = _post('tawkto');
-        $radius_mode = _post('radius_mode')*1;
+        $http_proxy = _post('http_proxy');
+        $http_proxyauth = _post('http_proxyauth');
+        $radius_mode = _post('radius_mode') * 1;
        run_hook('save_settings'); #HOOK
+
+
+        if (!empty($_FILES['logo']['name'])) {
+            if (file_exists('system/uploads/logo.png')) unlink('system/uploads/logo.png');
+            File::resizeCropImage($_FILES['logo']['tmp_name'], 'system/uploads/logo.png', 1078, 200, 100);
+            if (file_exists($_FILES['logo']['tmp_name'])) unlink($_FILES['logo']['tmp_name']);
+        }
        if ($company == '') {
            r2(U . 'settings/app', 'e', $_L['All_field_is_required']);
        } else {
@ -238,11 +259,33 @@ switch ($action) {
            $d->save();


+            $d = ORM::for_table('tbl_appconfig')->where('setting', 'http_proxy')->find_one();
+            if ($d) {
+                $d->value = $http_proxy;
+                $d->save();
+            } else {
+                $d = ORM::for_table('tbl_appconfig')->create();
+                $d->setting = 'http_proxy';
+                $d->value = $http_proxy;
+                $d->save();
+            }
+
+            $d = ORM::for_table('tbl_appconfig')->where('setting', 'http_proxyauth')->find_one();
+            if ($d) {
+                $d->value = $http_proxyauth;
+                $d->save();
+            } else {
+                $d = ORM::for_table('tbl_appconfig')->create();
+                $d->setting = 'http_proxyauth';
+                $d->value = $http_proxyauth;
+                $d->save();
+            }
+
            $d = ORM::for_table('tbl_appconfig')->where('setting', 'CompanyFooter')->find_one();
-            if($d){
+            if ($d) {
                $d->value = $footer;
                $d->save();
-            }else{
+            } else {
                $d = ORM::for_table('tbl_appconfig')->create();
                $d->setting = 'CompanyFooter';
                $d->value = $footer;
@ -250,10 +293,10 @@ switch ($action) {
            }

            $d = ORM::for_table('tbl_appconfig')->where('setting', 'disable_voucher')->find_one();
-            if($d){
+            if ($d) {
                $d->value = $disable_voucher;
                $d->save();
-            }else{
+            } else {
                $d = ORM::for_table('tbl_appconfig')->create();
                $d->setting = 'disable_voucher';
                $d->value = $disable_voucher;
@ -261,10 +304,10 @@ switch ($action) {
            }

            $d = ORM::for_table('tbl_appconfig')->where('setting', 'enable_balance')->find_one();
-            if($d){
+            if ($d) {
                $d->value = $enable_balance;
                $d->save();
-            }else{
+            } else {
                $d = ORM::for_table('tbl_appconfig')->create();
                $d->setting = 'enable_balance';
                $d->value = $enable_balance;
@ -272,10 +315,10 @@ switch ($action) {
            }

            $d = ORM::for_table('tbl_appconfig')->where('setting', 'allow_balance_transfer')->find_one();
-            if($d){
+            if ($d) {
                $d->value = $allow_balance_transfer;
                $d->save();
-            }else{
+            } else {
                $d = ORM::for_table('tbl_appconfig')->create();
                $d->setting = 'allow_balance_transfer';
                $d->value = $allow_balance_transfer;
@ -283,10 +326,10 @@ switch ($action) {
            }

            $d = ORM::for_table('tbl_appconfig')->where('setting', 'minimum_transfer')->find_one();
-            if($d){
+            if ($d) {
                $d->value = $minimum_transfer;
                $d->save();
-            }else{
+            } else {
                $d = ORM::for_table('tbl_appconfig')->create();
                $d->setting = 'minimum_transfer';
                $d->value = $minimum_transfer;
@ -294,10 +337,10 @@ switch ($action) {
            }

            $d = ORM::for_table('tbl_appconfig')->where('setting', 'telegram_bot')->find_one();
-            if($d){
+            if ($d) {
                $d->value = $telegram_bot;
                $d->save();
-            }else{
+            } else {
                $d = ORM::for_table('tbl_appconfig')->create();
                $d->setting = 'telegram_bot';
                $d->value = $telegram_bot;
@ -305,10 +348,10 @@ switch ($action) {
            }

            $d = ORM::for_table('tbl_appconfig')->where('setting', 'telegram_target_id')->find_one();
-            if($d){
+            if ($d) {
                $d->value = $telegram_target_id;
                $d->save();
-            }else{
+            } else {
                $d = ORM::for_table('tbl_appconfig')->create();
                $d->setting = 'telegram_target_id';
                $d->value = $telegram_target_id;
@ -316,10 +359,10 @@ switch ($action) {
            }

            $d = ORM::for_table('tbl_appconfig')->where('setting', 'sms_url')->find_one();
-            if($d){
+            if ($d) {
                $d->value = $sms_url;
                $d->save();
-            }else{
+            } else {
                $d = ORM::for_table('tbl_appconfig')->create();
                $d->setting = 'sms_url';
                $d->value = $sms_url;
@ -327,10 +370,10 @@ switch ($action) {
            }

            $d = ORM::for_table('tbl_appconfig')->where('setting', 'wa_url')->find_one();
-            if($d){
+            if ($d) {
                $d->value = $wa_url;
                $d->save();
-            }else{
+            } else {
                $d = ORM::for_table('tbl_appconfig')->create();
                $d->setting = 'wa_url';
                $d->value = $wa_url;
@ -338,10 +381,10 @@ switch ($action) {
            }

            $d = ORM::for_table('tbl_appconfig')->where('setting', 'user_notification_expired')->find_one();
-            if($d){
+            if ($d) {
                $d->value = $user_notification_expired;
                $d->save();
-            }else{
+            } else {
                $d = ORM::for_table('tbl_appconfig')->create();
                $d->setting = 'user_notification_expired';
                $d->value = $user_notification_expired;
@ -349,10 +392,10 @@ switch ($action) {
            }

            $d = ORM::for_table('tbl_appconfig')->where('setting', 'user_notification_reminder')->find_one();
-            if($d){
+            if ($d) {
                $d->value = $user_notification_reminder;
                $d->save();
-            }else{
+            } else {
                $d = ORM::for_table('tbl_appconfig')->create();
                $d->setting = 'user_notification_reminder';
                $d->value = $user_notification_reminder;
@ -360,10 +403,10 @@ switch ($action) {
            }

            $d = ORM::for_table('tbl_appconfig')->where('setting', 'user_notification_payment')->find_one();
-            if($d){
+            if ($d) {
                $d->value = $user_notification_payment;
                $d->save();
-            }else{
+            } else {
                $d = ORM::for_table('tbl_appconfig')->create();
                $d->setting = 'user_notification_payment';
                $d->value = $user_notification_payment;
@ -371,10 +414,10 @@ switch ($action) {
            }

            $d = ORM::for_table('tbl_appconfig')->where('setting', 'tawkto')->find_one();
-            if($d){
+            if ($d) {
                $d->value = $tawkto;
                $d->save();
-            }else{
+            } else {
                $d = ORM::for_table('tbl_appconfig')->create();
                $d->setting = 'tawkto';
                $d->value = $tawkto;
@ -382,10 +425,10 @@ switch ($action) {
            }

            $d = ORM::for_table('tbl_appconfig')->where('setting', 'radius_mode')->find_one();
-            if($d){
+            if ($d) {
                $d->value = $radius_mode;
                $d->save();
-            }else{
+            } else {
                $d = ORM::for_table('tbl_appconfig')->create();
                $d->setting = 'radius_mode';
                $d->value = $radius_mode;
@ -436,10 +479,10 @@ switch ($action) {


            $d = ORM::for_table('tbl_appconfig')->where('setting', 'country_code_phone')->find_one();
-            if($d){
+            if ($d) {
                $d->value = $country_code_phone;
                $d->save();
-            }else{
+            } else {
                $d = ORM::for_table('tbl_appconfig')->create();
                $d->setting = 'country_code_phone';
                $d->value = $country_code_phone;
@ -509,9 +552,9 @@ switch ($action) {
            r2(U . "dashboard", 'e', $_L['Do_Not_Access']);
        }
        run_hook('view_notifications'); #HOOK
-        if(file_exists("system/uploads/notifications.json")){
+        if (file_exists("system/uploads/notifications.json")) {
            $ui->assign('_json', json_decode(file_get_contents('system/uploads/notifications.json'), true));
-        }else{
+        } else {
            $ui->assign('_json', json_decode(file_get_contents('system/uploads/notifications.default.json'), true));
        }
        $ui->assign('_default', json_decode(file_get_contents('system/uploads/notifications.default.json'), true));
--- 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['id'], $v1['routers'], $v1['id_plan'], "Activation", "Voucher")) {
                $v1->status = "1";
-                $v1->user = $c['username'];
+                $v1->user = $user['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']);
        }
--- a/system/cron.php
+++ b/system/cron.php
@ -4,10 +4,40 @@
 * PHP Mikrotik Billing (https://github.com/hotspotbilling/phpnuxbill/)
 **/

-require('../config.php');
-require('orm.php');
+// on some server, it getting error because of slash is backwards
+function _autoloader($class)
+{
+    if (strpos($class, '_') !== false) {
+        $class = str_replace('_', DIRECTORY_SEPARATOR, $class);
+        if (file_exists(__DIR__.DIRECTORY_SEPARATOR.'autoload' . DIRECTORY_SEPARATOR . $class . '.php')) {
+            include __DIR__.DIRECTORY_SEPARATOR.'autoload' . DIRECTORY_SEPARATOR . $class . '.php';
+        } else {
+            $class = str_replace("\\", DIRECTORY_SEPARATOR, $class);
+            if (file_exists(__DIR__ . DIRECTORY_SEPARATOR . 'autoload' . DIRECTORY_SEPARATOR . $class . '.php'))
+                include __DIR__ . DIRECTORY_SEPARATOR . 'autoload' . DIRECTORY_SEPARATOR . $class . '.php';
+        }
+    } else {
+        if (file_exists(__DIR__.DIRECTORY_SEPARATOR.'autoload' . DIRECTORY_SEPARATOR . $class . '.php')) {
+            include __DIR__.DIRECTORY_SEPARATOR.'autoload' . DIRECTORY_SEPARATOR . $class . '.php';
+        } else {
+            $class = str_replace("\\", DIRECTORY_SEPARATOR, $class);
+            if (file_exists(__DIR__ . DIRECTORY_SEPARATOR . 'autoload' . DIRECTORY_SEPARATOR . $class . '.php'))
+                include __DIR__ . DIRECTORY_SEPARATOR . 'autoload' . DIRECTORY_SEPARATOR . $class . '.php';
+        }
+    }
+}
+spl_autoload_register('_autoloader');

+
+if(php_sapi_name() !== 'cli'){
+    echo "<pre>";
+}
+
+
+require_once '../config.php';
+require_once 'orm.php';
 require_once 'autoload/PEAR2/Autoload.php';
+include "autoload/Hookers.php";

 ORM::configure("mysql:host=$db_host;dbname=$db_name");
 ORM::configure('username', $db_user);
@ -16,57 +46,38 @@ ORM::configure('return_result_sets', true);
 ORM::configure('logging', true);


-include "autoload/Hookers.php";
-
 // notification message
-if(file_exists("system/uploads/notifications.json")){
-    $_notifmsg =json_decode(file_get_contents('system/uploads/notifications.json'), true);
+if (file_exists("uploads/notifications.json")) {
+    $_notifmsg = json_decode(file_get_contents('uploads/notifications.json'), true);
 }
-$_notifmsg_default = json_decode(file_get_contents('system/uploads/notifications.default.json'), true);
+$_notifmsg_default = json_decode(file_get_contents('uploads/notifications.default.json'), true);

 //register all plugin
-foreach (glob("plugin/*.php") as $filename) {
+foreach (glob(File::pathFixer("plugin/*.php")) as $filename) {
    include $filename;
 }

-// on some server, it getting error because of slash is backwards
-function _autoloader($class)
-{
-    if (strpos($class, '_') !== false) {
-        $class = str_replace('_', DIRECTORY_SEPARATOR, $class);
-        if (file_exists('autoload' . DIRECTORY_SEPARATOR . $class . '.php')) {
-            include 'autoload' . DIRECTORY_SEPARATOR . $class . '.php';
-        } else {
-            $class = str_replace("\\", DIRECTORY_SEPARATOR, $class);
-            if (file_exists(__DIR__ . DIRECTORY_SEPARATOR . 'autoload' . DIRECTORY_SEPARATOR . $class . '.php'))
-                include __DIR__ . DIRECTORY_SEPARATOR . 'autoload' . DIRECTORY_SEPARATOR . $class . '.php';
-        }
-    } else {
-        if (file_exists('autoload' . DIRECTORY_SEPARATOR . $class . '.php')) {
-            include 'autoload' . DIRECTORY_SEPARATOR . $class . '.php';
-        } else {
-            $class = str_replace("\\", DIRECTORY_SEPARATOR, $class);
-            if (file_exists(__DIR__ . DIRECTORY_SEPARATOR . 'autoload' . DIRECTORY_SEPARATOR . $class . '.php'))
-                include __DIR__ . DIRECTORY_SEPARATOR . 'autoload' . DIRECTORY_SEPARATOR . $class . '.php';
-        }
-    }
-}
-
-spl_autoload_register('_autoloader');
-
 $result = ORM::for_table('tbl_appconfig')->find_many();
 foreach ($result as $value) {
    $config[$value['setting']] = $value['value'];
 }

+echo "PHP Time\t" . date('Y-m-d H:i:s') . "\n";
+$res = ORM::raw_execute('SELECT NOW() AS WAKTU;');
+$statement = ORM::get_last_statement();
+$rows = array();
+while ($row = $statement->fetch(PDO::FETCH_ASSOC)) {
+    echo "MYSQL Time\t" . $row['WAKTU'] . "\n";
+}
+
 $_c = $config;

 date_default_timezone_set($config['timezone']);

 $textExpired = Lang::getNotifText('expired');

-$d = ORM::for_table('tbl_user_recharges')->where('status', 'on')->where('expiration', date("Y-m-d"))->find_many();
-echo "Found ".count($d)." user(s)\n";
+$d = ORM::for_table('tbl_user_recharges')->where('status', 'on')->where_lte('expiration', date("Y-m-d"))->find_many();
+echo "Found " . count($d) . " user(s)\n";
 run_hook('cronjob'); #HOOK

 foreach ($d as $ds) {
@ -79,10 +90,15 @@ foreach ($d as $ds) {
            $u = ORM::for_table('tbl_user_recharges')->where('id', $ds['id'])->find_one();
            $c = ORM::for_table('tbl_customers')->where('id', $ds['customer_id'])->find_one();
            $m = ORM::for_table('tbl_routers')->where('name', $ds['routers'])->find_one();
+            $p = ORM::for_table('tbl_plans')->where('id', $u['plan_id'])->find_one();

            if (!$_c['radius_mode']) {
                $client = Mikrotik::getClient($m['ip_address'], $m['username'], $m['password']);
-                Mikrotik::setHotspotLimitUptime($client, $c['username']);
+                if(!empty($p['pool_expired'])){
+                    Mikrotik::setHotspotUserPackage($client, $c['username'], 'EXPIRED NUXBILL '.$p['pool_expired']);
+                }else{
+                    Mikrotik::removeHotspotUser($client, $c['username']);
+                }
                Mikrotik::removeHotspotActiveUser($client, $c['username']);
                Message::sendPackageNotification($c['phonenumber'], $c['fullname'], $u['namebp'], $textExpired, $config['user_notification_expired']);
            }
@ -92,7 +108,6 @@ foreach ($d as $ds) {

            // autorenewal from deposit
            if ($config['enable_balance'] == 'yes' && $c['auto_renewal']) {
-                $p = ORM::for_table('tbl_plans')->where('id', $u['plan_id'])->find_one();
                if ($p && $p['enabled'] && $c['balance'] >= $p['price']) {
                    if (Package::rechargeUser($ds['customer_id'], $p['routers'], $p['id'], 'Customer', 'Balance')) {
                        // if success, then get the balance
@ -106,10 +121,10 @@ foreach ($d as $ds) {
                            "\nRouter: " . $router_name .
                            "\nPrice: " . $p['price']);
                    }
-                }else{
+                } else {
                    echo "no renewall | plan enabled: $p[enabled] | User balance: $c[balance] | price $p[price]\n";
                }
-            }else{
+            } else {
                echo "no renewall | balance $config[enable_balance] auto_renewal $c[auto_renewal]\n";
            }
        } else echo " : ACTIVE \r\n";
@ -122,10 +137,15 @@ foreach ($d as $ds) {
            $u = ORM::for_table('tbl_user_recharges')->where('id', $ds['id'])->find_one();
            $c = ORM::for_table('tbl_customers')->where('id', $ds['customer_id'])->find_one();
            $m = ORM::for_table('tbl_routers')->where('name', $ds['routers'])->find_one();
+            $p = ORM::for_table('tbl_plans')->where('id', $u['plan_id'])->find_one();

            if (!$_c['radius_mode']) {
                $client = Mikrotik::getClient($m['ip_address'], $m['username'], $m['password']);
-                Mikrotik::disablePpoeUser($client, $c['username']);
+                if(!empty($p['pool_expired'])){
+                    Mikrotik::setPpoeUserPlan($client, $c['username'], 'EXPIRED NUXBILL '.$p['pool_expired']);
+                }else{
+                    Mikrotik::removePpoeUser($client, $c['username']);
+                }
                Mikrotik::removePpoeActive($client, $c['username']);
                Message::sendPackageNotification($c['phonenumber'], $c['fullname'], $u['namebp'], $textExpired, $config['user_notification_expired']);
            }
@ -135,12 +155,15 @@ foreach ($d as $ds) {

            // autorenewal from deposit
            if ($config['enable_balance'] == 'yes' && $c['auto_renewal']) {
-                $p = ORM::for_table('tbl_plans')->where('id', $u['plan_id'])->find_one();
                if ($p && $p['enabled'] && $c['balance'] >= $p['price']) {
                    if (Package::rechargeUser($ds['customer_id'], $p['routers'], $p['id'], 'Customer', 'Balance')) {
                        // if success, then get the balance
                        Balance::min($ds['customer_id'], $p['price']);
+                        echo "plan enabled: $p[enabled] | User balance: $c[balance] | price $p[price]\n";
+                        echo "auto renewall Success\n";
                    } else {
+                        echo "plan enabled: $p[enabled] | User balance: $c[balance] | price $p[price]\n";
+                        echo "auto renewall Failed\n";
                        Message::sendTelegram("FAILED RENEWAL #cron\n\n#u$c[username] #buy #PPPOE \n" . $p['name_plan'] .
                            "\nRouter: " . $router_name .
                            "\nPrice: " . $p['price']);
--- a/system/cron_reminder.php
+++ b/system/cron_reminder.php
@ -7,46 +7,21 @@
 * 0 7 * * * /usr/bin/php /var/www/system/cron_reminder.php
 **/

-require('../config.php');
-require('orm.php');
-
-require_once 'autoload/PEAR2/Autoload.php';
-
-ORM::configure("mysql:host=$db_host;dbname=$db_name");
-ORM::configure('username', $db_user);
-ORM::configure('password', $db_password);
-ORM::configure('return_result_sets', true);
-ORM::configure('logging', true);
-
-
-include "autoload/Hookers.php";
-
-// notification message
-if(file_exists("system/uploads/notifications.json")){
-    $_notifmsg =json_decode(file_get_contents('system/uploads/notifications.json'), true);
-}
-$_notifmsg_default = json_decode(file_get_contents('system/uploads/notifications.default.json'), true);
-
-//register all plugin
-foreach (glob("plugin/*.php") as $filename) {
-    include $filename;
-}
-
 // on some server, it getting error because of slash is backwards
 function _autoloader($class)
 {
    if (strpos($class, '_') !== false) {
        $class = str_replace('_', DIRECTORY_SEPARATOR, $class);
-        if (file_exists('autoload' . DIRECTORY_SEPARATOR . $class . '.php')) {
-            include 'autoload' . DIRECTORY_SEPARATOR . $class . '.php';
+        if (file_exists(__DIR__ . DIRECTORY_SEPARATOR . 'autoload' . DIRECTORY_SEPARATOR . $class . '.php')) {
+            include __DIR__ . DIRECTORY_SEPARATOR . 'autoload' . DIRECTORY_SEPARATOR . $class . '.php';
        } else {
            $class = str_replace("\\", DIRECTORY_SEPARATOR, $class);
            if (file_exists(__DIR__ . DIRECTORY_SEPARATOR . 'autoload' . DIRECTORY_SEPARATOR . $class . '.php'))
                include __DIR__ . DIRECTORY_SEPARATOR . 'autoload' . DIRECTORY_SEPARATOR . $class . '.php';
        }
    } else {
-        if (file_exists('autoload' . DIRECTORY_SEPARATOR . $class . '.php')) {
-            include 'autoload' . DIRECTORY_SEPARATOR . $class . '.php';
+        if (file_exists(__DIR__ . DIRECTORY_SEPARATOR . 'autoload' . DIRECTORY_SEPARATOR . $class . '.php')) {
+            include __DIR__ . DIRECTORY_SEPARATOR . 'autoload' . DIRECTORY_SEPARATOR . $class . '.php';
        } else {
            $class = str_replace("\\", DIRECTORY_SEPARATOR, $class);
            if (file_exists(__DIR__ . DIRECTORY_SEPARATOR . 'autoload' . DIRECTORY_SEPARATOR . $class . '.php'))
@ -54,9 +29,34 @@ function _autoloader($class)
        }
    }
 }
-
 spl_autoload_register('_autoloader');

+if(php_sapi_name() !== 'cli'){
+    echo "<pre>";
+}
+
+require_once '../config.php';
+require_once 'orm.php';
+require_once 'autoload/PEAR2/Autoload.php';
+include "autoload/Hookers.php";
+
+ORM::configure("mysql:host=$db_host;dbname=$db_name");
+ORM::configure('username', $db_user);
+ORM::configure('password', $db_password);
+ORM::configure('return_result_sets', true);
+ORM::configure('logging', true);
+
+// notification message
+if (file_exists("uploads/notifications.json")) {
+    $_notifmsg = json_decode(file_get_contents('uploads/notifications.json'), true);
+}
+$_notifmsg_default = json_decode(file_get_contents('uploads/notifications.default.json'), true);
+
+//register all plugin
+foreach (glob(File::pathFixer("plugin/*.php")) as $filename) {
+    include $filename;
+}
+
 $result = ORM::for_table('tbl_appconfig')->find_many();
 foreach ($result as $value) {
    $config[$value['setting']] = $value['value'];
@ -69,6 +69,14 @@ $d = ORM::for_table('tbl_user_recharges')->where('status', 'on')->find_many();
 run_hook('cronjob_reminder'); #HOOK


+echo "PHP Time\t" . date('Y-m-d H:i:s') . "\n";
+$res = ORM::raw_execute('SELECT NOW() AS WAKTU;');
+$statement = ORM::get_last_statement();
+$rows = array();
+while ($row = $statement->fetch(PDO::FETCH_ASSOC)) {
+    echo "MYSQL Time\t" . $row['WAKTU'] . "\n";
+}
+

 $day7 = date('Y-m-d', strtotime("+7 day"));
 $day3 = date('Y-m-d', strtotime("+3 day"));
--- a/system/lan/english/common.lan.php
+++ b/system/lan/english/common.lan.php
@ -252,8 +252,8 @@ $_L['Community'] = 'Community';
 $_L['1_user_can_be_used_for_many_devices'] = '1 user can be used for many devices?';
 $_L['Cannot_be_change_after_saved'] = 'Cannot be change after saved';

-$_L['Explain_Coverage_of_router'] = 'Jelaskan Cakupan wilayah hotspot';
-$_L['Name_of_Area_that_router_operated'] = 'Nama Lokasi/Wilayah Router beroperasi';
+$_L['Explain_Coverage_of_router'] = 'Explain Coverage of router';
+$_L['Name_of_Area_that_router_operated'] = 'Name of Area that router operated';
 $_L['Payment_Notification_URL_Recurring_Notification_URL_Pay_Account_Notification_URL'] = 'Payment Notification URL, Recurring Notification URL, Pay Account Notification URL';
 $_L['Finish_Redirect_URL_Unfinish_Redirect_URL_Error_Redirect_URL'] = 'Finish Redirect URL, Unfinish Redirect URL, Error Redirect URL';
 $_L['Status'] = 'Status';
@ -310,7 +310,6 @@ $_L['Please_enter_your_email_address'] = 'Please enter your email address';
 $_L['Failed_to_create_Paypal_transaction'] = 'Failed to create Paypal transaction.';
 $_L['Plugin'] = 'Plugin';
 $_L['Plugin_Manager'] = 'Plugin Manager';
-$_L['Plugin_Manager'] = 'Plugin Manager';
 $_L['User_Notification'] = 'User Notification';
 $_L['Expired_Notification'] = 'Expired Notification';
 $_L['User_will_get_notification_when_package_expired'] = 'User will get notification when package expired';
@ -375,12 +374,32 @@ $_L['Active'] = 'Active';
 $_L['Transfer_Balance'] = 'Transfer Balance';
 $_L['Send_your_balance'] = 'Send your balance?';
 $_L['Send'] = 'Send';
-$_L['Cannot_send_to_yourself'] = 'Cannot send to yourself';
-$_L['Sending_balance_success'] = 'Sending balance success';
-$_L['From'] = 'From';
-$_L['To'] = 'To';
-$_L['insufficient_balance'] = 'insufficient balance';
-$_L['Send_Balance'] = 'Send Balance';
-$_L['Received_Balance'] = 'Received Balance';
-$_L['Minimum_Balance_Transfer'] = 'Minimum Balance Transfer';
-$_L['Minimum_Transfer'] = 'Minimum Transfer';
+$_L['Cannot_send_to_yourself'] = 'Cannot send to yourself';
+$_L['Sending_balance_success'] = 'Sending balance success';
+$_L['From'] = 'From';
+$_L['To'] = 'To';
+$_L['insufficient_balance'] = 'insufficient balance';
+$_L['Send_Balance'] = 'Send Balance';
+$_L['Received_Balance'] = 'Received Balance';
+$_L['Minimum_Balance_Transfer'] = 'Minimum Balance Transfer';
+$_L['Minimum_Transfer'] = 'Minimum Transfer';
+$_L['Company_Logo'] = 'Company Logo';
+$_L['Expired_IP_Pool'] = 'Expired IP Pool';
+$_L['Proxy'] = 'Proxy';
+$_L['Proxy_Server'] = 'Proxy Server';
+$_L['Proxy_Server_Login'] = 'Proxy Server Login';
+$_L['Hotspot_Plan'] = 'Hotspot Plan';
+$_L['PPPOE_Plan'] = 'PPPOE Plan';
+$_L['UNKNOWN'] = 'UNKNOWN';
+$_L['Are_You_Sure'] = 'Are You Sure?';
+$_L['Success_to_send_package'] = 'Success to send package';
+$_L['Target_has_active_plan_different_with_current_plant'] = 'Target has active plan, different with current plant.';
+$_L['Recharge_a_friend'] = 'Recharge a friend';
+$_L['Buy_for_friend'] = 'Buy for friend';
+$_L['Buy_this_for_friend_account'] = 'Buy this for friend account?';
+$_L['Review_package_before_recharge'] = 'Review package before recharge';
+$_L['Activate'] = 'Activate';
+$_L['Deactivate'] = 'Deactivate';
+$_L['Sync'] = 'Sync';
+$_L['Failed_to_create_PaymeTrust_transaction'] = 'Failed to create PaymeTrust transaction.';
+$_L['Location'] = 'Location';
--- a/system/lan/indonesia/common.lan.php
+++ b/system/lan/indonesia/common.lan.php
@ -338,3 +338,11 @@ $_L['Country_Code_Phone'] = 'Kode Negara Telepon';
 $_L['Voucher_activation_menu_will_be_hidden'] = 'Info Pembelian Voucher dan Redeem akan disembunyikan';
 $_L['Customer_can_deposit_money_to_buy_voucher'] = 'Pelanggan dapat topup saldo untuk langganan Internet';
 $_L['Allow_balance_transfer_between_customers'] = 'Bolehkan transfer saldo antar pelanggan';
+$_L['Refill_Balance'] = 'Refill Balance';
+$_L['Balance_Plans'] = 'Balance Plans';
+$_L['Expired_IP_Pool'] = 'Expired IP Pool';
+$_L['Company_Logo'] = 'Company Logo';
+$_L['Disable_Voucher'] = 'Disable Voucher';
+$_L['Minimum_Balance_Transfer'] = 'Minimum Balance Transfer';
+$_L['Reminder_Notification'] = 'Reminder Notification';
+$_L['Invoice_Footer'] = 'Invoice Footer';
--- a/system/lan/spanish/common.lan.php
+++ b/system/lan/spanish/common.lan.php
@ -340,4 +340,5 @@ $_L['Invoice'] = 'Invoice';
 $_L['Country_Code_Phone'] = 'Country Code Phone';
 $_L['Voucher_activation_menu_will_be_hidden'] = 'Voucher activation menu will be hidden';
 $_L['Customer_can_deposit_money_to_buy_voucher'] = 'Customer can deposit money to buy voucher';
-$_L['Allow_balance_transfer_between_customers'] = 'Allow balance transfer between customers';
+$_L['Allow_balance_transfer_between_customers'] = 'Allow balance transfer between customers';$_L['Refill_Balance'] = 'Refill Balance';
+$_L['Balance_Plans'] = 'Balance Plans';
--- a/system/radius.php
+++ b/system/radius.php
@ -7,11 +7,12 @@ if(php_sapi_name() !== 'cli'){
    die("RUN ON COMMAND LINE ONLY BY RADIUS ENGINE");
 }

-require(__DIR__.'/../config.php');
-require(__DIR__.'/orm.php');
+require_once __DIR__.File::pathFixer('/../config.php');
+require_once __DIR__.File::pathFixer('orm.php');
+require_once __DIR__.File::pathFixer('/autoload/PEAR2/Autoload.php');
+include __DIR__.File::pathFixer("/autoload/Hookers.php");

 use PEAR2\Net\RouterOS;
-require_once 'autoload/PEAR2/Autoload.php';

 ORM::configure("mysql:host=$db_host;dbname=$db_name");
 ORM::configure('username', $db_user);
--- a/system/updates.json
+++ b/system/updates.json
@ -13,5 +13,13 @@
    ],
    "2023.8.23" : [
        "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` 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`;"
+    ],
+    "2023.9.5" : [
+        "DROP TABLE `tbl_language`;",
+        "ALTER TABLE `tbl_plans` ADD `pool_expired`  varchar(40) NOT NULL DEFAULT '' AFTER `pool`;"
    ]
 }
--- a/ui/ui/app-localisation.tpl
+++ b/ui/ui/app-localisation.tpl
@ -45,18 +45,16 @@
                    </div>
                    <div class="form-group">
                        <label class="col-md-2 control-label">{$_L['Default_Language']}</label>
-                        <div class="col-md-4">
+                        <div class="col-md-6">
                            <select class="form-control" name="lan" id="lan">
                                {foreach $lan as $lans}
-                                    <option value="{$lans['folder']}" {if $_c['language'] eq $lans['folder']}
-                                        selected="selected" {/if}>{$lans['name']}</option>
+                                    <option value="{$lans}" {if $_c['language'] eq $lans}
+                                        selected="selected" {/if}>{$lans}</option>
                                {/foreach}
                            </select>
                        </div>
-                        <div class="col-md-2">
-                            <a href="{$_url}settings/language" type="button"
-                                class="btn btn-line-success btn-icon-inline"><i
-                                    class="ion ion-android-add"></i>{$_L['Add_Language']}</a>
+                        <div class="col-md-4 help-block">
+                            To add new Language, just add the folder, it will automatically detected
                        </div>
                    </div>
                    <div class="form-group">
@ -78,8 +76,8 @@
                        <div class="col-md-6">
                            <input type="text" class="form-control" id="currency_code" name="currency_code"
                                value="{$_c['currency_code']}">
-                            <span class="help-block">{$_L['currency_help']}</span>
                        </div>
+                        <span class="help-block col-md-4">{$_L['currency_help']}</span>
                    </div>
                    <div class="form-group">
                        <label class="col-md-2 control-label">{Lang::T('Country Code Phone')}</label>
--- a/ui/ui/app-notifications.tpl
+++ b/ui/ui/app-notifications.tpl
@ -80,6 +80,7 @@
                            <b>[[type]]</b> is Hotspot/PPPOE.<br>
                            <b>[[plan_name]]</b> Internet Package.<br>
                            <b>[[plan_price]]</b> Internet Package Prices.<br>
+                            <b>[[name]]</b> Receiver name.<br>
                            <b>[[user_name]]</b> Username internet.<br>
                            <b>[[user_password]]</b> User password.<br>
                            <b>[[expired_date]]</b> Expired datetime.<br>
@ -106,9 +107,12 @@
                            <b>[[type]]</b> is Hotspot/PPPOE.<br>
                            <b>[[plan_name]]</b> Internet Package.<br>
                            <b>[[plan_price]]</b> Internet Package Prices.<br>
+                            <b>[[name]]</b> Receiver name.<br>
                            <b>[[user_name]]</b> Username internet.<br>
                            <b>[[user_password]]</b> User password.<br>
                            <b>[[trx_date]]</b> Transaction datetime.<br>
+                            <b>[[balance_before]]</b> Balance Before.<br>
+                            <b>[[balance]]</b> Balance After.<br>
                            <b>[[footer]]</b> Invoice Footer.
                        </p>
                    </div>
@ -122,7 +126,8 @@
                        </div>
                        <p class="col-md-4 help-block">
                            <b>[[name]]</b> Receiver name.<br>
-                            <b>[[balance]]</b> how much balance have been send.
+                            <b>[[balance]]</b> how much balance have been send.<br>
+                            <b>[[current_balance]]</b> Current Balance.
                        </p>
                    </div>
                </div>
@ -135,7 +140,8 @@
                        </div>
                        <p class="col-md-4 help-block">
                            <b>[[name]]</b> Sender name.<br>
-                            <b>[[balance]]</b> how much balance have been received.
+                            <b>[[balance]]</b> how much balance have been received.<br>
+                            <b>[[current_balance]]</b> Current Balance.
                        </p>
                    </div>
                </div>
--- a/ui/ui/app-settings.tpl
+++ b/ui/ui/app-settings.tpl
@ -1,6 +1,6 @@
 {include file="sections/header.tpl"}

-<form class="form-horizontal" method="post" role="form" action="{$_url}settings/app-post">
+<form class="form-horizontal" method="post" role="form" action="{$_url}settings/app-post" enctype="multipart/form-data">
    <div class="row">
        <div class="col-sm-12 col-md-12">
            <div class="panel panel-primary panel-hovered panel-stacked mb30">
@ -17,10 +17,20 @@
                        <div class="col-md-6">
                            <input type="text" required class="form-control" id="company" name="company"
                                value="{$_c['CompanyName']}">
-
                        </div>
                        <span class="help-block col-md-4">{$_L['App_Name_Help_Text']}</span>
                    </div>
+                    <div class="form-group">
+                        <label class="col-md-2 control-label">{Lang::T('Company Logo')}</label>
+                        <div class="col-md-6">
+                            <input type="file" class="form-control" id="logo" name="logo" accept="image/*">
+                            <span class="help-block">For PDF Reports | Best size 1078 x 200 | uploaded image will be
+                                autosize</span>
+                        </div>
+                        <span class="help-block col-md-4">
+                            <a href="./{$logo}" target="_blank"><img src="./{$logo}" height="48" alt="logo for PDF"></a>
+                        </span>
+                    </div>
                    <div class="form-group">
                        <label class="col-md-2 control-label">{Lang::T('Company Footer')}</label>
                        <div class="col-md-6">
@ -126,7 +136,8 @@
                    <div class="form-group">
                        <label class="col-md-2 control-label">Telegram Bot Token</label>
                        <div class="col-md-6">
-                            <input type="text" class="form-control" id="telegram_bot" name="telegram_bot"
+                            <input type="password" class="form-control" id="telegram_bot" name="telegram_bot" onmouseleave="this.type = 'password'"
+                            onmouseenter="this.type = 'text'"
                                value="{$_c['telegram_bot']}" placeholder="123456:asdasgdkuasghddlashdashldhalskdklasd">
                        </div>
                    </div>
@ -261,7 +272,6 @@
                    </div>
                    {Lang::T('Invoice')}
                </div>
-                <div class="panel-heading"></div>
                <div class="panel-body">
                    <div class="form-group">
                        <label class="col-md-2 control-label">{Lang::T('Invoice Footer')}</label>
@ -272,6 +282,30 @@
                        </div>
                    </div>
                </div>
+                <div class="panel-heading">
+                    <div class="btn-group pull-right">
+                        <button class="btn btn-primary btn-xs" title="save" type="submit"><span
+                                class="glyphicon glyphicon-floppy-disk" aria-hidden="true"></span></button>
+                    </div>
+                    {Lang::T('Proxy')}
+                </div>
+                <div class="panel-body">
+                    <div class="form-group">
+                        <label class="col-md-2 control-label">{Lang::T('Proxy Server')}</label>
+                        <div class="col-md-6">
+                            <input type="text" class="form-control" id="http_proxy" name="http_proxy"
+                                value="{$_c['http_proxy']}" placeholder="127.0.0.1:3128">
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-md-2 control-label">{Lang::T('Proxy Server Login')}</label>
+                        <div class="col-md-6">
+                            <input type="password" class="form-control" id="http_proxyauth" name="http_proxyauth" autocomplete="off"
+                                value="{$_c['http_proxyauth']}" placeholder="username:password" onmouseleave="this.type = 'password'"
+                                onmouseenter="this.type = 'text'">
+                        </div>
+                    </div>
+                </div>
            </div>

            <div class="panel-body">
--- a/ui/ui/autoload-pool.tpl
+++ b/ui/ui/autoload-pool.tpl
@ -1,4 +1,4 @@
-
+<option value=''>{$_L['Select_Pool']}</option>
 {foreach $d as $ds}
 	<option value="{$ds['pool_name']}">{$ds['pool_name']}</option>
 {/foreach}
--- a/ui/ui/autoload-server.tpl
+++ b/ui/ui/autoload-server.tpl
@ -1,4 +1,4 @@
-<option value="">Select Routers</option>
+<option value=''>{$_L['Select_Routers']}</option>
 {foreach $d as $ds}
 	<option value="{$ds['name']}">{$ds['name']}</option>
 {/foreach}
--- a/ui/ui/autoload.tpl
+++ b/ui/ui/autoload.tpl
@ -1,4 +1,4 @@
 <option value="">Select Plans</option>
 {foreach $d as $ds}
-	<option value="{$ds['id']}">{$ds['name_plan']}</option>
+	<option value="{$ds['id']}">{$ds['name_plan']} &bull; {Lang::moneyFormat($ds['price'])}</option>
 {/foreach}
--- a/ui/ui/community.tpl
+++ b/ui/ui/community.tpl
@ -130,7 +130,7 @@
            </div>
        </div>
    </div>
-    <div class="col-sm-6">
+    <div class="col-sm-6" id="update">
        <div class="box box-primary box-hovered mb20 activities">
            <div class="box-header">
                <h3 class="box-title">PHPNUXBILL</h3>
@ -142,8 +142,7 @@
            <div class="box-footer" id="latestVersion">ver</div>
            <div class="box-footer">
                <div class="btn-group btn-group-justified" role="group" aria-label="...">
-                    <a href="./update.php" target="_blank" class="btn btn-success btn-sm btn-block">Install Latest
-                        Version</a>
+                    <a href="./update.php" class="btn btn-success btn-sm btn-block">Install Latest Version</a>
                    <a href="https://github.com/hotspotbilling/phpnuxbill/archive/refs/heads/master.zip" target="_blank"
                        class="btn btn-warning btn-sm btn-block">Download Latest Version</a>
                </div>
--- a/ui/ui/customers-view.tpl
+++ b/ui/ui/customers-view.tpl
@ -24,14 +24,17 @@
                <p class="text-muted">{Lang::nl2br($d['address'])}</p>
                <ul class="list-group list-group-unbordered">
                    <li class="list-group-item">
-                        <b>{$_L['Password']}</b> <span class="pull-right" style="background-color: black; color:black;"
-                            onclick="this.select()">{$d['password']}</span>
+                        <b>{$_L['Password']}</b> <input type="password" value="{$d['password']}"
+                            style=" border: 0px; text-align: right;" class="pull-right"
+                            onmouseleave="this.type = 'password'" onmouseenter="this.type = 'text'"
+                            onclick="this.select()">
                    </li>
                    {if $d['pppoe_password'] != ''}
                        <li class="list-group-item">
-                            <b>PPPOE {$_L['Password']}</b> <span class="pull-right"
-                                style="background-color: black; color:black;"
-                                onclick="this.select()">{$d['pppoe_password']}</span>
+                            <b>PPPOE {$_L['Password']}</b> <input type="password" value="{$d['pppoe_password']}"
+                            style=" border: 0px; text-align: right;" class="pull-right"
+                            onmouseleave="this.type = 'password'" onmouseenter="this.type = 'text'"
+                            onclick="this.select()">
                        </li>
                    {/if}
                    <li class="list-group-item">
@ -73,18 +76,39 @@
                                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
-                                class="pull-right">{Lang::dateTimeFormat($package['expiration']+' '+$package['time'])}</span>
+                                class="pull-right">{Lang::dateAndTimeFormat($package['expiration'], $package['time'])}</span>
                        </li>
                        <li class="list-group-item">
                            {$package['routers']} <span class="pull-right">{$package['method']}</span>
                        </li>
                    </ul>
+                    <div class="row">
+                        <div class="col-xs-4">
+                            <a href="{$_url}customers/deactivate/{$d['id']}" id="{$d['id']}"
+                                class="btn btn-danger btn-block btn-sm"
+                                onclick="return confirm('This will deactivate Customer Plan, and make it expired')">{Lang::T('Deactivate')}</a>
+                        </div>
+                        <div class="col-xs-4">
+                            <a href="{$_url}customers/recharge/{$d['id']}"
+                                onclick="return confirm('This will extend Customer plan, same as recharge')"
+                                class="btn btn-success btn-sm btn-block">{Lang::T('Recharge')}</a>
+                        </div>
+                        <div class="col-xs-4">
+                            <a href="{$_url}customers/sync/{$d['id']}"
+                                onclick="return confirm('This will sync Customer to Mikrotik?')"
+                                class="btn btn-primary btn-sm btn-block">{Lang::T('Sync')}</a>
+                        </div>
+                    </div>
                </div>
            </div>
+        {else}
+            <a href="{$_url}prepaid/recharge/{$d['id']}"
+                class="btn btn-success btn-sm btn-block mt-1">{Lang::T('Recharge')}</a><br>
        {/if}
        <a href="{$_url}customers/list" class="btn btn-primary btn-sm btn-block mt-1">{Lang::T('Back')}</a><br>
    </div>
@ -116,9 +140,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 +170,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']}
--- a/ui/ui/customers.tpl
+++ b/ui/ui/customers.tpl
@ -24,34 +24,37 @@
                    </div>&nbsp;
                </div>
                <div class="table-responsive">
-                    <table class="table table-bordered table-striped">
+                    <table class="table table-bordered table-striped table-condensed">
                        <thead>
                            <tr>
-                                <th>{$_L['Manage']}</th>
                                <th>{$_L['Username']}</th>
                                <th>{$_L['Full_Name']}</th>
                                <th>{Lang::T('Balance')}</th>
                                <th>{$_L['Phone_Number']}</th>
                                <th>{$_L['Email']}</th>
+                                <th>{$_L['Package']}</th>
                                <th>{$_L['Created_On']}</th>
-                                <th>{$_L['Recharge']}</th>
+                                <th>{$_L['Manage']}</th>
                            </tr>
                        </thead>
                        <tbody>
                            {foreach $d as $ds}
                                <tr>
-                                    <td align="center">
-                                        <a href="{$_url}customers/view/{$ds['id']}" id="{$ds['id']}"
-                                            class="btn btn-success btn-sm">{Lang::T('View')}</a>
-                                    </td>
-                                    <td>{$ds['username']}</td>
-                                    <td>{$ds['fullname']}</td>
+                                    <td onclick="window.location.href = '{$_url}customers/view/{$ds['id']}'" style="cursor:pointer;">{$ds['username']}</td>
+                                    <td onclick="window.location.href = '{$_url}customers/view/{$ds['id']}'" style="cursor: pointer;">{$ds['fullname']}</td>
                                    <td>{Lang::moneyFormat($ds['balance'])}</td>
                                    <td>{$ds['phonenumber']}</td>
                                    <td>{$ds['email']}</td>
+                                    <td align="center" api-get-text="{$_url}autoload/customer_is_active/{$ds['id']}">
+                                        <span class="label label-default">&bull;</span>
+                                    </td>
                                    <td>{Lang::dateTimeFormat($ds['created_at'])}</td>
-                                    <td align="center"><a href="{$_url}prepaid/recharge-user/{$ds['id']}" id="{$ds['id']}"
-                                            class="btn btn-primary btn-sm">{$_L['Recharge']}</a></td>
+                                    <td align="center">
+                                            <a href="{$_url}customers/view/{$ds['id']}" id="{$ds['id']}" style="margin: 0px;"
+                                                class="btn btn-success btn-xs">&nbsp;&nbsp;{Lang::T('View')}&nbsp;&nbsp;</a>
+                                            <a href="{$_url}prepaid/recharge/{$ds['id']}" id="{$ds['id']}" style="margin: 0px;"
+                                                class="btn btn-primary btn-xs">{$_L['Recharge']}</a>
+                                    </td>
                                </tr>
                            {/foreach}
                        </tbody>
--- a/ui/ui/dashboard.tpl
+++ b/ui/ui/dashboard.tpl
@ -33,7 +33,7 @@
    <div class="col-lg-3 col-xs-6">
        <div class="small-box bg-yellow">
            <div class="inner">
-                <h4>{$u_act}</h4>
+                <h4>{$u_act}/{$u_all}</h4>

                <p>{$_L['Users_Active']}</p>
            </div>
@ -47,7 +47,7 @@
    <div class="col-lg-3 col-xs-6">
        <div class="small-box bg-red">
            <div class="inner">
-                <h4>{$u_all}</h4>
+                <h4>{$c_all}</h4>

                <p>{$_L['Total_Users']}</p>
            </div>
@ -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>
--- a/ui/ui/hotspot-add.tpl
+++ b/ui/ui/hotspot-add.tpl
@ -112,7 +112,8 @@
                            <div class="form-group">
                                <label class="col-md-2 control-label"><a href="{$_url}routers/add">{$_L['Router_Name']}</a></label>
                                <div class="col-md-6">
-                                    <select id="routers" name="routers" class="form-control select2">
+                                    <select id="routers" name="routers" required class="form-control select2">
+                                        <option value=''>{$_L['Select_Routers']}</option>
                                        {foreach $r as $rs}
                                            <option value="{$rs['name']}">{$rs['name']}</option>
                                        {/foreach}
@ -120,9 +121,16 @@
                                        <p class="help-block">{Lang::T('Cannot be change after saved')}</p>
                                </div>
                            </div>
-
+							<div class="form-group">
+								<label class="col-md-2 control-label"><a href="{$_url}pool/add">{Lang::T('Expired IP Pool')}</a></label>
+								<div class="col-md-6">
+									<select id="pool_expired" name="pool_expired" class="form-control select2">
+										<option value=''>{$_L['Select_Pool']}</option>
+									</select>
+								</div>
+							</div>
                            <div class="form-group">
-                                <div class="col-lg-offset-2 col-lg-10">
+                                <div class="col-md-offset-2 col-md-10">
                                    <button class="btn btn-success waves-effect waves-light" type="submit">{$_L['Save']}</button>
                                    Or <a href="{$_url}services/hotspot">{$_L['Cancel']}</a>
                                </div>
--- a/ui/ui/hotspot-edit.tpl
+++ b/ui/ui/hotspot-edit.tpl
@ -114,9 +114,20 @@
 									<input type="text" class="form-control" id="routers" name="routers" value="{$d['routers']}" readonly>
 								</div>
 							</div>
+							<div class="form-group">
+								<label class="col-md-2 control-label"><a href="{$_url}pool/add">{Lang::T('Expired IP Pool')}</a></label>
+								<div class="col-md-6">
+									<select id="pool_expired" name="pool_expired" class="form-control select2">
+                                        <option value=''>{$_L['Select_Pool']}</option>
+                                        {foreach $p as $ps}
+                                            <option value="{$ps['pool_name']}" {if $d['pool_expired'] eq $ps['pool_name']} selected {/if}>{$ps['pool_name']}</option>
+                                        {/foreach}
+									</select>
+								</div>
+							</div>

 							<div class="form-group">
-								<div class="col-lg-offset-2 col-lg-10">
+								<div class="col-md-offset-2 col-md-10">
 									<button class="btn btn-success waves-effect waves-light" type="submit">{$_L['Save']}</button>
 									Or <a href="{$_url}services/hotspot">{$_L['Cancel']}</a>
 								</div>
--- a/ui/ui/hotspot.tpl
+++ b/ui/ui/hotspot.tpl
@ -1,68 +1,81 @@
 {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['Hotspot_Plans']}</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}services/hotspot/">
-											<div class="input-group">
-												<div class="input-group-addon">
-													<span class="fa fa-search"></span>
-												</div>
-												<input type="text" name="name" class="form-control" placeholder="{$_L['Search_by_Name']}...">
-												<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}services/add" class="btn btn-primary btn-block waves-effect"><i class="ion ion-android-add"> </i> {$_L['New_Plan']}</a>
-										</div>&nbsp;
-									</div>
-                                    <div class="table-responsive">
-                                        <table class="table table-bordered table-striped table-condensed">
-                                            <thead>
-                                                <tr>
-                                                    <th>{$_L['Plan_Name']}</th>
-                                                    <th>{$_L['Plan_Type']}</th>
-                                                    <th>{$_L['Bandwidth_Plans']}</th>
-                                                    <th>{$_L['Plan_Price']}</th>
-                                                    <th>{$_L['Time_Limit']}</th>
-                                                    <th>{$_L['Data_Limit']}</th>
-                                                    <th>{$_L['Plan_Validity']}</th>
-                                                    <th>{$_L['Routers']}</th>
-                                                    <th>{$_L['Manage']}</th>
-                                                </tr>
-                                            </thead>
-                                            <tbody>
-                                            {foreach $d as $ds}
-                                                <tr {if $ds['enabled'] != 1}class="danger" title="disabled"{/if}>
-                                                    <td>{$ds['name_plan']}</td>
-                                                    <td>{$ds['typebp']}</td>
-                                                    <td>{$ds['name_bw']}</td>
-                                                    <td>{Lang::moneyFormat($ds['price'])}</td>
-                                                    <td>{$ds['time_limit']} {$ds['time_unit']}</td>
-                                                    <td>{$ds['data_limit']} {$ds['data_unit']}</td>
-                                                    <td>{$ds['validity']} {$ds['validity_unit']}</td>
-                                                    <td>{$ds['routers']}</td>
-                                                    <td>
-                                                        <a href="{$_url}services/edit/{$ds['id']}" class="btn btn-info btn-xs">{$_L['Edit']}</a>
-                                                        <a href="{$_url}services/delete/{$ds['id']}" id="{$ds['id']}" onclick="return confirm('{$_L['Delete']}?')" class="btn btn-danger btn-xs">{$_L['Delete']}</a>
-                                                    </td>
-                                                </tr>
-                                            {/foreach}
-                                            </tbody>
-                                        </table>
-                                    </div>
-                                    {$paginator['contents']}
+<div class="row">
+    <div class="col-sm-12">
+        <div class="panel panel-hovered mb20 panel-primary">
+            <div class="panel-heading">
+                <div class="btn-group pull-right">
+                    <a class="btn btn-primary btn-xs" title="save" href="{$_url}services/sync/hotspot"
+                        onclick="return confirm('This will sync/send hotspot plan to Mikrotik?')"><span
+                            class="glyphicon glyphicon-refresh" aria-hidden="true"></span> sync</a>
+                </div>{$_L['Hotspot_Plans']}
+            </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}services/hotspot/">
+                            <div class="input-group">
+                                <div class="input-group-addon">
+                                    <span class="fa fa-search"></span>
+                                </div>
+                                <input type="text" name="name" class="form-control"
+                                    placeholder="{$_L['Search_by_Name']}...">
+                                <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}services/add" class="btn btn-primary btn-block waves-effect"><i
+                                class="ion ion-android-add"> </i> {$_L['New_Plan']}</a>
+                    </div>&nbsp;
+                </div>
+                <div class="table-responsive">
+                    <table class="table table-bordered table-striped table-condensed">
+                        <thead>
+                            <tr>
+                                <th>{$_L['Plan_Name']}</th>
+                                <th>{$_L['Plan_Type']}</th>
+                                <th>{$_L['Bandwidth_Plans']}</th>
+                                <th>{$_L['Plan_Price']}</th>
+                                <th>{$_L['Time_Limit']}</th>
+                                <th>{$_L['Data_Limit']}</th>
+                                <th>{$_L['Plan_Validity']}</th>
+                                <th>{$_L['Routers']}</th>
+                                <th>{Lang::T('Expired IP Pool')}</th>
+                                <th>{$_L['Manage']}</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            {foreach $d as $ds}
+                                <tr {if $ds['enabled'] != 1}class="danger" title="disabled" {/if}>
+                                    <td>{$ds['name_plan']}</td>
+                                    <td>{$ds['typebp']}</td>
+                                    <td>{$ds['name_bw']}</td>
+                                    <td>{Lang::moneyFormat($ds['price'])}</td>
+                                    <td>{$ds['time_limit']} {$ds['time_unit']}</td>
+                                    <td>{$ds['data_limit']} {$ds['data_unit']}</td>
+                                    <td>{$ds['validity']} {$ds['validity_unit']}</td>
+                                    <td>{$ds['routers']}</td>
+                                    <td>{$ds['pool_expired']}</td>
+                                    <td>
+                                        <a href="{$_url}services/edit/{$ds['id']}"
+                                            class="btn btn-info btn-xs">{$_L['Edit']}</a>
+                                        <a href="{$_url}services/delete/{$ds['id']}" id="{$ds['id']}"
+                                            onclick="return confirm('{$_L['Delete']}?')"
+                                            class="btn btn-danger btn-xs">{$_L['Delete']}</a>
+                                    </td>
+                                </tr>
+                            {/foreach}
+                        </tbody>
+                    </table>
+                </div>
+                {$paginator['contents']}

-								</div>
-							</div>
-						</div>
-					</div>
+            </div>
+        </div>
+    </div>
+</div>

-{include file="sections/footer.tpl"}
+{include file="sections/footer.tpl"}
--- a/ui/ui/images/error.png
+++ b/ui/ui/images/error.png
--- a/ui/ui/images/loading.gif
+++ b/ui/ui/images/loading.gif
--- a/ui/ui/invoice-print.tpl
+++ b/ui/ui/invoice-print.tpl
@ -33,15 +33,14 @@
                            ============================================<br>
                            {$_L['Type']} : <b>{$d['type']}</b><br>
                            {$_L['Plan_Name']} : <b>{$d['plan_name']}</b><br>
-                            {$_L['Plan_Price']} : <b>{Lang::moneyFormat($in['price'])}</b><br>
+                            {$_L['Plan_Price']} : <b>{Lang::moneyFormat($d['price'])}</b><br>
                            <br>
                            {$_L['Username']} : <b>{$d['username']}</b><br>
                            {$_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>
--- 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>
--- a/ui/ui/page-edit.tpl
+++ b/ui/ui/page-edit.tpl
@ -2,7 +2,7 @@
 <div class="row">
    <div class="col-sm-12">
        <div class="panel mb20 panel-primary panel-hovered">
-            <div class="panel-heading">{$_L[$pageHeader]}</div>
+            <div class="panel-heading">{$pageHeader}</div>
                <div id="myNicPanel" style="width: 100%;"></div>
                <div id="panel-edit" class="panel-body">{$htmls}</div>
            {if $writeable}
@ -10,7 +10,7 @@
                    <a href="javascript:saveIt()" class="btn btn-primary btn-block">SAVE</a>
                    <br>
                    <p class="help-block">{$_L['Info_Page']}</p>
-                    <input type="text" class="form-control" onclick="this.select()" readonly value="{$app_url}/pages/{$pageHeader}.html">
+                    <input type="text" class="form-control" onclick="this.select()" readonly value="{$app_url}/pages/{$PageFile}.html">
                </div>
            {else}
                <div class="panel-footer">
@ -20,7 +20,7 @@
        </div>
    </div>
 </div>
-<form id="formpages" class="hidden" method="post" role="form" action="{$_url}pages/{$pageHeader}-post" >
+<form id="formpages" class="hidden" method="post" role="form" action="{$_url}pages/{$PageFile}-post" >
    <textarea name="html" id="html"></textarea>
 </form>
 <script src="ui/ui/scripts/nicEdit.js"></script>
--- a/ui/ui/pool.tpl
+++ b/ui/ui/pool.tpl
@ -3,7 +3,14 @@
 <div class="row">
    <div class="col-sm-12">
        <div class="panel panel-hovered mb20 panel-primary">
-            <div class="panel-heading">{$_L['Pool']}</div>
+            <div class="panel-heading">
+                <div class="btn-group pull-right">
+                    <a class="btn btn-primary btn-xs" title="save" href="{$_url}pool/sync"
+                        onclick="return confirm('This will sync/send IP Pool to Mikrotik?')"><span
+                            class="glyphicon glyphicon-refresh" aria-hidden="true"></span> sync</a>
+                </div>
+                {$_L['Pool']}
+            </div>
            <div class="panel-body">
                <div class="md-whiteframe-z1 mb20 text-center" style="padding: 15px">
                    <div class="col-md-8">
@ -45,9 +52,9 @@
                                    <td>{$ds['range_ip']}</td>
                                    <td>{$ds['routers']}</td>
                                    <td align="center">
-                                        <a href="{$_url}pool/edit/{$ds['id']}"
-                                            class="btn btn-info btn-xs">{$_L['Edit']}</a>
-                                        <a href="{$_url}pool/delete/{$ds['id']}" id="{$ds['id']}" onclick="return confirm('{$_L['Delete']}?')"
+                                        <a href="{$_url}pool/edit/{$ds['id']}" class="btn btn-info btn-xs">{$_L['Edit']}</a>
+                                        <a href="{$_url}pool/delete/{$ds['id']}" id="{$ds['id']}"
+                                            onclick="return confirm('{$_L['Delete']}?')"
                                            class="btn btn-danger btn-xs">{$_L['Delete']}</a>
                                    </td>
                                </tr>
--- a/ui/ui/pppoe-add.tpl
+++ b/ui/ui/pppoe-add.tpl
@ -60,7 +60,7 @@
 							<div class="form-group">
 								<label class="col-md-2 control-label"><a href="{$_url}routers/add">{$_L['Router_Name']}</a></label>
 								<div class="col-md-6">
-									<select id="routers" name="routers" class="form-control select2">
+									<select id="routers" name="routers" required class="form-control select2">
 										<option value=''>{$_L['Select_Routers']}</option>
 										{foreach $r as $rs}
 											<option value="{$rs['name']}">{$rs['name']}</option>
@ -72,14 +72,21 @@
 							<div class="form-group">
 								<label class="col-md-2 control-label"><a href="{$_url}pool/add">{$_L['Pool']}</a></label>
 								<div class="col-md-6">
-									<select id="pool_name" name="pool_name" class="form-control select2">
+									<select id="pool_name" name="pool_name" required class="form-control select2">
 										<option value=''>{$_L['Select_Pool']}</option>
 									</select>
 								</div>
 							</div>
-
 							<div class="form-group">
-								<div class="col-lg-offset-2 col-lg-10">
+								<label class="col-md-2 control-label"><a href="{$_url}pool/add">{Lang::T('Expired IP Pool')}</a></label>
+								<div class="col-md-6">
+									<select id="pool_expired" name="pool_expired" class="form-control select2">
+										<option value=''>{$_L['Select_Pool']}</option>
+									</select>
+								</div>
+							</div>
+							<div class="form-group">
+								<div class="col-md-offset-2 col-md-10">
 									<button class="btn btn-primary waves-effect waves-light" type="submit">{$_L['Save']}</button>
 									Or <a href="{$_url}services/pppoe">{$_L['Cancel']}</a>
 								</div>
--- a/ui/ui/pppoe-edit.tpl
+++ b/ui/ui/pppoe-edit.tpl
@ -60,9 +60,20 @@
 							<div class="form-group">
 								<label class="col-md-2 control-label"><a href="{$_url}pool/add">{$_L['Pool']}</a></label>
 								<div class="col-md-6">
-									<select id="pool_name" name="pool_name" class="form-control select2">
+									<select id="pool_name" name="pool_name" required class="form-control select2">
 										{foreach $p as $ps}
-											<option value="{$ps['pool_name']}" {if $d['pool_name'] eq $ps['pool_name']} selected {/if}>{$ps['pool_name']}</option>
+											<option value="{$ps['pool_name']}" {if $d['pool'] eq $ps['pool_name']} selected {/if}>{$ps['pool_name']}</option>
+										{/foreach}
+									</select>
+								</div>
+							</div>
+							<div class="form-group">
+                                <label class="col-md-2 control-label"><a href="{$_url}pool/add">{Lang::T('Expired IP Pool')}</a></label>
+								<div class="col-md-6">
+									<select id="pool_expired" name="pool_expired" class="form-control select2">
+                                        <option value=''>{$_L['Select_Pool']}</option>
+										{foreach $p as $ps}
+											<option value="{$ps['pool_name']}" {if $d['pool_expired'] eq $ps['pool_name']} selected {/if}>{$ps['pool_name']}</option>
 										{/foreach}
 									</select>
 								</div>
--- a/ui/ui/pppoe.tpl
+++ b/ui/ui/pppoe.tpl
@ -1,63 +1,76 @@
 {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['PPPOE_Plans']}</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}services/pppoe/">
-											<div class="input-group">
-												<div class="input-group-addon">
-													<span class="fa fa-search"></span>
-												</div>
-												<input type="text" name="name" class="form-control" placeholder="{$_L['Search_by_Name']}...">
-												<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}services/pppoe-add" class="btn btn-primary btn-block waves-effect"><i class="ion ion-android-add"> </i> {$_L['New_Plan']}</a>
-										</div>&nbsp;
-									</div>
-                                    <div class="table-responsive">
-                                        <table class="table table-bordered table-striped table-condensed">
-                                            <thead>
-                                                <tr>
-                                                    <th>{$_L['Plan_Name']}</th>
-                                                    <th>{$_L['Bandwidth_Plans']}</th>
-                                                    <th>{$_L['Plan_Price']}</th>
-                                                    <th>{$_L['Plan_Validity']}</th>
-                                                    <th>{$_L['Pool']}</th>
-                                                    <th>{$_L['Routers']}</th>
-                                                    <th>{$_L['Manage']}</th>
-                                                </tr>
-                                            </thead>
-                                            <tbody>
-                                            {foreach $d as $ds}
-                                                <tr {if $ds['enabled'] != 1}class="danger" title="disabled"{/if}>
-                                                    <td>{$ds['name_plan']}</td>
-                                                    <td>{$ds['name_bw']}</td>
-                                                    <td>{Lang::moneyFormat($ds['price'])}</td>
-                                                    <td>{$ds['validity']} {$ds['validity_unit']}</td>
-                                                    <td>{$ds['pool']}</td>
-                                                    <td>{$ds['routers']}</td>
-                                                    <td>
-                                                        <a href="{$_url}services/pppoe-edit/{$ds['id']}" class="btn btn-info btn-xs">{$_L['Edit']}</a>
-                                                        <a href="{$_url}services/pppoe-delete/{$ds['id']}" onclick="return confirm('{$_L['Delete']}?')" 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">
+                <div class="btn-group pull-right">
+                    <a class="btn btn-primary btn-xs" title="save" href="{$_url}services/sync/pppoe"
+                        onclick="return confirm('This will sync/send PPPOE plan to Mikrotik?')"><span
+                            class="glyphicon glyphicon-refresh" aria-hidden="true"></span> sync</a>
+                </div>{$_L['PPPOE_Plans']}
+            </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}services/pppoe/">
+                            <div class="input-group">
+                                <div class="input-group-addon">
+                                    <span class="fa fa-search"></span>
+                                </div>
+                                <input type="text" name="name" class="form-control"
+                                    placeholder="{$_L['Search_by_Name']}...">
+                                <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}services/pppoe-add" class="btn btn-primary btn-block waves-effect"><i
+                                class="ion ion-android-add"> </i> {$_L['New_Plan']}</a>
+                    </div>&nbsp;
+                </div>
+                <div class="table-responsive">
+                    <table class="table table-bordered table-striped table-condensed">
+                        <thead>
+                            <tr>
+                                <th>{$_L['Plan_Name']}</th>
+                                <th>{$_L['Bandwidth_Plans']}</th>
+                                <th>{$_L['Plan_Price']}</th>
+                                <th>{$_L['Plan_Validity']}</th>
+                                <th>{$_L['Pool']}</th>
+                                <th>{Lang::T('Expired IP Pool')}</th>
+                                <th>{$_L['Routers']}</th>
+                                <th>{$_L['Manage']}</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            {foreach $d as $ds}
+                                <tr {if $ds['enabled'] != 1}class="danger" title="disabled" {/if}>
+                                    <td>{$ds['name_plan']}</td>
+                                    <td>{$ds['name_bw']}</td>
+                                    <td>{Lang::moneyFormat($ds['price'])}</td>
+                                    <td>{$ds['validity']} {$ds['validity_unit']}</td>
+                                    <td>{$ds['pool']}</td>
+                                    <td>{$ds['pool_expired']}</td>
+                                    <td>{$ds['routers']}</td>
+                                    <td>
+                                        <a href="{$_url}services/pppoe-edit/{$ds['id']}"
+                                            class="btn btn-info btn-xs">{$_L['Edit']}</a>
+                                        <a href="{$_url}services/pppoe-delete/{$ds['id']}"
+                                            onclick="return confirm('{$_L['Delete']}?')" 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"}
--- a/ui/ui/prepaid-edit.tpl
+++ b/ui/ui/prepaid-edit.tpl
@ -3,57 +3,65 @@
 <div class="row">
    <div class="col-sm-12">
        <div class="panel panel-primary">
-            <div class="panel-heading"><h3 class="panel-title">{$_L['Recharge_Account']}</h3></div>
+            <div class="panel-heading">
+                <h3 class="panel-title">{$_L['Recharge_Account']}</h3>
+            </div>
            <div class="panel-body">
                <form class="form-horizontal" method="post" role="form" action="{$_url}prepaid/edit-post">
-				<input type="hidden" name="id" value="{$d['id']}">
+                    <input type="hidden" name="id" value="{$d['id']}">
                    <div class="form-group">
-						<label class="col-md-2 control-label">{$_L['Select_Account']}</label>
-						<div class="col-md-6">
-							<input type="text" class="form-control" id="username" name="username" value="{$d['username']}" readonly>
-						</div>
+                        <label class="col-md-2 control-label">{$_L['Select_Account']}</label>
+                        <div class="col-md-6">
+                            <input type="text" class="form-control" id="username" name="username"
+                                value="{$d['username']}" readonly>
+                        </div>
                    </div>

                    <div class="form-group">
-						<label class="col-md-2 control-label">{$_L['Service_Plan']}</label>
-						<div class="col-md-6">
-							<select id="id_plan" name="id_plan" class="form-control select2">
+                        <label class="col-md-2 control-label">{$_L['Service_Plan']}</label>
+                        <div class="col-md-6">
+                            <select id="id_plan" name="id_plan" class="form-control select2">
                                {foreach $p as $ps}
-									<option value="{$ps['id']}" {if $d['plan_id'] eq $ps['id']} selected {/if}>{$ps['name_plan']}</option>
+                                    <option value="{$ps['id']}" {if $d['plan_id'] eq $ps['id']} selected {/if}>
+                                        {$ps['name_plan']}</option>
                                {/foreach}
                            </select>
-						</div>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-md-2 control-label">{$_L['Created_On']}</label>
+                        <div class="col-md-4">
+                            <input type="date" class="form-control" name="expiration" readonly
+                                value="{$d['recharged_on']}">
+                        </div>
+                        <div class="col-md-2">
+                            <input type="text" class="form-control" placeholder="00:00:00" readonly
+                                value="{$d['recharged_time']}">
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-md-2 control-label">{$_L['Expires_On']}</label>
+                        <div class="col-md-4">
+                            <input type="date" class="form-control" id="expiration" name="expiration"
+                                value="{$d['expiration']}">
+                        </div>
+                        <div class="col-md-2">
+                            <input type="text" class="form-control" id="time" name="time" placeholder="00:00:00"
+                                value="{$d['time']}">
+                        </div>
                    </div>

                    <div class="form-group">
-						<label class="col-md-2 control-label">{$_L['Created_On']}</label>
-						<div class="col-md-6">
-							<div class="input-group date" id="datepicker1">
-								<input type="text" class="form-control" id="recharged_on" name="recharged_on" value="{$d['recharged_on']}">
-								<span class="input-group-addon ion ion-calendar"></span>
-							</div>
-						</div>
+                        <div class="col-lg-offset-2 col-lg-10">
+                            <button class="btn btn-success waves-effect waves-light"
+                                type="submit">{$_L['Edit']}</button>
+                            Or <a href="{$_url}prepaid/list">{$_L['Cancel']}</a>
+                        </div>
                    </div>
-                    <div class="form-group">
-						<label class="col-md-2 control-label">{$_L['Expires_On']}</label>
-						<div class="col-md-6">
-							<div class="input-group date" id="datepicker2">
-								<input type="text" class="form-control" id="expiration" name="expiration" value="{$d['expiration']}">
-								<span class="input-group-addon ion ion-calendar"></span>
-							</div>
-						</div>
-                    </div>
-
-					<div class="form-group">
-						<div class="col-lg-offset-2 col-lg-10">
-							<button class="btn btn-success waves-effect waves-light" type="submit">{$_L['Edit']}</button>
-							Or <a href="{$_url}prepaid/list">{$_L['Cancel']}</a>
-						</div>
-					</div>
                </form>
            </div>
        </div>
    </div>
 </div>

-{include file="sections/footer.tpl"}
+{include file="sections/footer.tpl"}
--- a/ui/ui/prepaid.tpl
+++ b/ui/ui/prepaid.tpl
@ -1,66 +1,77 @@
 {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">
+                <div class="btn-group pull-right">
+                    <a class="btn btn-primary btn-xs" title="save" href="{$_url}prepaid/sync"
+                        onclick="return confirm('This will sync/send Caustomer active plan to Mikrotik?')"><span
+                            class="glyphicon glyphicon-refresh" aria-hidden="true"></span> sync</a>
+                </div>{$_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 {if $ds['status']=='off'}class="danger" {/if}>
+                                    <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']}"
+                                            onclick="return confirm('{$_L['Delete']}?')"
+                                            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"}
--- 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>
--- 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>
--- a/ui/ui/print-voucher.tpl
+++ b/ui/ui/print-voucher.tpl
@ -1,136 +1,168 @@
 <!DOCTYPE html>
 <html>
+
 <head>
    <title>{$_title}</title>
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <link rel="shortcut icon" type="image/x-icon" href="ui/ui/images/favicon.ico">
    <style>
-	.ukuran {
-		size:A4;
-	}
+        .ukuran {
+            size: A4;
+        }

-	body,td,th {
-		font-size: 12px;
-		font-family: Segoe, "Segoe UI", "DejaVu Sans", "Trebuchet MS", Verdana, sans-serif;
-	}
-	page[size="A4"] {
-	  background: white;
-	  width: 21cm;
-	  height: 29.7cm;
-	  display: block;
-	  margin: 0 auto;
-	  margin-bottom: 0.5cm;
-	  html, body {
-		width: 210mm;
-		height: 297mm;
-	  }
-	}
-	@media print {
-        body {
-            size: auto;
-            margin: 0;
-            box-shadow: 0;
+        body,
+        td,
+        th {
+            font-size: 12px;
+            font-family: Segoe, "Segoe UI", "DejaVu Sans", "Trebuchet MS", Verdana, sans-serif;
        }
+
        page[size="A4"] {
-            margin: 0;
-            size: auto;
-            box-shadow: 0;
+            background: white;
+            width: 21cm;
+            height: 29.7cm;
+            display: block;
+            margin: 0 auto;
+            margin-bottom: 0.5cm;
+
+            html,
+            body {
+                width: 210mm;
+                height: 297mm;
+            }
        }
-        .page-break	{ display: block; page-break-before: always; }
-        .no-print, .no-print *
-        {
-            display: none !important;
+
+        @media print {
+            body {
+                size: auto;
+                margin: 0;
+                box-shadow: 0;
+            }
+
+            page[size="A4"] {
+                margin: 0;
+                size: auto;
+                box-shadow: 0;
+            }
+
+            .page-break {
+                display: block;
+                page-break-before: always;
+            }
+
+            .no-print,
+            .no-print * {
+                display: none !important;
+            }
        }
-    }
    </style>
 </head>

 <body>
-<page size="A4">
+    <page size="A4">
        <form method="post" action="{$_url}prepaid/print-voucher/" class="no-print">
-        <table width="100%" border="0" cellspacing="0" cellpadding="1" class="btn btn-default btn-sm">
-            <tr>
-                <td>ID &gt; <input type="text" name="from_id" style="width:40px" value="{$from_id}"> limit <input type="text" name="limit" style="width:40px" value="{$limit}"></td>
-                <td>PageBreak after  <input type="text" style="width:40px" name="pagebreak" value="{$pagebreak}"> vouchers</td>
-                <td>Plans <select id="plan_id" name="planid" style="width:150px">
-                <option value="0">--all--</option>
-                {foreach $plans as $plan}
-                    <option value="{$plan['id']}" {if $plan['id']==$planid}selected{/if}>{$plan['name_plan']}</option>
-                {/foreach}
-                </select></td>
-                <td><button type="submit">submit</button></td>
-            </tr>
-        </table><hr>
-        <center><button type="button" id="actprint" class="btn btn-default btn-sm no-print">{$_L['Click_Here_to_Print']}</button><br>
-        {$_L['Print_Info']}<br>
-        show {$v|@count} vouchers from {$vc} vouchers<br>
-        from ID {$v[0]['id']} limit {$limit} vouchers
-        </center>
+            <table width="100%" border="0" cellspacing="0" cellpadding="1" class="btn btn-default btn-sm">
+                <tr>
+                    <td>ID &gt; <input type="text" name="from_id" style="width:40px" value="{$from_id}"> limit <input
+                            type="text" name="limit" style="width:40px" value="{$limit}"></td>
+                    <td>PageBreak after <input type="text" style="width:40px" name="pagebreak" value="{$pagebreak}">
+                        vouchers</td>
+                    <td>Plans <select id="plan_id" name="planid" style="width:150px">
+                            <option value="0">--all--</option>
+                            {foreach $plans as $plan}
+                                <option value="{$plan['id']}" {if $plan['id']==$planid}selected{/if}>{$plan['name_plan']}
+                                </option>
+                            {/foreach}
+                        </select></td>
+                    <td><button type="submit">submit</button></td>
+                </tr>
+            </table>
+            <hr>
+            <center><button type="button" id="actprint"
+                    class="btn btn-default btn-sm no-print">{$_L['Click_Here_to_Print']}</button><br>
+                {$_L['Print_Info']}<br>
+                show {$v|@count} vouchers from {$vc} vouchers<br>
+                from ID {$v[0]['id']} limit {$limit} vouchers
+            </center>
        </form>
        <div id="printable">
            <hr>
            {foreach $v as $vs}
-            {$jml = $jml + 1}
-            <table width="100%" height="200" border="0" cellspacing="0" cellpadding="1" style="margin-bottom:5px">
-                <tbody>
-                    <tr><td align="center" valign="middle"></td></tr>
-                    <tr>
-                    <td align="center" valign="top">
-                        <table width="100%" border="0" cellspacing="0" cellpadding="2">
+                {$jml = $jml + 1}
+                <table width="100%" height="200" border="0" cellspacing="0" cellpadding="1" style="margin-bottom:5px">
+                    <tbody>
                        <tr>
-                            <td width="50%" valign="middle" style="padding-right:10px">
-                            <center><strong style="font-size:38px">{$_L['Voucher_Hotspot']}</strong><span class="no-print">  ID {$vs['id']}</span></center>
-                            <table width="100%" border="1" cellspacing="0" cellpadding="1" bordercolor="#757575">
-                                <tbody>
-                                <tr>
-                                    <td rowspan="5" width="1"><img src="qrcode/?data={$vs['code']}"></td>
-                                </tr>
-                                <tr>
-                                    <td valign="middle" align="center" style="font-size:25px">{Lang::moneyFormat($vs['price'])}</td>
-                                </tr>
-                                <tr>
-                                    <td valign="middle" align="center" style="font-size:20px">{$_L['Code_Voucher']}</td>
-                                </tr>
-                                <tr>
-                                    <td valign="middle" align="center" style="font-size:25px">{$vs['code']}</td>
-                                </tr>
-                                <tr>
-                                    <td valign="middle" align="center" style="font-size:15px">{$vs['name_plan']}</td>
-                                </tr>
-                                </tbody>
-                            </table>
-                            </td>
-                            <td valign="top" style="padding-left:10px">
-                                {include file="$_path/../pages/Voucher.html"}
+                            <td align="center" valign="middle"></td>
+                        </tr>
+                        <tr>
+                            <td align="center" valign="top">
+                                <table width="100%" border="0" cellspacing="0" cellpadding="2">
+                                    <tr>
+                                        <td width="50%" valign="middle" style="padding-right:10px">
+                                            <center><strong style="font-size:38px">{$_L['Voucher_Hotspot']}</strong><span
+                                                    class="no-print"> ID {$vs['id']}</span></center>
+                                            <table width="100%" border="1" cellspacing="0" cellpadding="1"
+                                                bordercolor="#757575">
+                                                <tbody>
+                                                    <tr>
+                                                        <td rowspan="5" width="1"><img src="qrcode/?data={$vs['code']}">
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td valign="middle" align="center" style="font-size:25px">
+                                                            {Lang::moneyFormat($vs['price'])}</td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td valign="middle" align="center" style="font-size:20px">
+                                                            {$_L['Code_Voucher']}</td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td valign="middle" align="center" style="font-size:25px">
+                                                            {$vs['code']}</td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td valign="middle" align="center" style="font-size:15px">
+                                                            {$vs['name_plan']}</td>
+                                                    </tr>
+                                                </tbody>
+                                            </table>
+                                        </td>
+                                        <td valign="top" style="padding-left:10px">
+                                            {include file="$_path/../pages/Voucher.html"}
+                                        </td>
+                                    </tr>
+                                </table>
                            </td>
                        </tr>
-                        </table>
-                    </td>
-                    </tr>
-                </tbody>
+                    </tbody>
                </table>
                <hr>
                {if $jml == $pagebreak}
-                {$jml = 0}
-                <!-- pageBreak -->
-                <div class="page-break"><div class="no-print" style="background-color: #E91E63; color:#FFF;" align="center">-- pageBreak --<hr></div></div>
+                    {$jml = 0}
+                    <!-- pageBreak -->
+                    <div class="page-break">
+                        <div class="no-print" style="background-color: #E91E63; color:#FFF;" align="center">-- pageBreak --
+                            <hr>
+                        </div>
+                    </div>
                {/if}
-                {/foreach}
+            {/foreach}
        </div>
-</page>
-<script src="ui/ui/scripts/jquery-1.10.2.js"></script>
-{if isset($xfooter)}
-    {$xfooter}
-{/if}
-<script>
-    jQuery(document).ready(function() {
-        // initiate layout and plugins
-        $("#actprint").click(function() {
-            window.print();
-            return false;
+    </page>
+    <script src="ui/ui/scripts/jquery-1.10.2.js"></script>
+    {if isset($xfooter)}
+        {$xfooter}
+    {/if}
+    <script>
+        jQuery(document).ready(function() {
+            // initiate layout and plugins
+            $("#actprint").click(function() {
+                window.print();
+                return false;
+            });
        });
-    });
-</script>
+    </script>

 </body>
+
 </html>
--- a/ui/ui/recharge.tpl
+++ b/ui/ui/recharge.tpl
@ -1,53 +1,58 @@
 {include file="sections/header.tpl"}

-		<div class="row">
-			<div class="col-sm-12 col-md-12">
-				<div class="panel panel-primary panel-hovered panel-stacked mb30">
-					<div class="panel-heading">{$_L['Recharge_Account']}</div>
-					<div class="panel-body">
-						<form class="form-horizontal" method="post" role="form" action="{$_url}prepaid/recharge-post" >
-							<div class="form-group">
-								<label class="col-md-2 control-label">{$_L['Select_Account']}</label>
-								<div class="col-md-6">
-									<select id="personSelect" class="form-control select2" name="id_customer" style="width: 100%" data-placeholder="{$_L['Select_Customer']}...">
-									</select>
-								</div>
-							</div>
-							<div class="form-group">
-								<label class="col-md-2 control-label">{$_L['Type']}</label>
-								<div class="col-md-6">
-									<input type="radio" id="Hot" name="type" value="Hotspot"> {$_L['Hotspot_Plans']}
-									<input type="radio" id="POE" name="type" value="PPPOE"> {$_L['PPPOE_Plans']}
-								</div>
-							</div>
-							<div class="form-group">
-								<label class="col-md-2 control-label">{$_L['Routers']}</label>
-								<div class="col-md-6">
-									<select id="server" name="server" class="form-control select2">
-										<option value=''>{$_L['Select_Routers']}</option>
-									</select>
-								</div>
-							</div>
+<div class="row">
+    <div class="col-sm-12 col-md-12">
+        <div class="panel panel-primary panel-hovered panel-stacked mb30">
+            <div class="panel-heading">{$_L['Recharge_Account']}</div>
+            <div class="panel-body">
+                <form class="form-horizontal" method="post" role="form" action="{$_url}prepaid/recharge-post">
+                    <div class="form-group">
+                        <label class="col-md-2 control-label">{$_L['Select_Account']}</label>
+                        <div class="col-md-6">
+                            <select {if $cust}{else}id="personSelect"{/if} class="form-control select2"
+                                name="id_customer" style="width: 100%" data-placeholder="{$_L['Select_Customer']}...">
+                                {if $cust}
+                                    <option value="{$cust['id']}">{$cust['username']} &bull; {$cust['fullname']} &bull; {$cust['email']}</option>
+                                {/if}
+                            </select>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-md-2 control-label">{$_L['Type']}</label>
+                        <div class="col-md-6">
+                            <input type="radio" id="Hot" name="type" value="Hotspot"> {$_L['Hotspot_Plans']}
+                            <input type="radio" id="POE" name="type" value="PPPOE"> {$_L['PPPOE_Plans']}
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-md-2 control-label">{$_L['Routers']}</label>
+                        <div class="col-md-6">
+                            <select id="server" name="server" class="form-control select2">
+                                <option value=''>{$_L['Select_Routers']}</option>
+                            </select>
+                        </div>
+                    </div>

-							<div class="form-group">
-								<label class="col-md-2 control-label">{$_L['Service_Plan']}</label>
-								<div class="col-md-6">
-									<select id="plan" name="plan" class="form-control select2">
-										<option value=''>{$_L['Select_Plans']}</option>
-									</select>
-								</div>
-							</div>
+                    <div class="form-group">
+                        <label class="col-md-2 control-label">{$_L['Service_Plan']}</label>
+                        <div class="col-md-6">
+                            <select id="plan" name="plan" class="form-control select2">
+                                <option value=''>{$_L['Select_Plans']}</option>
+                            </select>
+                        </div>
+                    </div>

-							<div class="form-group">
-								<div class="col-lg-offset-2 col-lg-10">
-									<button class="btn btn-success waves-effect waves-light" type="submit">{$_L['Recharge']}</button>
-									Or <a href="{$_url}customers/list">{$_L['Cancel']}</a>
-								</div>
-							</div>
-						</form>
-					</div>
-				</div>
-			</div>
-		</div>
+                    <div class="form-group">
+                        <div class="col-lg-offset-2 col-lg-10">
+                            <button class="btn btn-success waves-effect waves-light"
+                                type="submit">{$_L['Recharge']}</button>
+                            Or <a href="{$_url}customers/list">{$_L['Cancel']}</a>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+</div>

-{include file="sections/footer.tpl"}
+{include file="sections/footer.tpl"}
--- a/ui/ui/register-otp.tpl
+++ b/ui/ui/register-otp.tpl
@ -103,6 +103,12 @@
                                        <a href="{$_url}register" class="btn btn-success">{$_L['Cancel']}</a>
                                    </div>
                                </div>
+                                <br>
+                                <center>
+                                    <a href="javascript:showPrivacy()">Privacy</a>
+                                    &bull;
+                                    <a href="javascript:showTaC()">T &amp; C</a>
+                                </center>
                            </div>
                        </div>
                    </div>
@ -110,6 +116,22 @@
            </form>
        </div>
    </div>
+
+    <!-- Modal -->
+    <div class="modal fade" id="HTMLModal" tabindex="-1" role="dialog">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
+                            aria-hidden="true">&times;</span></button>
+                </div>
+                <div class="modal-body" id="HTMLModal_konten"></div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-default" data-dismiss="modal">&times;</button>
+                </div>
+            </div>
+        </div>
+    </div>
    {if $_c['tawkto'] != ''}
        <!--Start of Tawk.to Script-->
        <script type="text/javascript">
@ -127,7 +149,7 @@
        </script>
        <!--End of Tawk.to Script-->
    {/if}
-    <script src="ui/ui/scripts/vendors.js"></script>
+    <script src="ui/ui/scripts/vendors.js?v=1"></script>
 </body>

 </html>
--- a/ui/ui/register-rotp.tpl
+++ b/ui/ui/register-rotp.tpl
@ -78,12 +78,34 @@
                                        type="submit">{Lang::T('Request OTP')}</button>
                                </div>
                            </div>
+                            <br>
+                            <center>
+                                <a href="javascript:showPrivacy()">Privacy</a>
+                                &bull;
+                                <a href="javascript:showTaC()">T &amp; C</a>
+                            </center>
                        </div>
                    </div>
                </div>
            </form>
        </div>
    </div>
+
+    <!-- Modal -->
+    <div class="modal fade" id="HTMLModal" tabindex="-1" role="dialog">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
+                            aria-hidden="true">&times;</span></button>
+                </div>
+                <div class="modal-body" id="HTMLModal_konten"></div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-default" data-dismiss="modal">&times;</button>
+                </div>
+            </div>
+        </div>
+    </div>
    {if $_c['tawkto'] != ''}
        <!--Start of Tawk.to Script-->
        <script type="text/javascript">
@ -101,7 +123,7 @@
        </script>
        <!--End of Tawk.to Script-->
    {/if}
-    <script src="ui/ui/scripts/vendors.js"></script>
+    <script src="ui/ui/scripts/vendors.js?v=1"></script>
 </body>

 </html>
--- a/ui/ui/register.tpl
+++ b/ui/ui/register.tpl
@ -86,14 +86,20 @@
                                </div>
                                <br>
                                <div class="btn-group btn-group-justified mb15">
-                                <div class="btn-group">
-                                    <a href="{$_url}login" class="btn btn-warning">{$_L['Cancel']}</a>
-                                </div>
+                                    <div class="btn-group">
+                                        <a href="{$_url}login" class="btn btn-warning">{$_L['Cancel']}</a>
+                                    </div>
                                    <div class="btn-group">
                                        <button class="btn btn-success waves-effect waves-light"
                                            type="submit">{$_L['Register']}</button>
                                    </div>
                                </div>
+                                <br>
+                                <center>
+                                    <a href="javascript:showPrivacy()">Privacy</a>
+                                    &bull;
+                                    <a href="javascript:showTaC()">T &amp; C</a>
+                                </center>
                            </div>
                        </div>
                    </div>
@ -101,6 +107,22 @@
            </form>
        </div>
    </div>
+
+    <!-- Modal -->
+    <div class="modal fade" id="HTMLModal" tabindex="-1" role="dialog">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
+                            aria-hidden="true">&times;</span></button>
+                </div>
+                <div class="modal-body" id="HTMLModal_konten"></div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-default" data-dismiss="modal">&times;</button>
+                </div>
+            </div>
+        </div>
+    </div>
    {if $_c['tawkto'] != ''}
        <!--Start of Tawk.to Script-->
        <script type="text/javascript">
@ -118,7 +140,7 @@
        </script>
        <!--End of Tawk.to Script-->
    {/if}
-    <script src="ui/ui/scripts/vendors.js"></script>
+    <script src="ui/ui/scripts/vendors.js?v=1"></script>
 </body>

 </html>
--- 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>
--- 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>
--- a/ui/ui/reports-period.tpl
+++ b/ui/ui/reports-period.tpl
@ -10,19 +10,13 @@
                    <div class="form-group">
                        <label class="col-md-3 control-label">{$_L['From_Date']}</label>
                        <div class="col-md-9">
-                            <div class="input-group" id="datepicker1">
-                                <input type="date" class="form-control" value="{$tdate}" name="fdate" id="fdate">
-                                <span class="input-group-addon"><i class=" ion ion-calendar"></i></span>
-                            </div>
+                            <input type="date" class="form-control" value="{$tdate}" name="fdate" id="fdate">
                        </div>
                    </div>
                    <div class="form-group">
                        <label class="col-md-3 control-label">{$_L['To_Date']}</label>
                        <div class="col-md-9">
-                            <div class="input-group date" id="datepicker2">
-                                <input type="date" class="form-control" value="{$mdate}" name="tdate" id="tdate">
-                                <span class="input-group-addon"><i class=" ion ion-calendar"></i></span>
-                            </div>
+                        <input type="date" class="form-control" value="{$mdate}" name="tdate" id="tdate">
                        </div>
                    </div>
                    <div class="form-group">
--- a/ui/ui/router-error.tpl
+++ b/ui/ui/router-error.tpl
@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <title>Error - PHPNuxBill</title>
+    <link rel="shortcut icon" href="ui/ui/images/logo.png" type="image/x-icon" />
+
+    <link rel="stylesheet" href="ui/ui/styles/bootstrap.min.css">
+
+    <link rel="stylesheet" href="ui/ui/fonts/ionicons/css/ionicons.min.css">
+    <link rel="stylesheet" href="ui/ui/fonts/font-awesome/css/font-awesome.min.css">
+    <link rel="stylesheet" href="ui/ui/fonts/MaterialDesign/css/materialdesignicons.min.css">
+
+    <link rel="stylesheet" href="ui/ui/styles/adminlte.min.css">
+    <link rel="stylesheet" href="ui/ui/styles/skin-blue.min.css">
+    <style>
+        ::-moz-selection {
+            /* Code for Firefox */
+            color: red;
+            background: yellow;
+        }
+
+        ::selection {
+            color: red;
+            background: yellow;
+        }
+    </style>
+
+</head>
+
+<body class="hold-transition skin-blue">
+    <div class="container">
+
+        <section class="content">
+            <div class="row">
+                <div class="col-md-3">
+                    <img src="./ui/ui/images/error.png" class="img-responsive hidden-sm hidden-xs">
+                </div>
+                <div class="col-md-6">
+                    <div class="box box-danger box-solid text-center">
+
+                        <section class="content-header">
+                            <h1 class="text-center">
+                                {$error_title}
+                            </h1>
+                        </section>
+                        <div class="box-title" style="font-size:xx-large; color:red">
+                            <span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span>
+                        </div>
+                        <div class="box-body" style="font-size: larger;">
+                            <br><br>
+                            {$error_message}
+                            <br><br><br>
+                        </div>
+                        <div class="box-footer">
+                            <div class="btn-group btn-group-justified" role="group" aria-label="...">
+                                <a href="./update.php?step=4" class="btn btn-info btn-sm btn-block">Update Database</a>
+                                <a href="{$_url}community#update" class="btn btn-primary btn-sm btn-block">Update
+                                    PHPNuxBill</a>
+                            </div>
+                            <br><br>
+                            <a href="javascript::history.back()" onclick="history.back()"
+                                class="btn btn-warning btn-block">back</a>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-md-4">
+                    <img src="./ui/ui/images/error.png" class="img-responsive hidden-md hidden-lg">
+                </div>
+            </div>
+        </section>
+    </div>
+</body>
+
+</html>
--- a/ui/ui/routers-add.tpl
+++ b/ui/ui/routers-add.tpl
@ -42,7 +42,8 @@
                    <div class="form-group">
                        <label class="col-md-2 control-label">{$_L['Router_Secret']}</label>
                        <div class="col-md-6">
-                            <input type="text" class="form-control" id="password" name="password">
+                            <input type="text" class="form-control" id="password" name="password"
+                            onmouseleave="this.type = 'password'" onmouseenter="this.type = 'text'">
                        </div>
                    </div>
                    <div class="form-group">
--- a/ui/ui/routers.tpl
+++ b/ui/ui/routers.tpl
@ -31,6 +31,7 @@
                    <table class="table table-bordered table-striped table-condensed">
                        <thead>
                            <tr>
+                                <th>ID</th>
                                <th>{$_L['Router_Name']}</th>
                                <th>{$_L['IP_Address']}</th>
                                <th>{$_L['Username']}</th>
@ -42,6 +43,7 @@
                        <tbody>
                            {foreach $d as $ds}
                                <tr {if $ds['enabled'] != 1}class="danger" title="disabled" {/if}>
+                                    <td>{$ds['id']}</td>
                                    <td>{$ds['name']}</td>
                                    <td>{$ds['ip_address']}</td>
                                    <td>{$ds['username']}</td>
@ -50,7 +52,9 @@
                                    <td>
                                        <a href="{$_url}routers/edit/{$ds['id']}"
                                            class="btn btn-info btn-xs">{$_L['Edit']}</a>
-                                        <a href="{$_url}routers/delete/{$ds['id']}" id="{$ds['id']}" onclick="return confirm('{$_L['Delete']}?')" class="btn btn-danger btn-xs">{$_L['Delete']}</a>
+                                        <a href="{$_url}routers/delete/{$ds['id']}" id="{$ds['id']}"
+                                            onclick="return confirm('{$_L['Delete']}?')"
+                                            class="btn btn-danger btn-xs">{$_L['Delete']}</a>
                                    </td>
                                </tr>
                            {/foreach}
--- a/ui/ui/scripts/custom.js
+++ b/ui/ui/scripts/custom.js
@ -14,7 +14,7 @@ $(document).ready(function () {
        $('#TimeLimit').show();
 		$('#DataLimit').show();
    }
-	
+
 	if ($('#Unlimited').is(':checked')) {
        $('#Type').hide();
 		$('#TimeLimit').hide();
@ -26,12 +26,12 @@ $(document).ready(function () {
 	if ($('#Hotspot').is(':checked')) {
        $('#p').hide();
 		$('#h').show();
-    } 
+    }
 	if ($('#PPPOE').is(':checked')) {
        $('#p').show();
 		$('#h').hide();
    }
-	
+
    });
 });
 $("#Hotspot").prop("checked", true).change();
@ -48,6 +48,7 @@ $(document).ready(function(){
        cache: false,
        success: function(msg){
            $("#pool_name").html(msg);
+            $("#pool_expired").html(msg);
        }
    });
  });
@ -62,10 +63,10 @@ $(function() {
 					dataType: "html",
 					url: "index.php?_route=autoload/server",
 					success: function(msg){
-						$("#server").html(msg);                                                     
+						$("#server").html(msg);
 					}
 				});
-				
+
 				$("#server").change(getAjaxAlamat);
 				function getAjaxAlamat(){
 					var server = $("#server").val();
@ -103,4 +104,30 @@ $(function() {
 				});
 		}
    });
-});
+});
+
+
+function showPrivacy() {
+    $('#HTMLModal_title').html('Privacy Policy');
+    $('#HTMLModal_konten').html('<center><img src="ui/ui/images/loading.gif"></center>');
+    $('#HTMLModal').modal({
+        'show': true,
+        'backdrop': false,
+    });
+    $.get('pages/Privacy_Policy.html?' + (new Date()), function(data) {
+        $('#HTMLModal_konten').html(data);
+    });
+}
+
+function showTaC() {
+    $('#HTMLModal_title').html('Terms and Conditions');
+    $('#HTMLModal_konten').html('<center><img src="ui/ui/images/loading.gif"></center>');
+    $('#HTMLModal').modal({
+        'show': true,
+        'backdrop': false,
+    });
+    $.get('pages/Terms_and_Conditions.html?' + (new Date()), function(data) {
+        $('#HTMLModal_konten').html(data);
+        $('#HTMLModal').modal('handleUpdate')
+    });
+}
--- a/ui/ui/scripts/vendors.js
+++ b/ui/ui/scripts/vendors.js
--- a/ui/ui/sections/footer.tpl
+++ b/ui/ui/sections/footer.tpl
@ -1,30 +1,40 @@
        </section>
-    </div>
-    <footer class="main-footer">
-        <div class="pull-right hidden-xs" id="version" onclick="location.href = '{$_url}community#latestVersion';"></div>
-        PHPNuxBill by <a href="https://github.com/hotspotbilling/phpnuxbill" rel="nofollow noreferrer noopener"
-            target="_blank">iBNuX</a>, Theme by <a href="https://adminlte.io/" rel="nofollow noreferrer noopener"
-            target="_blank">AdminLTE</a>
-    </footer>
-</div>
+        </div>
+        <footer class="main-footer">
+            <div class="pull-right" id="version" onclick="location.href = '{$_url}community#latestVersion';"></div>
+            PHPNuxBill by <a href="https://github.com/hotspotbilling/phpnuxbill" rel="nofollow noreferrer noopener"
+                target="_blank">iBNuX</a>, Theme by <a href="https://adminlte.io/" rel="nofollow noreferrer noopener"
+                target="_blank">AdminLTE</a>
+        </footer>
+        </div>
+        <script src="ui/ui/scripts/jquery.min.js"></script>
+        <script src="ui/ui/scripts/bootstrap.min.js"></script>
+        <script src="ui/ui/scripts/adminlte.min.js"></script>
+        <script src="ui/ui/scripts/plugins/select2.min.js"></script>
+        <script src="ui/ui/scripts/custom.js"></script>

-<script src="ui/ui/scripts/jquery.min.js"></script>
-<script src="ui/ui/scripts/bootstrap.min.js"></script>
-<script src="ui/ui/scripts/adminlte.min.js"></script>
-<script src="ui/ui/scripts/plugins/select2.min.js"></script>
-<script src="ui/ui/scripts/custom.js"></script>
+        {if isset($xfooter)}
+            {$xfooter}
+        {/if}
+        {literal}
+            <script>
+                $(document).ready(function() {
+                    $('.select2').select2({theme: "bootstrap"});
+                });

-{if isset($xfooter)}
-    {$xfooter}
-{/if}
-{literal}
-<script>
-$(document).ready(function() {
-    $('.select2').select2({theme: "bootstrap"});
-});
-</script>
-{/literal}
+                $(document).ready(function() {
+                    $('.select2tag').select2({theme: "bootstrap", tags: true});
+                });

-</body>
+                var listAtts = document.querySelectorAll(`[api-get-text]`);
+                listAtts.forEach(function(el) {
+                    $.get(el.getAttribute('api-get-text'), function(data) {
+                        el.innerHTML = data;
+                    });
+                });
+            </script>
+        {/literal}
+
+        </body>

 </html>
--- a/ui/ui/sections/header.tpl
+++ b/ui/ui/sections/header.tpl
@ -218,14 +218,19 @@
                                <li {if $_routes[1] eq 'Voucher'}class="active" {/if}><a
                                        href="{$_url}pages/Voucher">{$_L['Voucher']} Template</a></li>
                                <li {if $_routes[1] eq 'Announcement'}class="active" {/if}><a
-                                        href="{$_url}pages/Announcement">{$_L['Announcement']} Editor</a></li>
+                                        href="{$_url}pages/Announcement">{$_L['Announcement']}</a></li>
                                <li {if $_routes[1] eq 'Registration_Info'}class="active" {/if}><a
-                                        href="{$_url}pages/Registration_Info">{$_L['Registration_Info']} Editor</a></li>
+                                    href="{$_url}pages/Registration_Info">{$_L['Registration_Info']}</a></li>
+                                <li {if $_routes[1] eq 'Privacy_Policy'}class="active" {/if}><a
+                                    href="{$_url}pages/Privacy_Policy">Privacy Policy</a></li>
+                                <li {if $_routes[1] eq 'Terms_and_Conditions'}class="active" {/if}><a
+                                        href="{$_url}pages/Terms_and_Conditions">Terms and Conditions</a></li>
                                {$_MENU_PAGES}
                            </ul>
                        </li>
                        {$_MENU_AFTER_PAGES}
-                        <li class="{if $_system_menu eq 'settings' || $_system_menu eq 'paymentgateway' }active{/if} treeview">
+                        <li
+                            class="{if $_system_menu eq 'settings' || $_system_menu eq 'paymentgateway' }active{/if} treeview">
                            <a href="#">
                                <i class="ion ion-gear-a"></i> <span>{$_L['Settings']}</span>
                                <span class="pull-right-container">
@ -241,8 +246,8 @@
                                        href="{$_url}settings/notifications">{Lang::T('User Notification')}</a></li>
                                <li {if $_routes[1] eq 'users'}class="active" {/if}><a
                                        href="{$_url}settings/users">{$_L['Administrator_Users']}</a></li>
-                                <li {if $_routes[1] eq 'dbstatus'}class="active" {/if}><a
-                                        href="{$_url}settings/dbstatus">{$_L['Backup_Restore']}</a></li>
+                                {* <li {if $_routes[1] eq 'dbstatus'}class="active" {/if}><a
+                                        href="{$_url}settings/dbstatus">{$_L['Backup_Restore']}</a></li> *}
                                <li {if $_routes[0] eq 'pluginmanager'}class="active" {/if}>
                                    <a href="{$_url}pluginmanager">{Lang::T('Plugin Manager')}</a>
                                </li>
--- a/ui/ui/sections/user-footer.tpl
+++ b/ui/ui/sections/user-footer.tpl
@ -1,45 +1,87 @@
        </section>
-    </div>
-    {if isset($_c['CompanyFooter'])}
-        <footer class="main-footer">
-            {$_c['CompanyFooter']}
-        </footer>
-    {else}
-        <footer class="main-footer">
-            PHPNuxBill by <a href="https://github.com/hotspotbilling/phpnuxbill" rel="nofollow noreferrer noopener" target="_blank">iBNuX</a>, Theme by <a href="https://adminlte.io/" rel="nofollow noreferrer noopener" target="_blank">AdminLTE</a>
-        </footer>
-    {/if}
-</div>
+        </div>
+        {if isset($_c['CompanyFooter'])}
+            <footer class="main-footer">
+                {$_c['CompanyFooter']}
+                <div class="pull-right">
+                    <a href="javascript:showPrivacy()">Privacy</a>
+                    &bull;
+                    <a href="javascript:showTaC()">T &amp; C</a>
+                </div>
+            </footer>
+        {else}
+            <footer class="main-footer">
+                PHPNuxBill by <a href="https://github.com/hotspotbilling/phpnuxbill" rel="nofollow noreferrer noopener"
+                    target="_blank">iBNuX</a>, Theme by <a href="https://adminlte.io/" rel="nofollow noreferrer noopener"
+                    target="_blank">AdminLTE</a>
+                <div class="pull-right">
+                    <a href="javascript:showPrivacy()">Privacy</a>
+                    &bull;
+                    <a href="javascript:showTaC()">T &amp; C</a>
+                </div>
+            </footer>
+        {/if}
+        </div>

-<script src="ui/ui/scripts/jquery.min.js"></script>
-<script src="ui/ui/scripts/bootstrap.min.js"></script>
-<script src="ui/ui/scripts/adminlte.min.js"></script>

-<script src="ui/ui/scripts/plugins/select2.min.js"></script>
-<script src="ui/ui/scripts/custom.js"></script>
+        <!-- Modal -->
+        <div class="modal fade" id="HTMLModal" tabindex="-1" role="dialog">
+            <div class="modal-dialog">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="modal-body" id="HTMLModal_konten"></div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-default" data-dismiss="modal">&times;</button>
+                    </div>
+                </div>
+            </div>
+        </div>

-{if isset($xfooter)}
-    {$xfooter}
-{/if}

-{if $_c['tawkto'] != ''}
-    <!--Start of Tawk.to Script-->
-    <script type="text/javascript">
-        var Tawk_API = Tawk_API || {},
-            Tawk_LoadStart = new Date();
-        (function() {
-            var s1 = document.createElement("script"),
-                s0 = document.getElementsByTagName("script")[0];
-            s1.async = true;
-            s1.src='https://embed.tawk.to/{$_c['tawkto']}';
-            s1.charset = 'UTF-8';
-            s1.setAttribute('crossorigin', '*');
-            s0.parentNode.insertBefore(s1, s0);
-        })();
-    </script>
-    <!--End of Tawk.to Script-->
-{/if}

-</body>
+        <script src="ui/ui/scripts/jquery.min.js"></script>
+        <script src="ui/ui/scripts/bootstrap.min.js"></script>
+        <script src="ui/ui/scripts/adminlte.min.js"></script>
+
+        <script src="ui/ui/scripts/plugins/select2.min.js"></script>
+        <script src="ui/ui/scripts/custom.js?v=2"></script>
+
+        {if isset($xfooter)}
+            {$xfooter}
+        {/if}
+
+        {if $_c['tawkto'] != ''}
+            <!--Start of Tawk.to Script-->
+            <script type="text/javascript">
+                var Tawk_API = Tawk_API || {},
+                    Tawk_LoadStart = new Date();
+                (function() {
+                    var s1 = document.createElement("script"),
+                        s0 = document.getElementsByTagName("script")[0];
+                    s1.async = true;
+                    s1.src='https://embed.tawk.to/{$_c['tawkto']}';
+                    s1.charset = 'UTF-8';
+                    s1.setAttribute('crossorigin', '*');
+                    s0.parentNode.insertBefore(s1, s0);
+                })();
+            </script>
+            <!--End of Tawk.to Script-->
+        {/if}
+
+        {literal}
+            <script>
+                var listAtts = document.querySelectorAll(`[api-get-text]`);
+                listAtts.forEach(function(el) {
+                    $.get(el.getAttribute('api-get-text'), function(data) {
+                        el.innerHTML = data;
+                    });
+                });
+            </script>
+        {/literal}
+
+        </body>

 </html>
--- a/ui/ui/sections/user-header.tpl
+++ b/ui/ui/sections/user-header.tpl
@ -27,6 +27,16 @@
            color: red;
            background: yellow;
        }
+
+        .content-wrapper {
+            margin-top: 50px;
+        }
+
+        @media (max-width: 767px) {
+            .content-wrapper {
+                margin-top: 100px;
+            }
+        }
    </style>

    {if isset($xheader)}
@ -37,8 +47,7 @@

 <body class="hold-transition skin-blue sidebar-mini">
    <div class="wrapper">
-
-        <header class="main-header">
+        <header class="main-header" style="position:fixed; width: 100%">
            <a href="{$_url}home" class="logo">
                <span class="logo-mini"><b>N</b>uX</span>
                <span class="logo-lg">{$_c['CompanyName']}</span>
@ -48,20 +57,23 @@
                    <span class="sr-only">Toggle navigation</span>
                </a>
                <div class="navbar-custom-menu">
-
                    <ul class="nav navbar-nav">
                        <li class="dropdown user user-menu">
                            <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                                {if $_c['enable_balance'] == 'yes'}
+                                    <span style="color: whitesmoke;">&nbsp;{Lang::moneyFormat($_user['balance'])}&nbsp;</span>
+                                {else}
+                                    <span>{$_user['fullname']}</span>
+                                {/if}
                                <img src="https://robohash.org/{$_user['id']}?set=set3&size=100x100&bgset=bg1"
-                                    onerror="this.src='system/uploads/user.default.jpg'"
-                                    class="user-image" alt="User Image">
-                                <span class="hidden-xs">{$_user['fullname']}</span>
+                                    onerror="this.src='system/uploads/user.default.jpg'" class="user-image"
+                                    alt="User Image">
                            </a>
                            <ul class="dropdown-menu">
                                <li class="user-header">
                                    <img src="https://robohash.org/{$_user['id']}?set=set3&size=100x100&bgset=bg1"
-                                        onerror="this.src='system/uploads/user.default.jpg'"
-                                        class="img-circle" alt="User Image">
+                                        onerror="this.src='system/uploads/user.default.jpg'" class="img-circle"
+                                        alt="User Image">

                                    <p>
                                        {$_user['fullname']}
@ -94,7 +106,7 @@
            </nav>
        </header>

-        <aside class="main-sidebar">
+        <aside class="main-sidebar" style="position:fixed;">
            <section class="sidebar">
                <ul class="sidebar-menu" data-widget="tree">
                    <li {if $_system_menu eq 'home'}class="active" {/if}>
@ -105,12 +117,12 @@
                    </li>
                    {$_MENU_AFTER_DASHBOARD}
                    {if $_c['disable_voucher'] != 'yes'}
-                    <li {if $_system_menu eq 'voucher'}class="active" {/if}>
-                        <a href="{$_url}voucher/activation">
-                            <i class="fa fa-ticket"></i>
-                            <span>{Lang::T('Voucher')}</span>
-                        </a>
-                    </li>
+                        <li {if $_system_menu eq 'voucher'}class="active" {/if}>
+                            <a href="{$_url}voucher/activation">
+                                <i class="fa fa-ticket"></i>
+                                <span>{Lang::T('Voucher')}</span>
+                            </a>
+                        </li>
                    {/if}
                    {if $_c['payment_gateway'] != 'none' or $_c['payment_gateway'] == '' }
                        <li {if $_system_menu eq 'package'}class="active" {/if}>
--- 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}
--- a/ui/ui/user-dashboard.tpl
+++ b/ui/ui/user-dashboard.tpl
@ -12,8 +12,7 @@
                    <tbody>
                        <tr>
                            <td>{Lang::T('expired')}</td>
-                            <td>{date({$_c['date_format']}, strtotime($unpaid['expired_date']))}
-                                {date('H:i', strtotime($unpaid['expired_date']))} </td>
+                            <td>{Lang::dateTimeFormat($unpaid['expired_date'])} </td>
                        </tr>
                        <tr>
                            <td>{$_L['Plan_Name']}</td>
@ -30,10 +29,22 @@
                    </tbody>
                </table>
                <div class="box-footer p-2">
-                    <a class="btn btn-danger btn-block btn-sm" href="{$_url}order/view/{$unpaid['id']}">
-                        <span class="icon"><i class="ion ion-card"></i></span>
-                        <span>{Lang::T('PAY NOW')}</span>
-                    </a>
+                    <div class="btn-group btn-group-justified mb15">
+                        <div class="btn-group">
+                            <a href="{$_url}order/view/{$unpaid['id']}/cancel" class="btn btn-danger btn-sm"
+                                onclick="return confirm('{Lang::T('Cancel it?')}')">
+                                <span class="glyphicon glyphicon-trash"></span>
+                                {Lang::T('Cancel')}
+                            </a>
+                        </div>
+                        <div class="btn-group">
+                            <a class="btn btn-success btn-block btn-sm" href="{$_url}order/view/{$unpaid['id']}">
+                                <span class="icon"><i class="ion ion-card"></i></span>
+                                <span>{Lang::T('PAY NOW')}</span>
+                            </a>
+                        </div>
+                    </div>
+
                </div>
            </div>
        {/if}
@ -54,13 +65,13 @@
            <table class="table table-bordered table-striped table-bordered table-hover">
                <tr>
                    <td class="small text-success text-uppercase text-normal">{$_L['Username']}</td>
-                    <td class="small mb15">{$_bill['username']}</td>
+                    <td class="small mb15">{$_user['username']}</td>
                </tr>
                <tr>
                    <td class="small text-success text-uppercase text-normal">{$_L['Password']}</td>
-                    <td class="small mb15"><input type="text" value="{$_user['password']}"
-                            style="background-color: black; color:black; width:100%; border: 0px;"
-                            onclick="this.select()"></td>
+                    <td class="small mb15"><input type="password" value="{$_user['password']}"
+                            style="width:100%; border: 0px;" onmouseleave="this.type = 'password'"
+                            onmouseenter="this.type = 'text'" onclick="this.select()"></td>
                </tr>
                {if $_c['enable_balance'] == 'yes'}
                    <tr>
@ -77,23 +88,38 @@
                        </td>
                    </tr>
                {/if}
-                <tr>
-                    <td class="small text-primary text-uppercase text-normal">{$_L['Plan_Name']}</td>
-                    <td class="small mb15">{$_bill['namebp']}</td>
-                </tr>
-                <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}&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>
-                </tr>
-                {if $_bill['type'] == 'Hotspot' && $_bill['status'] == 'on'}
+                {if $_bill}
+                    <tr>
+                        <td class="small text-primary text-uppercase text-normal">{strtoupper(Lang::T('Location'))}</td>
+                        <td class="small mb15">{$_bill['routers']}</td>
+                    </tr>
+                    <tr>
+                        <td class="small text-primary text-uppercase text-normal">{$_L['Plan_Name']}</td>
+                        <td class="small mb15">
+                            {$_bill['namebp']}
+                            {if $_bill['status'] == 'on'}
+                                <a class="label label-danger pull-right" href="{$_url}home&deactivate=1"
+                                    onclick="return confirm('{Lang::T('Deactivate')}?')">{Lang::T('Deactivate')}</a>
+                            {else}
+                                <a class="label label-warning pull-right" href="{$_url}order/package"
+                                >{Lang::T('expired')}</a>
+                            {/if}
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class="small text-info text-uppercase text-normal">{$_L['Created_On']}</td>
+                        <td class="small mb15">
+                            {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 text-danger">
+                            {if $_bill['time'] ne ''}{Lang::dateAndTimeFormat($_bill['expiration'],$_bill['time'])}{/if}&nbsp;
+                            <a class="label label-primary pull-right" href="{$_url}home&recharge=1"
+                                onclick="return confirm('{Lang::T('Recharge')}?')">{Lang::T('Recharge')}</a>
+                        </td>
+                    </tr>
                    {if $nux_ip}
                        <tr>
                            <td class="small text-primary text-uppercase text-normal">{Lang::T('Current IP')}</td>
@ -106,12 +132,14 @@
                            <td class="small mb15">{$nux_mac}</td>
                        </tr>
                    {/if}
-                    <tr>
-                        <td class="small text-primary text-uppercase text-normal">{Lang::T('Login Status')}</td>
-                        <td class="small mb15" id="login_status">
-                            Loading....
-                        </td>
-                    </tr>
+                    {if $_bill['type'] == 'Hotspot' && $_bill['status'] == 'on'}
+                        <tr>
+                            <td class="small text-primary text-uppercase text-normal">{Lang::T('Login Status')}</td>
+                            <td class="small mb15" id="login_status">
+                            <img src="ui/ui/images/loading.gif">
+                            </td>
+                        </tr>
+                    {/if}
                {/if}
            </table>
            {if $_c['disable_voucher'] == 'yes'}
@ -138,7 +166,7 @@
                }, 2000);
            </script>
        {/if}
-        {if $_c['enable_balance'] == 'yes'}
+        {if $_c['enable_balance'] == 'yes' && $_c['allow_balance_transfer'] == 'yes'}
            <div class="box box-primary box-solid mb30">
                <div class="box-header">
                    <h4 class="box-title">{Lang::T("Transfer Balance")}</h4>
@ -151,24 +179,46 @@
                                    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"
+                                    onclick="return confirm('{Lang::T("Are You Sure?")}')" 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', '');
-                                return true;
-                            }
-                            return false;
+                            }, 1000);
+                            return true;
+                        }
+                        return false;
                        }
                    </script>
                </div>
+                <div class="box-header">
+                    <h4 class="box-title">{Lang::T("Recharge a friend")}</h4>
+                </div>
+                <div class="box-body p-0">
+                    <form method="post" role="form" action="{$_url}home">
+                        <div class="form-group">
+                            <div class="col-sm-10">
+                                <input type="text" id="username" name="username" class="form-control" required
+                                    placeholder="{$_L['Username']}">
+                            </div>
+                            <div class="form-group col-sm-2" align="center">
+                                <button class="btn btn-success btn-block" id="sendBtn" type="submit" name="send"
+                                    onclick="return confirm('{Lang::T("Are You Sure?")}')" value="plan"><i
+                                        class="glyphicon glyphicon-send"></i></button>
+                            </div>
+                        </div>
+                    </form>
+                </div>
            </div>
        {/if}
        <br>
--- a/ui/ui/user-login.tpl
+++ b/ui/ui/user-login.tpl
@ -47,7 +47,8 @@
                                    {if $_c['country_code_phone']!= ''}
                                        <span class="input-group-addon" id="basic-addon1">+</span>
                                    {else}
-                                        <span class="input-group-addon" id="basic-addon1"><i class="glyphicon glyphicon-phone-alt"></i></span>
+                                        <span class="input-group-addon" id="basic-addon1"><i
+                                                class="glyphicon glyphicon-phone-alt"></i></span>
                                    {/if}
                                    <input type="text" class="form-control" name="username"
                                        placeholder="{if $_c['country_code_phone']!= ''}{$_c['country_code_phone']}{/if} {$_L['Phone_Number']}">
@ -69,20 +70,44 @@
                                </div>
                            </div>
                            <div class="btn-group btn-group-justified mb15">
-                                <div class="btn-group">
-                                    <button type="submit" class="btn btn-primary">{$_L['Login']}</button>
-                                </div>
                                <div class="btn-group">
                                    <a href="{$_url}register" class="btn btn-success">{$_L['Register']}</a>
                                </div>
+                                <div class="btn-group">
+                                    <button type="submit" class="btn btn-primary">{$_L['Login']}</button>
+                                </div>
                            </div>
+                            <br>
+                            <center>
+                                <a href="javascript:showPrivacy()">Privacy</a>
+                                &bull;
+                                <a href="javascript:showTaC()">T &amp; C</a>
+                            </center>
                        </form>
                    </div>
                </div>
            </div>
        </div>
    </div>
-    <script src="ui/ui/scripts/vendors.js"></script>
+
+    <!-- Modal -->
+    <div class="modal fade" id="HTMLModal" tabindex="-1" role="dialog">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
+                            aria-hidden="true">&times;</span></button>
+                </div>
+                <div class="modal-body" id="HTMLModal_konten"></div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-default" data-dismiss="modal">&times;</button>
+                </div>
+            </div>
+        </div>
+    </div>
+
+
+    <script src="ui/ui/scripts/vendors.js?v=1"></script>
 </body>

 </html>
--- a/ui/ui/user-orderPlan.tpl
+++ b/ui/ui/user-orderPlan.tpl
@ -6,13 +6,13 @@
            <div class="box-header">{Lang::T('Order Internet Package')}</div>
        </div>
        {if $_c['enable_balance'] == 'yes'}
-            <div class="box box-solid box-primary">
+            <div class="box box-solid box-success bg-gray-light">
                <div class="box-header">{Lang::T('Balance Plans')}</div>
                <div class="box-body row">
                    {foreach $plans_balance as $plan}
                        <div class="col col-md-4">
                            <div class="box box-solid box-default">
-                                <div class="box-header">{$plan['name_plan']}</div>
+                                <div class="box-header text-bold">{$plan['name_plan']}</div>
                                <div class="table-responsive">
                                    <table class="table table-bordered table-striped">
                                        <tbody>
@ -33,108 +33,116 @@
                    {/foreach}
                </div>
            </div>
-
-            <div class="box box-solid box-success">
-                <div class="box-header text-center text-bold">{Lang::T('Balance')} {Lang::moneyFormat($_user['balance'])}</div>
-            </div>
        {/if}
        {foreach $routers as $router}
-            <div class="box box-solid box-info">
-                <div class="box-header text-black">{$router['name']}</div>
-                {if $router['description'] != ''}
-                    <div class="box-body">
-                        {$router['description']}
-                    </div>
-                {/if}
-                {if count($plans_hotspot)>0}
-                    <div class="box-header">Hotspot</div>
-                    <div class="box-body row">
-                        {foreach $plans_hotspot as $plan}
-                            {if $router['name'] eq $plan['routers']}
-                                <div class="col col-md-4">
-                                    <div class="box box-solid box-default">
-                                        <div class="box-header">{$plan['name_plan']}</div>
-                                        <div class="table-responsive">
-                                            <table class="table table-bordered table-striped">
-                                                <tbody>
-                                                    <tr>
-                                                        <td>{Lang::T('Type')}</td>
-                                                        <td>{$plan['type']}</td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td>{Lang::T('Price')}</td>
-                                                        <td>{Lang::moneyFormat($plan['price'])}</td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td>{Lang::T('Validity')}</td>
-                                                        <td>{$plan['validity']} {$plan['validity_unit']}</td>
-                                                    </tr>
-                                                </tbody>
-                                            </table>
-                                        </div>
-                                        <div class="box-body">
-                                            <div class="btn-group btn-group-justified" role="group" aria-label="...">
-                                                <a href="{$_url}order/buy/{$router['id']}/{$plan['id']}"
-                                                    onclick="return confirm('{Lang::T('Buy this? your active package will be overwrite')}')"
-                                                    class="btn btn-sm btn-block btn-warning text-black">Buy</a>
-                                                {if $_c['enable_balance'] == 'yes' && $_user['balance']>=$plan['price']}
-                                                    <a href="{$_url}order/pay/{$router['id']}/{$plan['id']}"
-                                                        onclick="return confirm('{Lang::T('Pay this with Balance? your active package will be overwrite')}')"
-                                                        class="btn btn-sm btn-block btn-success">{Lang::T('Pay With Balance')}</a>
+            {if Validator::isRouterHasPlan($plans_hotspot, $router['name']) || Validator::isRouterHasPlan($plans_pppoe, $router['name'])}
+                <div class="box box-solid box-info bg-gray-light">
+                    <div class="box-header text-black text-bold">{$router['name']}</div>
+                    {if $router['description'] != ''}
+                        <div class="box-body">
+                            {$router['description']}
+                        </div>
+                    {/if}
+                    {if Validator::countRouterPlan($plans_hotspot, $router['name'])>0}
+                        <div class="box-header text-black">{Lang::T('Hotspot Plan')}</div>
+                        <div class="box-body row">
+                            {foreach $plans_hotspot as $plan}
+                                {if $router['name'] eq $plan['routers']}
+                                    <div class="col col-md-4">
+                                        <div class="box box-primary">
+                                            <div class="box-header text-bold">{$plan['name_plan']}</div>
+                                            <div class="table-responsive">
+                                                <table class="table table-bordered table-striped">
+                                                    <tbody>
+                                                        <tr>
+                                                            <td>{Lang::T('Type')}</td>
+                                                            <td>{$plan['type']}</td>
+                                                        </tr>
+                                                        <tr>
+                                                            <td>{Lang::T('Price')}</td>
+                                                            <td>{Lang::moneyFormat($plan['price'])}</td>
+                                                        </tr>
+                                                        <tr>
+                                                            <td>{Lang::T('Validity')}</td>
+                                                            <td>{$plan['validity']} {$plan['validity_unit']}</td>
+                                                        </tr>
+                                                    </tbody>
+                                                </table>
+                                            </div>
+                                            <div class="box-body">
+                                                <div class="btn-group btn-group-justified" role="group" aria-label="...">
+                                                    <a href="{$_url}order/buy/{$router['id']}/{$plan['id']}"
+                                                        onclick="return confirm('{Lang::T('Buy this? your active package will be overwrite')}')"
+                                                        class="btn btn-sm btn-block btn-warning text-black">Buy</a>
+                                                    {if $_c['enable_balance'] == 'yes' && $_user['balance']>=$plan['price']}
+                                                        <a href="{$_url}order/pay/{$router['id']}/{$plan['id']}"
+                                                            onclick="return confirm('{Lang::T('Pay this with Balance? your active package will be overwrite')}')"
+                                                            class="btn btn-sm btn-block btn-success">{Lang::T('Pay With Balance')}</a>
+                                                    {/if}
+                                                </div>
+                                                {if $_c['enable_balance'] == 'yes' && $_c['allow_balance_transfer'] == 'yes' && $_user['balance']>=$plan['price']}
+                                                    <a href="{$_url}order/send/{$router['id']}/{$plan['id']}"
+                                                        onclick="return confirm('{Lang::T('Buy this for friend account?')}')"
+                                                        class="btn btn-sm btn-block btn-primary">{Lang::T('Buy for friend')}</a>
                                                {/if}
                                            </div>
                                        </div>
                                    </div>
-                                </div>
-                            {/if}
-                        {/foreach}
-                    </div>
-                {/if}
-                {if count($plans_pppoe)>0}
-                    <div class="box-header text-sm">PPPOE</div>
-                    <div class="box-body row">
-                        {foreach $plans_pppoe as $plan}
-                            {if $router['name'] eq $plan['routers']}
-                                <div class="col col-md-4">
-                                    <div class="box box-solid box-default">
-                                        <div class="box-header">{$plan['name_plan']}</div>
-                                        <div class="table-responsive">
-                                            <table class="table table-bordered table-striped">
-                                                <tbody>
-                                                    <tr>
-                                                        <td>{Lang::T('Type')}</td>
-                                                        <td>{$plan['type']}</td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td>{Lang::T('Price')}</td>
-                                                        <td>{Lang::moneyFormat($plan['price'])}</td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td>{Lang::T('Validity')}</td>
-                                                        <td>{$plan['validity']} {$plan['validity_unit']}</td>
-                                                    </tr>
-                                                </tbody>
-                                            </table>
-                                        </div>
-                                        <div class="box-body">
-                                            <div class="btn-group btn-group-justified" role="group" aria-label="...">
-                                                <a href="{$_url}order/buy/{$router['id']}/{$plan['id']}"
-                                                    onclick="return confirm('{Lang::T('Buy this? your active package will be overwrite')}')"
-                                                    class="btn btn-sm btn-block btn-warning text-black">Buy</a>
-                                                {if $_c['enable_balance'] == 'yes' && $_user['balance']>=$plan['price']}
-                                                    <a href="{$_url}order/pay/{$router['id']}/{$plan['id']}"
-                                                        onclick="return confirm('{Lang::T('Pay this with Balance? your active package will be overwrite')}')"
-                                                        class="btn btn-sm btn-block btn-success">{Lang::T('Pay With Balance')}</a>
+                                {/if}
+                            {/foreach}
+                        </div>
+                    {/if}
+                    {if Validator::countRouterPlan($plans_pppoe,$router['name'])>0}
+                        <div class="box-header text-black">{Lang::T('PPPOE Plan')}</div>
+                        <div class="box-body row">
+                            {foreach $plans_pppoe as $plan}
+                                {if $router['name'] eq $plan['routers']}
+                                    <div class="col col-md-4">
+                                        <div class="box box- box-primary">
+                                            <div class="box-header text-bold">{$plan['name_plan']}</div>
+                                            <div class="table-responsive">
+                                                <table class="table table-bordered table-striped">
+                                                    <tbody>
+                                                        <tr>
+                                                            <td>{Lang::T('Type')}</td>
+                                                            <td>{$plan['type']}</td>
+                                                        </tr>
+                                                        <tr>
+                                                            <td>{Lang::T('Price')}</td>
+                                                            <td>{Lang::moneyFormat($plan['price'])}</td>
+                                                        </tr>
+                                                        <tr>
+                                                            <td>{Lang::T('Validity')}</td>
+                                                            <td>{$plan['validity']} {$plan['validity_unit']}</td>
+                                                        </tr>
+                                                    </tbody>
+                                                </table>
+                                            </div>
+                                            <div class="box-body">
+                                                <div class="btn-group btn-group-justified" role="group" aria-label="...">
+                                                    <a href="{$_url}order/buy/{$router['id']}/{$plan['id']}"
+                                                        onclick="return confirm('{Lang::T('Buy this? your active package will be overwrite')}')"
+                                                        class="btn btn-sm btn-block btn-warning text-black">Buy</a>
+                                                    {if $_c['enable_balance'] == 'yes' && $_user['balance']>=$plan['price']}
+                                                        <a href="{$_url}order/pay/{$router['id']}/{$plan['id']}"
+                                                            onclick="return confirm('{Lang::T('Pay this with Balance? your active package will be overwrite')}')"
+                                                            class="btn btn-sm btn-block btn-success">{Lang::T('Pay With Balance')}</a>
+                                                    {/if}
+                                                </div>
+                                                {if $_c['enable_balance'] == 'yes' && $_c['allow_balance_transfer'] == 'yes' && $_user['balance']>=$plan['price']}
+                                                    <a href="{$_url}order/send/{$router['id']}/{$plan['id']}"
+                                                        onclick="return confirm('{Lang::T('Buy this for friend account?')}')"
+                                                        class="btn btn-sm btn-block btn-primary">{Lang::T('Buy for friend')}</a>
                                                {/if}
                                            </div>
                                        </div>
                                    </div>
-                                </div>
-                            {/if}
-                        {/foreach}
-                    </div>
-                {/if}
-            </div>
+                                {/if}
+                            {/foreach}
+                        </div>
+                    {/if}
+                </div>
+            {/if}
        {/foreach}
    </div>
 </div>
--- a/ui/ui/user-sendPlan.tpl
+++ b/ui/ui/user-sendPlan.tpl
@ -0,0 +1,43 @@
+{include file="sections/user-header.tpl"}
+<!-- user-orderView -->
+<div class="row">
+    <div class="col-md-3"></div>
+    <div class="col-md-6">
+        <div class="box box-solid box-default">
+            <div class="box-header">{$plan['name_plan']}</div>
+            <div class="table-responsive">
+                <table class="table table-bordered table-striped">
+                    <tbody>
+                        <tr>
+                            <td>{Lang::T('Type')}</td>
+                            <td>{$plan['type']}</td>
+                        </tr>
+                        <tr>
+                            <td>{Lang::T('Price')}</td>
+                            <td>{Lang::moneyFormat($plan['price'])}</td>
+                        </tr>
+                        <tr>
+                            <td>{Lang::T('Validity')}</td>
+                            <td>{$plan['validity']} {$plan['validity_unit']}</td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+            <div class="box-footer">
+                <form method="post" onsubmit="return askConfirm()" role="form">
+                    <div class="form-group">
+                        <div class="col-sm-9">
+                            <input type="text" id="username" name="username" class="form-control" required value="{$username}"
+                                placeholder="{$_L['Username']}">
+                        </div>
+                        <div class="form-group col-sm-3" align="center">
+                            <button class="btn btn-success btn-block" id="sendBtn" type="submit" name="send" onclick="return confirm('{Lang::T("Are You Sure?")}')"
+                                value="plan"><i class="glyphicon glyphicon-send"></i></button>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+</div>
+{include file="sections/user-footer.tpl"}
--- a/ui/ui/voucher.tpl
+++ b/ui/ui/voucher.tpl
@ -49,16 +49,19 @@
                        </thead>
                        <tbody>
                            {foreach $d as $ds}
-                                <tr>
+                                <tr {if $ds['status'] eq '1'}class="danger"{/if}>
                                    <td>{$ds['id']}</td>
                                    <td>{$ds['type']}</td>
                                    <td>{$ds['routers']}</td>
                                    <td>{$ds['name_plan']}</td>
-                                    <td><span style="background-color: black; color:black;">{$ds['code']}</span></td>
-                                    <td align="center">{if $ds['status'] eq '0'} <label class="btn-tag btn-tag-success">Not
+                                    <td width="10px"><input type="password" value="{$ds['code']}"
+                                            style="width:120px;border: 0px; text-align: right;" class="pull-right"
+                                            onmouseleave="this.type = 'password'" onmouseenter="this.type = 'text'"
+                                            onclick="this.select()"></td>
+                            <td align="center">{if $ds['status'] eq '0'} <label class="btn-tag btn-tag-success">Not
                                            Use</label> {else} <label class="btn-tag btn-tag-danger">Used</label>
                                        {/if}</td>
-                                    <td align="center">{if $ds['user'] eq '0'} - {else} {$ds['user']} {/if}</td>
+                                    <td align="center">{if $ds['user'] eq '0'} - {else}<a href="{$_url}customers/viewu/{$ds['user']}">{$ds['user']}</a>{/if}</td>
                                    <td>
                                        <a href="{$_url}prepaid/voucher-delete/{$ds['id']}" id="{$ds['id']}"
                                            class="btn btn-danger btn-xs"
--- a/update.php
+++ b/update.php
@ -208,7 +208,7 @@ function deleteFolder($path)
    <div class="container">
        <section class="content-header">
            <h1 class="text-center">
-                Update PHP NuxBill
+                Update PHPNuxBill
            </h1>
        </section>

--- a/version.json
+++ b/version.json
@ -1,3 +1,3 @@
 {
-    "version": "2023.8.24"
+    "version": "2023.9.21"
 }
Author	SHA1	Message	Date
Ibnu Maksum	106aaf827f	Modal Privacy and Toc	2023-09-21 16:36:43 +07:00
Ibnu Maksum	c51f04747d	User extend plan	2023-09-21 16:04:18 +07:00
Ibnu Maksum	97a5c54e24	loading gif	2023-09-21 14:54:00 +07:00
Ibnu Maksum	04fcd77da0	red text for expired date	2023-09-21 14:14:33 +07:00
Ibnu Maksum	4df15819dd	User can deactivate package	2023-09-21 14:12:49 +07:00
Ibnu Maksum	caad968655	space in balance	2023-09-21 13:51:50 +07:00
Ibnu Maksum	1832332d99	show plan by nux-router	2023-09-21 13:45:28 +07:00
Ibnu Maksum	c9eeefcf3d	check if router has plan	2023-09-21 12:09:13 +07:00
Ibnu Maksum	c5b96df43f	add nux-router	2023-09-21 12:09:03 +07:00
Ibnu Maksum	529b9c84bd	PageFile	2023-09-20 15:13:17 +07:00
Ibnu Maksum	56bcbd810e	2023.9.20	2023-09-20 14:32:53 +07:00
Ibnu Maksum	c3fd8536eb	if not exists, copy	2023-09-20 14:27:15 +07:00
Ibnu Maksum	6acc342b26	Privacy and ToC not hidden	2023-09-18 15:07:08 +07:00
Ibnu Maksum	e59bf71230	Add Privacy Policy and Terms of Condition	2023-09-18 15:03:25 +07:00
Ibnu Maksum	b98d0b230d	click to view customer from voucher list	2023-09-18 13:56:11 +07:00
Ibnu Maksum	00cc448230	change password view	2023-09-18 13:55:52 +07:00
Ibnu Maksum	58d5ca7040	change recharge link	2023-09-18 13:35:27 +07:00
Ibnu Maksum	e88c678f2f	Merge branch 'Development'	2023-09-15 15:25:36 +07:00
Ibnu Maksum	eca64ef81e	add hide password	2023-09-15 15:16:47 +07:00
Ibnu Maksum	3c711115ec	remove sample	2023-09-15 14:17:04 +07:00
Ibnu Maksum	d4bffaf220	Sync Active Plan	2023-09-15 14:15:43 +07:00
Ibnu Maksum	f69885d358	sync hotspot to mikrotik	2023-09-15 14:03:23 +07:00
Ibnu Maksum	50ab20e68e	sync pppoe to mikrotik	2023-09-15 14:03:16 +07:00
Ibnu Maksum	e494570807	sync pool to Mikrotik	2023-09-15 13:34:56 +07:00
Ibnu Maksum	b0cb79eeac	2023.9.15	2023-09-15 12:13:12 +07:00
Ibnu Maksum	95a8eaeadb	recharge customer from profile	2023-09-15 11:57:07 +07:00
Ibnu Maksum	aab2282e78	red is off	2023-09-15 11:56:52 +07:00
Ibnu Maksum	609cf4b69d	Sync Customer to mikrotik	2023-09-15 11:33:46 +07:00
Ibnu Maksum	84cd66ea9a	add recharge link	2023-09-15 11:33:06 +07:00
Ibnu Maksum	3142e93d52	Fix Balance Header	2023-09-15 09:25:55 +07:00
Ibnu Maksum	6102637d7b	Fix checking package	2023-09-14 17:03:27 +07:00
Ibnu Maksum	c754338599	hide backup	2023-09-14 14:28:44 +07:00
Ibnu Maksum	a85ccf06fa	check error Database	2023-09-14 13:53:28 +07:00
Ibnu Maksum	e64527cee2	Show some error page when crash	2023-09-14 13:45:35 +07:00
Ibnu Maksum	fc5aa083a1	2023.9.13	2023-09-13 17:31:47 +07:00
Ibnu Maksum	53eb817de4	Add Balance to notification	2023-09-13 16:23:51 +07:00
Ibnu Maksum	309bbc0059	fix customer count	2023-09-13 15:50:20 +07:00
Ibnu Maksum	5fc2190f4a	show customer package instead active only	2023-09-13 15:50:12 +07:00
Ibnu Maksum	f292da9d8d	send package to friend	2023-09-13 15:38:56 +07:00
Ibnu Maksum	28fcabd1fd	Balance on Top	2023-09-13 14:04:13 +07:00
Ibnu Maksum	4bbb98fb98	check if connection error	2023-09-13 10:07:58 +07:00
Ibnu Maksum	ee2e67f490	add proxy to connection	2023-09-13 10:00:26 +07:00
Ibnu Maksum	e3ec8b18fa	Remove User before Remove Active User	2023-09-13 09:37:05 +07:00
Ibnu Maksum	f396d7183b	add name to invoice notification	2023-09-11 16:26:41 +07:00
Ibnu Maksum	b5ddf37649	using Http::getData instead file_get_contents	2023-09-11 14:26:58 +07:00
Ibnu Maksum	c57bbeace3	show user active	2023-09-07 10:54:20 +07:00
Ibnu Maksum	eeae60d88e	show mac and IP	2023-09-07 09:42:28 +07:00
Ibnu Maksum	14ed0236d0	Remove active user Before remove user	2023-09-07 09:35:00 +07:00
Ibnu Maksum	3833afb3be	Fix delete PPPOE	2023-09-07 09:20:31 +07:00
Ibnu Maksum	593ca31f18	pool_expired in SQL Instalation	2023-09-06 11:52:09 +07:00
Ibnu Maksum	7cc8d6f5e3	delete debug script	2023-09-06 11:25:13 +07:00
Ibnu Maksum	11a2fb8fc0	2023.9.6	2023-09-06 10:57:54 +07:00
Ibnu Maksum	537623130c	Fix expired pool in pppoe	2023-09-06 10:55:28 +07:00
Ibnu Maksum	910be1946b	Fix cron can move plan	2023-09-06 10:48:52 +07:00
Ibnu Maksum	e23abc1377	move user to expired profile when expired if set	2023-09-06 10:02:31 +07:00
Ibnu Maksum	b912dd05d0	Set expired plan	2023-09-05 17:06:43 +07:00
Ibnu Maksum	5c9a0d8ea6	Expired IP Pool Hotspot/PPPOE	2023-09-05 16:40:23 +07:00
Ibnu Maksum	b7eca582a6	Not using tbl_language anymore	2023-09-05 15:25:41 +07:00
Ibnu Maksum	b460e862e8	fix git ignore	2023-09-01 16:43:53 +07:00
Ibnu Maksum	a33705c0c4	Fix Text Cron	2023-09-01 14:03:02 +07:00
Ibnu Maksum	183a5ab242	Fix Reminder text	2023-09-01 13:56:14 +07:00
Ibnu Maksum	04c480cafa	Fix cronjob Delete customer	2023-09-01 13:40:26 +07:00
Ibnu Maksum	8be8737236	2023.9.1	2023-09-01 09:21:35 +07:00
Ibnu Maksum	a8515b7d60	Fix Username in user dashboard	2023-09-01 09:18:17 +07:00
Ibnu Maksum	d71eb37f48	add Cancel Button in user dashboard	2023-09-01 09:16:40 +07:00
Ibnu Maksum	8fcca70ead	Time will not change while extending package	2023-09-01 09:06:00 +07:00
Ibnu Maksum	59f6c180cf	Critical Fix extending user package	2023-09-01 09:02:39 +07:00
Ibnu Maksum	d53c4cf8c8	Best	2023-08-30 15:14:18 +07:00
Ibnu Maksum	620bfaeb29	unlink after upload	2023-08-30 11:24:08 +07:00
Ibnu Maksum	863dd65145	remove debug echo	2023-08-30 10:22:58 +07:00
Ibnu Maksum	4de849fe34	2023.8.30	2023-08-30 10:06:04 +07:00
Ibnu Maksum	18d68d68c8	fix time, using text	2023-08-30 10:02:58 +07:00
Ibnu Maksum	1b15da5c04	Upload Logo For PDF Reports	2023-08-30 09:55:39 +07:00
Ibnu Maksum	51416626fb	Fix Print Invoice	2023-08-30 09:01:37 +07:00
Ibnu Maksum	5a10c19853	PHP NuxBill -> PHPNuxBill	2023-08-28 15:46:25 +07:00
Ibnu Maksum	44cdd8f594	info about PHPNuxBill	2023-08-28 15:45:47 +07:00
Ibnu Maksum	00cf90e6ea	auto rename pages_example	2023-08-28 15:23:23 +07:00
Ibnu Maksum	341e26f4d6	rename pages	2023-08-28 15:21:57 +07:00
Ibnu Maksum	717b21e65e	Fix Remove PPPOE user	2023-08-28 10:38:59 +07:00
Ibnu Maksum	d0cebe7458	2023.8.28	2023-08-28 10:27:31 +07:00
Ibnu Maksum	6dadb7040c	Merge branch 'hotfix/calendar'	2023-08-28 10:24:06 +07:00
Ibnu Maksum	fe1310bd57	extend expiration after buy same package	2023-08-28 10:23:54 +07:00
Ibnu Maksum	1dd03168f0	Fix time Field	2023-08-28 10:12:55 +07:00
Ibnu Maksum	3eefec6e21	if enable_balance and allow_balance_transfer	2023-08-28 09:47:04 +07:00
Ibnu Maksum	3b4e3c7789	fix allow_balance_transfer in customer home	2023-08-28 09:46:19 +07:00
Ibnu Maksum	b4f5cf8954	Fix Recharge time	2023-08-28 09:44:57 +07:00
Ibnu Maksum	51ac162642	Fix date field	2023-08-28 08:57:33 +07:00
Ibnu Maksum	d680548eba	recharged_on datetime	2023-08-28 08:57:08 +07:00
Ibnu Maksum	cad57760bd	Fix expiration date at view user	2023-08-24 15:12:31 +07:00
Ibnu Maksum	d51edefc10	Merge branch 'hotfix/2023.8.24.1'	2023-08-24 14:46:55 +07:00
Ibnu Maksum	faab21bccf	fix sending money	2023-08-24 14:46:38 +07:00
iBNu Maksum	19d5daf5b8	Merge pull request #14 from hotspotbilling/Development 2023.8.24	2023-08-24 13:34:01 +07:00
iBNu Maksum	2431aa2eb5	Merge pull request #13 from hotspotbilling/Development From version 2023.8.1 need to run update twice or update Database in step 4	2023-08-16 13:49:41 +07:00
iBNu Maksum	8cb277f6d2	Merge pull request #12 from hotspotbilling/Development Update with Balance System	2023-08-15 10:42:47 +07:00
iBNu Maksum	11b54bdcc5	Merge pull request #11 from hotspotbilling/Development Add self Update Script	2023-08-01 16:30:31 +07:00
iBNu Maksum	6aa4fe8b96	Merge pull request #10 from hotspotbilling/Development - Fix link buy Voucher - Add email field to registration form - Change registration design Form - Add Setting to disable Voucher - Fix Title for PPPOE plans - Fix Plugin Cache	2023-07-28 01:44:32 -07:00
iBNu Maksum	670223f7e2	Version 2023.6.20 - hide package start time Version 2023.6.20	2023-06-21 09:35:08 +07:00
iBNu Maksum	c3f1df05b8	Fixing start time package	2023-06-20 14:18:10 +07:00
iBNu Maksum	877c7a29f0	Merge pull request #7 from hotspotbilling/Development Remove unused	2023-06-16 09:28:44 +07:00
iBNu Maksum	44084a764c	Merge pull request #6 from hotspotbilling/Development Version 2023.6.15	2023-06-16 09:18:24 +07:00