Modal Privacy and Toc

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 # 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

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();

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;
+    }
+
 }

system/controllers/customers.php

@@ -75,6 +75,8 @@ switch ($action) {
             $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');

system/controllers/dashboard.php

@@ -50,7 +50,7 @@ if (empty($c_all)) {
 $ui->assign('c_all', $c_all);
 
 //user expire
-$expire = ORM::for_table('tbl_user_recharges')->where('expiration', $mdate)->order_by_desc('id')->find_many();
+$expire = ORM::for_table('tbl_user_recharges')->whereLte('expiration', $mdate)->order_by_desc('id')->limit(30)->find_many();
 $ui->assign('expire', $expire);
 
 //activity log

system/controllers/home.php

@@ -90,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']);

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);

system/lan/english/common.lan.php

@@ -402,3 +402,4 @@ $_L['Activate'] = 'Activate';
 $_L['Deactivate'] = 'Deactivate';
 $_L['Sync'] = 'Sync';
 $_L['Failed_to_create_PaymeTrust_transaction'] = 'Failed to create PaymeTrust transaction.';
+$_L['Location'] = 'Location';

ui/ui/page-edit.tpl

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

ui/ui/register-otp.tpl

@@ -105,9 +105,9 @@
                                 </div>
                                 <br>
                                 <center>
-                                    <a href="./pages/Privacy_Policy.html" target="_blank">Privacy</a>
+                                    <a href="javascript:showPrivacy()">Privacy</a>
                                     &bull;
-                                    <a href="./pages/Terms_and_Conditions.html" target="_blank">T &amp; C</a>
+                                    <a href="javascript:showTaC()">T &amp; C</a>
                                 </center>
                             </div>
                         </div>
@@ -116,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">
@@ -133,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>

ui/ui/register-rotp.tpl

@@ -80,9 +80,9 @@
                             </div>
                             <br>
                             <center>
-                                <a href="./pages/Privacy_Policy.html" target="_blank">Privacy</a>
+                                <a href="javascript:showPrivacy()">Privacy</a>
                                 &bull;
-                                <a href="./pages/Terms_and_Conditions.html" target="_blank">T &amp; C</a>
+                                <a href="javascript:showTaC()">T &amp; C</a>
                             </center>
                         </div>
                     </div>
@@ -90,6 +90,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">
@@ -107,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>

ui/ui/register.tpl

@@ -96,9 +96,9 @@
                                 </div>
                                 <br>
                                 <center>
-                                    <a href="./pages/Privacy_Policy.html" target="_blank">Privacy</a>
+                                    <a href="javascript:showPrivacy()">Privacy</a>
                                     &bull;
-                                    <a href="./pages/Terms_and_Conditions.html" target="_blank">T &amp; C</a>
+                                    <a href="javascript:showTaC()">T &amp; C</a>
                                 </center>
                             </div>
                         </div>
@@ -107,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">
@@ -124,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>

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}

ui/ui/scripts/custom.js

@@ -104,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')
+    });
+}

ui/ui/sections/footer.tpl

@@ -1,41 +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"});
-});
+                $(document).ready(function() {
+                    $('.select2tag').select2({theme: "bootstrap", tags: true});
+                });
 
-$(document).ready(function() {
-    $('.select2tag').select2({theme: "bootstrap", tags: true});
-});
+                var listAtts = document.querySelectorAll(`[api-get-text]`);
+                listAtts.forEach(function(el) {
+                    $.get(el.getAttribute('api-get-text'), function(data) {
+                        el.innerHTML = data;
+                    });
+                });
+            </script>
+        {/literal}
 
-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>
+        </body>
 
 </html>

ui/ui/sections/user-footer.tpl

@@ -4,9 +4,9 @@
             <footer class="main-footer">
                 {$_c['CompanyFooter']}
                 <div class="pull-right">
-                    <a href="./pages/Privacy_Policy.html" target="_blank">Privacy</a>
+                    <a href="javascript:showPrivacy()">Privacy</a>
                     &bull;
-                    <a href="./pages/Terms_of_Conditions.html" target="_blank">ToC</a>
+                    <a href="javascript:showTaC()">T &amp; C</a>
                 </div>
             </footer>
         {else}
@@ -14,21 +14,40 @@
                 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="./pages/Privacy_Policy.html" target="_blank">Privacy</a>
-                        &bull;
-                        <a href="./pages/Terms_of_Conditions.html" target="_blank">ToC</a>
-                    </div>
+                <div class="pull-right">
+                    <a href="javascript:showPrivacy()">Privacy</a>
+                    &bull;
+                    <a href="javascript:showTaC()">T &amp; C</a>
+                </div>
             </footer>
         {/if}
         </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>
+
+
+
         <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/custom.js?v=2"></script>
 
         {if isset($xfooter)}
             {$xfooter}

ui/ui/sections/user-header.tpl

@@ -61,7 +61,7 @@
                         <li class="dropdown user user-menu">
                             <a href="#" class="dropdown-toggle" data-toggle="dropdown">
                                 {if $_c['enable_balance'] == 'yes'}
-                                    <span style="color: whitesmoke;">{Lang::moneyFormat($_user['balance'])}</span>
+                                    <span style="color: whitesmoke;">&nbsp;{Lang::moneyFormat($_user['balance'])}&nbsp;</span>
                                 {else}
                                     <span>{$_user['fullname']}</span>
                                 {/if}

ui/ui/user-dashboard.tpl

@@ -70,9 +70,8 @@
                 <tr>
                     <td class="small text-success text-uppercase text-normal">{$_L['Password']}</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>
+                            style="width:100%; border: 0px;" onmouseleave="this.type = 'password'"
+                            onmouseenter="this.type = 'text'" onclick="this.select()"></td>
                 </tr>
                 {if $_c['enable_balance'] == 'yes'}
                     <tr>
@@ -89,41 +88,58 @@
                         </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 ''}{Lang::dateAndTimeFormat($_bill['recharged_on'],$_bill['recharged_time'])}
-                        {/if}&nbsp;</td>
-                </tr>
-                <tr>
-                    <td class="small text-danger text-uppercase text-normal">{$_L['Expires_On']}</td>
-                    <td class="small mb15">
-                        {if $_bill['time'] ne ''}{Lang::dateAndTimeFormat($_bill['expiration'],$_bill['time'])}{/if}&nbsp;
-                    </td>
-                </tr>
-                {if $nux_ip}
+                {if $_bill}
                     <tr>
-                        <td class="small text-primary text-uppercase text-normal">{Lang::T('Current IP')}</td>
-                        <td class="small mb15">{$nux_ip}</td>
+                        <td class="small text-primary text-uppercase text-normal">{strtoupper(Lang::T('Location'))}</td>
+                        <td class="small mb15">{$_bill['routers']}</td>
                     </tr>
-                {/if}
-                {if $nux_mac}
                     <tr>
-                        <td class="small text-primary text-uppercase text-normal">{Lang::T('Current MAC')}</td>
-                        <td class="small mb15">{$nux_mac}</td>
-                    </tr>
-                {/if}
-                {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">
-                            Loading....
+                        <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>
+                            <td class="small mb15">{$nux_ip}</td>
+                        </tr>
+                    {/if}
+                    {if $nux_mac}
+                        <tr>
+                            <td class="small text-primary text-uppercase text-normal">{Lang::T('Current MAC')}</td>
+                            <td class="small mb15">{$nux_mac}</td>
+                        </tr>
+                    {/if}
+                    {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'}

ui/ui/user-login.tpl

@@ -79,9 +79,9 @@
                             </div>
                             <br>
                             <center>
-                                <a href="./pages/Privacy_Policy.html" target="_blank">Privacy</a>
+                                <a href="javascript:showPrivacy()">Privacy</a>
                                 &bull;
-                                <a href="./pages/Terms_and_Conditions.html" target="_blank">T &amp; C</a>
+                                <a href="javascript:showTaC()">T &amp; C</a>
                             </center>
                         </form>
                     </div>
@@ -89,7 +89,25 @@
             </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>

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>
@@ -35,112 +35,114 @@
             </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">{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-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>
-                                            {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>
-                            {/if}
-                        {/foreach}
-                    </div>
-                {/if}
-                {if count($plans_pppoe)>0}
-                    <div class="box-header text-sm">{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-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>
-                                            {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>
-                            {/if}
-                        {/foreach}
-                    </div>
-                {/if}
-            </div>
+                                {/if}
+                            {/foreach}
+                        </div>
+                    {/if}
+                </div>
+            {/if}
         {/foreach}
     </div>
 </div>

version.json

@@ -1,3 +1,3 @@
 {
-    "version": "2023.9.20"
+    "version": "2023.9.21"
 }