diff --git a/radius.php b/radius.php index 09e09bff..5b646d9b 100644 --- a/radius.php +++ b/radius.php @@ -233,7 +233,7 @@ try { $v->status = "1"; $v->used_date = date('Y-m-d H:i:s'); $v->save(); - $tur = ORM::for_table('tbl_user_recharges')->whereRaw("BINARY `code` = '$username'")->find_one(); + $tur = ORM::for_table('tbl_user_recharges')->whereRaw("BINARY `username` = '$username'")->find_one(); if ($tur) { process_radiust_rest($tur, $code); } else { @@ -323,8 +323,8 @@ try { $d->macaddr = _post('macAddr'); $d->dateAdded = date('Y-m-d H:i:s'); $d->save(); - if ($d->acctstatustype == 'Start') { - $tur = ORM::for_table('tbl_user_recharges')->whereRaw("BINARY `code` = '$username'")->where('status', 'on')->where('routers', 'radius')->find_one(); + if (_post('acctStatusType') == 'Start') { + $tur = ORM::for_table('tbl_user_recharges')->whereRaw("BINARY `username` = '$username'")->where('status', 'on')->where('routers', 'radius')->find_one(); $plan = ORM::for_table('tbl_plans')->where('id', $tur['plan_id'])->find_one(); if ($plan['limit_type'] == "Data_Limit" || $plan['limit_type'] == "Both_Limit") { $totalUsage = $d['acctOutputOctets'] + $d['acctInputOctets']; diff --git a/system/lan/english.json b/system/lan/english.json index 9337da6a..403a2b44 100644 --- a/system/lan/english.json +++ b/system/lan/english.json @@ -702,5 +702,25 @@ "New_Voucher_Created": "New Voucher Created", "New_Voucher_for_10mbps_Created": "New Voucher for 10mbps Created", "Show_Chart": "Show Chart", - "": "" + "For_PDF_Reports___Best_size_1078_x_200___uploaded_image_will_be_autosize": "For PDF Reports | Best size 1078 x 200 | uploaded image will be autosize", + "For_invoice_print_using_Thermal_Printer": "For invoice print using Thermal Printer", + "Theme": "Theme", + "Theme_Info": "Theme Info", + "This_used_for_admin_to_select_payment_in_recharge__using_comma_for_every_new_options": "This used for admin to select payment in recharge, using comma for every new options", + "Income_will_reset_every_this_day": "Income will reset every this day", + "edit_at_config_php": "edit at config.php", + "Hide_Dashboard_Content": "Hide Dashboard Content", + "Radius_Instructions": "Radius Instructions", + "Customer_can_request_to_extend_expirations": "Customer can request to extend expirations", + "i_agree_to_extends_and_will_paid_full_after_this": "i agree to extends and will paid full after this", + "Telegram_Bot_Token": "Telegram Bot Token", + "You_will_get_Payment_and_Error_notification_": "You will get Payment and Error notification<", + "Must_include": "Must include", + "it_will_be_replaced_": "it will be replaced.", + "Or_use_Mikrotik_SMS": "Or use Mikrotik SMS", + "You_can_use": "You can use", + "in_here_too_": "in here too.", + "Empty_this_to_use_internal_mail___PHP": "Empty this to use internal mail() PHP", + "Mail_Reply_To": "Mail Reply To", + "Customer_will_reply_email_to_this_address__empty_if_you_want_to_use_From_Address": "Customer will reply email to this address, empty if you want to use From Address" } \ No newline at end of file diff --git a/system/vendor/mpdf/mpdf/ttfonts/DejaVuSansMono.ttf b/system/vendor/mpdf/mpdf/ttfonts/DejaVuSansMono.ttf new file mode 100644 index 00000000..8b7bb2a4 Binary files /dev/null and b/system/vendor/mpdf/mpdf/ttfonts/DejaVuSansMono.ttf differ diff --git a/ui/ui/app-settings.tpl b/ui/ui/app-settings.tpl index beec86ad..55b9af70 100644 --- a/ui/ui/app-settings.tpl +++ b/ui/ui/app-settings.tpl @@ -83,7 +83,8 @@

{Lang::T('Theme Info')}

+ href="https://github.com/hotspotbilling/phpnuxbill/wiki/Themes" + target="_blank">{Lang::T('Theme Info')}

@@ -92,8 +93,9 @@ value="{$_c['payment_usings']}" placeholder="{Lang::T('Cash')}, {Lang::T('Bank Transfer')}">
-

{Lang::T('This used for admin to select payment in recharge, using comma - for every new options')}

+

+ {Lang::T('This used for admin to select payment in recharge, using comma for every new options')} +

@@ -191,8 +193,7 @@

- {Lang::T('Customer just Login with Phone number and Voucher Code, Voucher will be - password')} + {Lang::T('Customer just Login with Phone number and Voucher Code, Voucher will be password')}

@@ -202,8 +203,7 @@ placeholder="https://192.168.88.1/status" value="{$_c['voucher_redirect']}">

- {Lang::T('After Customer activate voucher or login, customer will be redirected to this - url')} + {Lang::T('After Customer activate voucher or login, customer will be redirected to this url')}

{/if} @@ -326,8 +326,9 @@ value="{$_c['telegram_target_id']}" placeholder="12345678"> - {Lang::T('You will get Payment and Error - notification')} + + {Lang::T('You will get Payment and Error notification')} +
@@ -344,7 +345,8 @@
-

{Lang::T('Must include')} [text] & [number], {Lang::T('it will be replaced.')} +

{Lang::T('Must include')} [text] & [number], + {Lang::T('it will be replaced.')}

@@ -359,11 +361,13 @@ {/foreach}
-

{Lang::T('Must include')} [text] & [number], {Lang::T('it will be replaced.')} +

{Lang::T('Must include')} [text] & [number], + {Lang::T('it will be replaced.')}

- {Lang::T('You can use')} WhatsApp {Lang::T('in here too.')} Free Server + {Lang::T('You can use')} WhatsApp + {Lang::T('in here too.')} Free + Server
@@ -380,10 +384,12 @@
-

{Lang::T('Must include')} [text] & [number], {Lang::T('it will be replaced.')} +

{Lang::T('Must include')} [text] & [number], + {Lang::T('it will be replaced.')}

- {Lang::T('You can use')} WhatsApp {Lang::T('in here too.')} Free Server + {Lang::T('You can use')} WhatsApp + {Lang::T('in here too.')} Free + Server
@@ -449,8 +455,9 @@
-

{Lang::T('Customer will reply email to this address, empty if you want to - use From Address')}

+

+ {Lang::T('Customer will reply email to this address, empty if you want to use From Address')} +

@@ -585,19 +592,23 @@
-

{Lang::T('Logout Admin if not Available/Online a period of time')}

+

+ {Lang::T('Logout Admin if not Available/Online a period of time')}

@@ -624,8 +635,9 @@
-

{Lang::T('OTP is required when user want to change phone - number')}

+

+ {Lang::T('OTP is required when user want to change phone number')} +

@@ -749,11 +761,11 @@
-
- https://github.com/ - -
+
+ https://github.com/ + +
@@ -764,7 +776,8 @@ onmouseleave="this.type = 'password'" onmouseenter="this.type = 'text'">
Create GitHub personal access token (classic), only need repo scope + target="_blank">Create GitHub personal access token (classic), only need repo + scope
- - - - - - - - + + + + + + + + + + - {if isset($xfooter)} - {$xfooter} - {/if} - {literal} - - {/literal} + $(function() { + $('[data-toggle="tooltip"]').tooltip() + }) + $("[data-toggle=popover]").popover(); + +{/literal} - + \ No newline at end of file diff --git a/ui/ui/sections/header.tpl b/ui/ui/sections/header.tpl index e7d3ac49..cd337197 100644 --- a/ui/ui/sections/header.tpl +++ b/ui/ui/sections/header.tpl @@ -5,18 +5,18 @@ {$_title} - {$_c['CompanyName']} - + - + - - - - - - - - + + + + + + + +