diff --git a/system/controllers/autoload.php b/system/controllers/autoload.php index c6e9b03c..e0920b5e 100644 --- a/system/controllers/autoload.php +++ b/system/controllers/autoload.php @@ -28,7 +28,10 @@ switch ($action) { $ui->assign('d', $d); $ui->display('autoload-pool.tpl'); break; - + case 'bw_name': + $bw = ORM::for_table('tbl_bandwidth')->select("name_bw")->find_one($routes['2']); + echo $bw['name_bw']; + die(); case 'server': $d = ORM::for_table('tbl_routers')->where('enabled', '1')->find_many(); $ui->assign('d', $d); diff --git a/system/controllers/autoload_user.php b/system/controllers/autoload_user.php index be1fc66b..3da9b5e2 100644 --- a/system/controllers/autoload_user.php +++ b/system/controllers/autoload_user.php @@ -45,6 +45,10 @@ switch ($action) { die('--'); } break; + case 'bw_name': + $bw = ORM::for_table('tbl_bandwidth')->select("name_bw")->find_one($routes['2']); + echo $bw['name_bw']; + die(); case 'inbox_unread': $count = ORM::for_table('tbl_customers_inbox')->where('customer_id', $user['id'])->whereRaw('date_read is null')->count('id'); if ($count > 0) { diff --git a/ui/ui/app-settings.tpl b/ui/ui/app-settings.tpl index 6979cdcd..bb09077e 100644 --- a/ui/ui/app-settings.tpl +++ b/ui/ui/app-settings.tpl @@ -62,7 +62,8 @@
- +
@@ -73,7 +74,8 @@
- -
@@ -184,7 +188,8 @@
- +

{Lang::T('Customer can request to extend expirations')}

@@ -273,9 +280,11 @@
@@ -331,7 +340,8 @@
- {Lang::T('Test SMS')} + {Lang::T('Test SMS')}
@@ -365,7 +375,8 @@

{Lang::T('You can use')} WhatsApp - {Lang::T('in here too.')} {Lang::T('Free Server')} + {Lang::T('in here too.')} {Lang::T('Free Server')}
@@ -386,11 +397,13 @@ {Lang::T('it will be replaced.')}
{Lang::T('You can use')} WhatsApp - {Lang::T('in here too.')} {Lang::T('Free Server')} + {Lang::T('in here too.')} {Lang::T('Free Server')}
- Test Email + Test + Email
@@ -546,7 +559,8 @@

{Lang::T('This Token will act as SuperAdmin/Admin')}

@@ -576,7 +590,7 @@
-
+
@@ -625,15 +639,16 @@
-

{Lang::T('If enabled, the system will notify Admin when router goes Offline, If admin have 10 or more router and many customers, it will get overlapping, you can disabled')} +

+ {Lang::T('If enabled, the system will notify Admin when router goes Offline, If admin have 10 or more router and many customers, it will get overlapping, you can disabled')}

@@ -642,7 +657,8 @@
@@ -671,7 +687,8 @@
@@ -692,6 +709,19 @@

{Lang::T('If user buy same internet plan, expiry date will extend')}

+
+ +
+ +
+

+ {Lang::T(' for Customer')}

+
@@ -919,4 +949,4 @@ add dst-host=*.{$_domain} document.getElementById("tax_rate").addEventListener("change", toggleCustomTaxRate); }); -{include file="sections/footer.tpl"} +{include file="sections/footer.tpl"} \ No newline at end of file diff --git a/ui/ui/recharge-confirm.tpl b/ui/ui/recharge-confirm.tpl index cf827feb..e9355f68 100644 --- a/ui/ui/recharge-confirm.tpl +++ b/ui/ui/recharge-confirm.tpl @@ -42,6 +42,10 @@ class="pull-right">{if $plan['prepaid'] eq 'yes'}Prepaid{else}Postpaid{/if} {$plan['type']} + + {Lang::T('Bandwidth')} + +
  • {Lang::T('Plan Price')} {if $using eq 'zero'}{Lang::moneyFormat(0)}{else}{Lang::moneyFormat($plan['price'])}{/if} diff --git a/ui/ui/user-ui/dashboard.tpl b/ui/ui/user-ui/dashboard.tpl index 65e24c39..bfccf1ea 100644 --- a/ui/ui/user-ui/dashboard.tpl +++ b/ui/ui/user-ui/dashboard.tpl @@ -4,52 +4,52 @@
    {if $unpaid } -
    -
    -

    {Lang::T('Unpaid Order')}

    -
    -
    - - - - - - - - - - - - - - - - - - - -
    {Lang::T('expired')}{Lang::dateTimeFormat($unpaid['expired_date'])}
    {Lang::T('Plan Name')}{$unpaid['plan_name']}
    {Lang::T('Plan Price')}{$unpaid['price']}
    {Lang::T('Routers')}{$unpaid['routers']}
      -
    -
    -
    -
    - - - {Lang::T('Cancel')} - -
    -
    - - - {Lang::T('PAY NOW')} - -
    +
    +
    +

    {Lang::T('Unpaid Order')}

    +
    + + + + + + + + + + + + + + + + + + + +
    {Lang::T('expired')}{Lang::dateTimeFormat($unpaid['expired_date'])}
    {Lang::T('Plan Name')}{$unpaid['plan_name']}
    {Lang::T('Plan Price')}{$unpaid['price']}
    {Lang::T('Routers')}{$unpaid['routers']}
      +
    +
    +
    +
    + + + {Lang::T('Cancel')} + +
    +
    + + + {Lang::T('PAY NOW')} + +
    +
    -
       -
    +
       +
    {/if}
    @@ -58,7 +58,7 @@
    {$Announcement_Customer = "{$PAGES_PATH}/Announcement_Customer.html"} {if file_exists($Announcement_Customer)} - {include file=$Announcement_Customer} + {include file=$Announcement_Customer} {/if}
    @@ -85,130 +85,132 @@ {Lang::T('Service Type')} {if $_user.service_type == 'Hotspot'} - Hotspot + Hotspot {elseif $_user.service_type == 'PPPoE'} - PPPoE + PPPoE {elseif $_user.service_type == 'VPN'} - VPN + VPN {elseif $_user.service_type == 'Others' || $_user.service_type == null} - Others + Others {/if} {if $_c['enable_balance'] == 'yes'} - - {Lang::T('Balance')} - - {Lang::moneyFormat($_user['balance'])} - {if $_user['auto_renewal'] == 1} - {Lang::T('Auto Renewal + + {Lang::T('Balance')} + + {Lang::moneyFormat($_user['balance'])} + {if $_user['auto_renewal'] == 1} + {Lang::T('Auto Renewal On')} - {else} - {Lang::T('Auto Renewal + {else} + {Lang::T('Auto Renewal Off')} - {/if} - - + {/if} + + {/if}   
    {if $abills && count($abills)>0} -
    -

    {Lang::T('Additional Billing')}

    -
    +
    +

    {Lang::T('Additional Billing')}

    +
    -
    - - {assign var="total" value=0} - {foreach $abills as $k => $v} - - - + + {/foreach} + + + + +
    {str_replace(' Bill', '', $k)} - {if strpos($v, ':') === false} - {Lang::moneyFormat($v)} - ∞ - {assign var="total" value=$v+$total} - {else} - {assign var="exp" value=explode(':',$v)} - {Lang::moneyFormat($exp[0])} - {if $exp[1]==0}{Lang::T('paid +
    + + {assign var="total" value=0} + {foreach $abills as $k => $v} + + + - - {/foreach} - - - - -
    {str_replace(' Bill', '', $k)} + {if strpos($v, ':') === false} + {Lang::moneyFormat($v)} + ∞ + {assign var="total" value=$v+$total} + {else} + {assign var="exp" value=explode(':',$v)} + {Lang::moneyFormat($exp[0])} + {if $exp[1]==0}{Lang::T('paid off')}{else}{$exp[1]}x{/if} - {if $exp[1]>0} - {assign var="total" value=$exp[0]+$total} - {/if} - {/if} -
    {Lang::T('Total')} - {if $total==0} - {ucwords(Lang::T('paid off'))} - {else} - {Lang::moneyFormat($total)} - {/if} -
    -
       + {if $exp[1]>0} + {assign var="total" value=$exp[0]+$total} + {/if} + {/if} +
    {Lang::T('Total')} + {if $total==0} + {ucwords(Lang::T('paid off'))} + {else} + {Lang::moneyFormat($total)} + {/if} +
    +
       {/if}
    {if $_bills} -
    - {foreach $_bills as $_bill} - {if $_bill['routers'] != 'radius'} -
    -

    {$_bill['routers']}

    -
    - {if $_bill['type'] == 'Hotspot'} - {if $_c['hotspot_plan']==''}Hotspot Plan{else}{$_c['hotspot_plan']}{/if} - {else if $_bill['type'] == 'PPPOE'} - {if $_c['pppoe_plan']==''}PPPOE Plan{else}{$_c['pppoe_plan']}{/if} - {else if $_bill['type'] == 'VPN'} - {if $_c['pppoe_plan']==''}VPN Plan{else}{$_c['vpn_plan']}{/if} +
    + {foreach $_bills as $_bill} + {if $_bill['routers'] != 'radius'} +
    +

    {$_bill['routers']}

    +
    + {if $_bill['type'] == 'Hotspot'} + {if $_c['hotspot_plan']==''}Hotspot Plan{else}{$_c['hotspot_plan']}{/if} + {else if $_bill['type'] == 'PPPOE'} + {if $_c['pppoe_plan']==''}PPPOE Plan{else}{$_c['pppoe_plan']}{/if} + {else if $_bill['type'] == 'VPN'} + {if $_c['pppoe_plan']==''}VPN Plan{else}{$_c['vpn_plan']}{/if} + {/if} +
    +
    + {else} +
    +

    {if $_c['radius_plan']==''}Radius Plan{else}{$_c['radius_plan']}{/if}

    +
    {/if} -
    -
    - {else} -
    -

    {if $_c['radius_plan']==''}Radius Plan{else}{$_c['radius_plan']}{/if}

    -
    - {/if} -
    - - - -
    {Lang::T('Plan Name')} - {$_bill['namebp']} - {if $_bill['status'] != 'on'} - {Lang::T('expired')} +
    + + + + + + {if $_c['show_bandwidth_plan'] == 'yes'} + + + + {/if} - - - - - - - - - - - - - + + + + + + @@ -219,36 +221,37 @@ {$_bill['plan_type']} - {if $_bill['type'] == 'VPN' && $_bill['routers'] == $vpn['routers']} - - - - - - - - - {foreach $cf as $tcf} - - {if $tcf['field_name'] == 'Winbox' or $tcf['field_name'] == 'Api' or $tcf['field_name'] == 'Web'} - - - - {/if} - {/foreach} - {/if} - + {if $_bill['type'] == 'VPN' && $_bill['routers'] == $vpn['routers']} + + + + + + + + + {foreach $cf as $tcf} + + {if $tcf['field_name'] == 'Winbox' or $tcf['field_name'] == 'Api' or $tcf['field_name'] == 'Web'} + + + + {/if} + {/foreach} + {/if} + {if $nux_ip neq ''} - - - - + + + + {/if} {if $nux_mac neq ''} - - - - + + + + {/if} {if $_bill['type'] == 'Hotspot' && $_bill['status'] == 'on' && $_bill['routers'] != 'radius' && $_c['hs_auth_method'] != 'hchap'} @@ -260,34 +263,34 @@ {/if} {if $_bill['type'] == 'Hotspot' && $_bill['status'] == 'on' && $_c['hs_auth_method'] == 'hchap'} - - - + + - + {else} + {Lang::T('Not Online, Login now?')} + {/if} + + {/if} + {if $_c['show_bandwidth_plan'] == 'yes'} + + + + + {/if} + {if $_c['show_bandwidth_plan'] == 'yes'} + + + + + {/if} + {if $_c['show_bandwidth_plan'] == 'yes'} + + + + + {/if} + {if $_c['show_bandwidth_plan'] == 'yes'} + + + + + {/if} + {if $_c['show_bandwidth_plan'] == 'yes'} + + + + + {/if} + {if $_c['show_bandwidth_plan'] == 'yes'} + + + + + {/if} + {if $_c['show_bandwidth_plan'] == 'yes'} + + + + + {/if} + {if $_c['show_bandwidth_plan'] == 'yes'} + + + + + {/if} + {if $_c['show_bandwidth_plan'] == 'yes'} + + + + + {/if} + {if $_c['show_bandwidth_plan'] == 'yes'} + + + + + {/if}
    {Lang::T('Plan Name')} + {$_bill['namebp']} + {if $_bill['status'] != 'on'} + {Lang::T('expired')} + {/if} +
    {Lang::T('Bandwidth')} + {$_bill['name_bw']} +
    {Lang::T('Bandwidth')} - {$_bill['name_bw']} -
    {Lang::T('Created On')} - {if $_bill['time'] ne - ''}{Lang::dateAndTimeFormat($_bill['recharged_on'],$_bill['recharged_time'])} - {/if} 
    {Lang::T('Expires On')} - {if $_bill['time'] ne +
    {Lang::T('Created On')} + {if $_bill['time'] ne + ''}{Lang::dateAndTimeFormat($_bill['recharged_on'],$_bill['recharged_time'])} + {/if} 
    {Lang::T('Expires On')} + {if $_bill['time'] ne ''}{Lang::dateAndTimeFormat($_bill['expiration'],$_bill['time'])}{/if} 
    {Lang::T('Public IP')}{$vpn['public_ip']} / {$vpn['port_name']}
    {Lang::T('Private IP')}{$_user['pppoe_ip']}
    {$tcf['field_name']} - Port{$tcf['field_value']}
    {Lang::T('Public IP')}{$vpn['public_ip']} / {$vpn['port_name']}
    {Lang::T('Private IP')}{$_user['pppoe_ip']}
    {$tcf['field_name']} - Port{$tcf['field_value']}
    {Lang::T('Current IP')}{$nux_ip}
    {Lang::T('Current IP')}{$nux_ip}
    {Lang::T('Current MAC')}{$nux_mac}
    {Lang::T('Current MAC')}{$nux_mac}
    {Lang::T('Login Status')} - {if $logged == '1'} - {Lang::T('You +
    {Lang::T('Login Status')} + {if $logged == '1'} + {Lang::T('You are Online, Check Status')} - {else} - {Lang::T('Not Online, Login now?')} - {/if} -
    {if $_bill['status'] == 'on'} - + {/if} {if $_bill['status'] != 'on' && $_bill['prepaid'] != 'yes' && $_c['extend_expired']} - {Lang::T('Extend')} + {Lang::T('Extend')} {/if} {/if} {if $_c['disable_voucher'] == 'yes'} -
    - {if $_c['payment_gateway'] != 'none' or $_c['payment_gateway'] == '' } - - - {Lang::T('Order Package')} - - {/if} -
    +
    + {if $_c['payment_gateway'] != 'none' or $_c['payment_gateway'] == '' } + + + {Lang::T('Order Package')} + + {/if} +
    {/if} {if $_bills} - {foreach $_bills as $_bill} - {if $_bill['type'] == 'Hotspot' && $_bill['status'] == 'on' && $_c['hs_auth_method'] != 'hchap'} - - {/if} - {/foreach} + {foreach $_bills as $_bill} + {if $_bill['type'] == 'Hotspot' && $_bill['status'] == 'on' && $_c['hs_auth_method'] != 'hchap'} + + {/if} + {/foreach} {/if} {if $_c['enable_balance'] == 'yes' && $_c['allow_balance_transfer'] == 'yes'} -
    -
    -

    {Lang::T("Transfer Balance")}

    -
    -
    -
    -
    -
    - +
    +
    +

    {Lang::T("Transfer Balance")}

    +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    -
    - -
    -
    - -
    -
    - - -
    -
    -

    {Lang::T("Recharge a friend")}

    -
    -
    -
    -
    -
    - + } + +
    +
    +

    {Lang::T("Recharge a friend")}

    +
    +
    + +
    +
    + +
    +
    + +
    -
    - -
    -
    - + +
    -
    {/if}
    {if $_c['disable_voucher'] != 'yes'} -
    -
    -

    {Lang::T('Voucher Activation')}

    -
    -
    -
    -
    - - - - - - - +
    +
    +

    {Lang::T('Voucher Activation')}

    +
    +
    + +
    + + + + + + + +
    + +
    +
    +
    + + + {Lang::T('Order Voucher')} + + {if $_c['payment_gateway'] != 'none' or $_c['payment_gateway'] == '' } + + + {Lang::T('Order Package')} + + {/if}
    - -
    -
    -
    - - - {Lang::T('Order Voucher')} - - {if $_c['payment_gateway'] != 'none' or $_c['payment_gateway'] == '' } - - - {Lang::T('Order Package')} - - {/if}
    -
    {/if}
    {if isset($hostname) && $hchap == 'true' && $_c['hs_auth_method'] == 'hchap'} - - + + {/if} {include file="user-ui/footer.tpl"} \ No newline at end of file diff --git a/ui/ui/user-ui/orderPlan.tpl b/ui/ui/user-ui/orderPlan.tpl index 27d366a8..ae068ea5 100644 --- a/ui/ui/user-ui/orderPlan.tpl +++ b/ui/ui/user-ui/orderPlan.tpl @@ -25,6 +25,12 @@
    		{Lang::T('Type')} {$plan['type']}
    {Lang::T('Bandwidth')}
    {Lang::T('Price')} {Lang::moneyFormat($plan['price'])} @@ -83,6 +89,12 @@ {Lang::T('Type')} {$plan['type']}
    {Lang::T('Bandwidth')}
    {Lang::T('Price')} {Lang::moneyFormat($plan['price'])} @@ -142,6 +154,12 @@ {Lang::T('Type')} {$plan['type']}
    {Lang::T('Bandwidth')}
    {Lang::T('Price')} {Lang::moneyFormat($plan['price'])} @@ -199,6 +217,12 @@ {Lang::T('Type')} {$plan['type']}
    {Lang::T('Bandwidth')}
    {Lang::T('Price')} {Lang::moneyFormat($plan['price'])} @@ -268,6 +292,12 @@ {Lang::T('Type')} {$plan['type']}
    {Lang::T('Bandwidth')}
    {Lang::T('Price')} {Lang::moneyFormat($plan['price'])} @@ -324,6 +354,12 @@ {Lang::T('Type')} {$plan['type']}
    {Lang::T('Bandwidth')}
    {Lang::T('Price')} {Lang::moneyFormat($plan['price'])} @@ -380,6 +416,12 @@ {Lang::T('Type')} {$plan['type']}
    {Lang::T('Bandwidth')}
    {Lang::T('Price')} {Lang::moneyFormat($plan['price'])} @@ -440,6 +482,12 @@ {Lang::T('Type')} {$plan['type']}
    {Lang::T('Bandwidth')}
    {Lang::T('Price')} {Lang::moneyFormat($plan['price'])} @@ -494,6 +542,12 @@ {Lang::T('Type')} {$plan['type']}
    {Lang::T('Bandwidth')}
    {Lang::T('Price')} {Lang::moneyFormat($plan['price'])} @@ -548,6 +602,12 @@ {Lang::T('Type')} {$plan['type']}
    {Lang::T('Bandwidth')}
    {Lang::T('Price')} {Lang::moneyFormat($plan['price'])}