diff --git a/system/controllers/customers.php b/system/controllers/customers.php
index c2c9c68c..f111fe0e 100644
--- a/system/controllers/customers.php
+++ b/system/controllers/customers.php
@@ -189,7 +189,9 @@ switch ($action) {
if (count($usings) == 0) {
$usings[] = Lang::T('Cash');
}
+ $abills = User::getAttributes("Bill");
$ui->assign('usings', $usings);
+ $ui->assign('abills', $abills);
$ui->assign('bills', $bills);
$ui->assign('add_cost', $add_cost);
$ui->assign('cust', $cust);
diff --git a/system/controllers/home.php b/system/controllers/home.php
index 20e1d1b6..9c6ddb87 100644
--- a/system/controllers/home.php
+++ b/system/controllers/home.php
@@ -101,7 +101,7 @@ $ui->assign('_bills', $_bill);
// Sync plan to router
if (isset($_GET['sync']) && !empty($_GET['sync'])) {
foreach ($_bill as $tur) {
- if($tur['status'] == 'on'){
+ if ($tur['status'] == 'on') {
$p = ORM::for_table('tbl_plans')->findOne($tur['plan_id']);
if ($p) {
$c = ORM::for_table('tbl_customers')->findOne($tur['customer_id']);
@@ -265,7 +265,7 @@ if (!empty($_SESSION['nux-mac']) && !empty($_SESSION['nux-ip'] && $_c['hs_auth_m
}
if (!empty($_SESSION['nux-mac']) && !empty($_SESSION['nux-ip'] && !empty($_SESSION['nux-hostname']) && $_c['hs_auth_method'] == 'hchap')) {
- $apkurl = (((!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'onoff')|| $_SERVER['SERVER_PORT'] == 443)?'https':'http').'://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+ $apkurl = (((!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'onoff') || $_SERVER['SERVER_PORT'] == 443) ? 'https' : 'http') . '://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
$ui->assign('nux_mac', $_SESSION['nux-mac']);
$ui->assign('nux_ip', $_SESSION['nux-ip']);
$keys = explode('-', $_SESSION['nux-key']);
@@ -276,23 +276,23 @@ if (!empty($_SESSION['nux-mac']) && !empty($_SESSION['nux-ip'] && !empty($_SESSI
$ui->assign('hchap', $_GET['hchap']);
$ui->assign('logged', $_GET['logged']);
if ($_app_stage != 'demo') {
- if ($_GET['mikrotik'] == 'login') {
- r2(U . 'home&hchap=true', 's', Lang::T('Login Request successfully'));
- }
- $getmsg = $_GET['msg'];
- ///get auth notification from mikrotik
- if($getmsg == 'Connected') {
- $msg .= Lang::T($getmsg);
- r2(U . 'home&logged=1', 's', $msg);
- } else if($getmsg){
- $msg .= Lang::T($getmsg);
- r2(U . 'home', 's', $msg);
- }
+ if ($_GET['mikrotik'] == 'login') {
+ r2(U . 'home&hchap=true', 's', Lang::T('Login Request successfully'));
+ }
+ $getmsg = $_GET['msg'];
+ ///get auth notification from mikrotik
+ if ($getmsg == 'Connected') {
+ $msg .= Lang::T($getmsg);
+ r2(U . 'home&logged=1', 's', $msg);
+ } else if ($getmsg) {
+ $msg .= Lang::T($getmsg);
+ r2(U . 'home', 's', $msg);
}
}
+}
if (!empty($_SESSION['nux-mac']) && !empty($_SESSION['nux-ip'] && !empty($_SESSION['nux-hostname']) && $_c['hs_auth_method'] == 'hchap')) {
- $apkurl = (((!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'onoff')|| $_SERVER['SERVER_PORT'] == 443)?'https':'http').'://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+ $apkurl = (((!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'onoff') || $_SERVER['SERVER_PORT'] == 443) ? 'https' : 'http') . '://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
$ui->assign('nux_mac', $_SESSION['nux-mac']);
$ui->assign('nux_ip', $_SESSION['nux-ip']);
$keys = explode('-', $_SESSION['nux-key']);
@@ -303,29 +303,29 @@ if (!empty($_SESSION['nux-mac']) && !empty($_SESSION['nux-ip'] && !empty($_SESSI
$ui->assign('hchap', $_GET['hchap']);
$ui->assign('logged', $_GET['logged']);
if ($_app_stage != 'demo') {
- if ($_GET['mikrotik'] == 'login') {
- r2(U . 'home&hchap=true', 's', Lang::T('Login Request successfully'));
- }
- $getmsg = $_GET['msg'];
- ///get auth notification from mikrotik
- if($getmsg == 'Connected') {
- $msg .= Lang::T($getmsg);
- r2(U . 'home&logged=1', 's', $msg);
- } else if($getmsg){
- $msg .= Lang::T($getmsg);
- r2(U . 'home', 's', $msg);
- }
+ if ($_GET['mikrotik'] == 'login') {
+ r2(U . 'home&hchap=true', 's', Lang::T('Login Request successfully'));
+ }
+ $getmsg = $_GET['msg'];
+ ///get auth notification from mikrotik
+ if ($getmsg == 'Connected') {
+ $msg .= Lang::T($getmsg);
+ r2(U . 'home&logged=1', 's', $msg);
+ } else if ($getmsg) {
+ $msg .= Lang::T($getmsg);
+ r2(U . 'home', 's', $msg);
}
}
-
+}
+
$tcf = ORM::for_table('tbl_customers_fields')
- ->where('customer_id', $user['id'])
- ->find_many();
+ ->where('customer_id', $user['id'])
+ ->find_many();
$vpn = ORM::for_table('tbl_port_pool')
- ->find_one();
-$ui->assign('cf', $tcf);
-$ui->assign('vpn', $vpn);
-
+ ->find_one();
+$ui->assign('cf', $tcf);
+$ui->assign('vpn', $vpn);
+
$ui->assign('unpaid', ORM::for_table('tbl_payment_gateway')
->where('username', $user['username'])
->where('status', 1)
diff --git a/ui/ui/recharge-confirm.tpl b/ui/ui/recharge-confirm.tpl
index 69131344..cf827feb 100644
--- a/ui/ui/recharge-confirm.tpl
+++ b/ui/ui/recharge-confirm.tpl
@@ -52,32 +52,58 @@
{Lang::T('Using')}
-
+
{Lang::T('Total')}
{if $using neq 'zero' and $add_cost != 0}
- {foreach $bills as $k => $v}
- -
- {$k} {Lang::moneyFormat($v)}
-
+ {foreach $abills as $k => $v}
+
+ {if strpos($v, ':') === false}
+ -
+ {$k}
+ {Lang::moneyFormat($v)}
+ ∞
+ {assign var="total" value=$v+$total}
+
+
+ {else}
+ {assign var="exp" value=explode(':',$v)}
+ {if $exp[1]>0}
+ -
+ {$k}
+ ({$exp[1]}x)
+ {Lang::moneyFormat($exp[0])}
+
+
+ {/if}
+ {/if}
{/foreach}
-
{Lang::T('Additional Cost')} {Lang::moneyFormat($add_cost)}
+ class="pull-right">{Lang::moneyFormat($add_cost)}
-
- {Lang::T('Total')} ({Lang::T('Plan Price')} +{Lang::T('Additional Cost')}){$plan['name_plan']} {if $using eq 'zero'}{Lang::moneyFormat(0)}{else}{Lang::moneyFormat($plan['price'])}{/if}
+
+ -
+ {Lang::T('Total')} ({Lang::T('Plan Price')}
+ +{Lang::T('Additional Cost')}){Lang::moneyFormat($plan['price']+$add_cost)}
{else}
diff --git a/version.json b/version.json
index 9ea8f629..3b63df2b 100644
--- a/version.json
+++ b/version.json
@@ -1,3 +1,3 @@
{
- "version": "2024.9.23"
+ "version": "2024.9.24"
}
\ No newline at end of file