From 03497cb28981efc7f7cf296c428841b9b2502058 Mon Sep 17 00:00:00 2001 From: Focuslinkstech <45756999+Focuslinkstech@users.noreply.github.com> Date: Sat, 17 Aug 2024 14:17:59 +0100 Subject: [PATCH 01/11] Update customers.php fix typo error --- system/controllers/customers.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/controllers/customers.php b/system/controllers/customers.php index f486b2c..379db52 100644 --- a/system/controllers/customers.php +++ b/system/controllers/customers.php @@ -440,7 +440,7 @@ switch ($action) { // Send welcome message if (isset($_POST['send_welcome_message']) && $_POST['send_welcome_message'] == true) { $welcomeMessage = Lang::getNotifText('welcome_message'); - $welcomeMessage = str_replace('[[company_name]]', $config['CompanyName'], $welcomeMessage); + $welcomeMessage = str_replace('[[company]]', $config['CompanyName'], $welcomeMessage); $welcomeMessage = str_replace('[[name]]', $d['fullname'], $welcomeMessage); $welcomeMessage = str_replace('[[username]]', $d['username'], $welcomeMessage); $welcomeMessage = str_replace('[[password]]', $d['password'], $welcomeMessage); From 92c6022c858f507f235e520b6d7ef1d7bd3c55ae Mon Sep 17 00:00:00 2001 From: Ahmad Husein <48185559+ahmadhusein17@users.noreply.github.com> Date: Sat, 17 Aug 2024 23:52:50 +0700 Subject: [PATCH 02/11] Update page-edit.tpl Update Translation --- ui/ui/page-edit.tpl | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/ui/ui/page-edit.tpl b/ui/ui/page-edit.tpl index a44bdd0..dd4037f 100644 --- a/ui/ui/page-edit.tpl +++ b/ui/ui/page-edit.tpl @@ -29,7 +29,7 @@ {/if}
-

{Lang::T("Sometimes you need to refresh 3 times until content change")}

+

{Lang::T('Sometimes you need to refresh 3 times until content change')}

@@ -41,11 +41,12 @@ {if $PageFile=='Voucher'}

- [[company_name]] Your Company Name at Settings.
- [[price]] Plan Price.
- [[voucher_code]] Voucher Code.
- [[plan]] Voucher Plan.
- [[counter]] Counter.
+ [[company_name]] {Lang::T('Your Company Name at Settings.')}
+ [[price]] {Lang::T('Plan Price.')}
+ [[voucher_code]] {Lang::T('Voucher Code.')}
+ [[plan]] {Lang::T('Voucher Plan.')}
+ [[counter]] {Lang::T('Counter. +')}

{/if} @@ -80,4 +81,4 @@ {/literal} -{include file="sections/footer.tpl"} \ No newline at end of file +{include file="sections/footer.tpl"} From 6dc957e34af7eb0cd73fd4470665168a9af3b068 Mon Sep 17 00:00:00 2001 From: Ahmad Husein <48185559+ahmadhusein17@users.noreply.github.com> Date: Sat, 17 Aug 2024 23:56:20 +0700 Subject: [PATCH 03/11] Update bandwidth.tpl Update Translation --- ui/ui/bandwidth.tpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/ui/bandwidth.tpl b/ui/ui/bandwidth.tpl index 0647747..e4dcf0c 100644 --- a/ui/ui/bandwidth.tpl +++ b/ui/ui/bandwidth.tpl @@ -31,7 +31,7 @@ {Lang::T('Bandwidth Name')} {Lang::T('Rate')} - {Lang::T('Burst')} + Burst {Lang::T('Manage')} @@ -57,7 +57,7 @@ {include file="pagination.tpl"}
-

{Lang::T('Create Bandwitdh Plan for expired Internet Plan')}

+

{Lang::T('Create Bandwidth Plan for expired Internet Plan')}

{Lang::T('When customer expired, you can move it to Expired Internet Plan')}

@@ -66,4 +66,4 @@ -{include file="sections/footer.tpl"} \ No newline at end of file +{include file="sections/footer.tpl"} From 7d9a4623b10bd605de63931249ac6660383b64ae Mon Sep 17 00:00:00 2001 From: Ahmad Husein <48185559+ahmadhusein17@users.noreply.github.com> Date: Sat, 17 Aug 2024 23:58:27 +0700 Subject: [PATCH 04/11] Update page-edit.tpl --- ui/ui/page-edit.tpl | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/ui/ui/page-edit.tpl b/ui/ui/page-edit.tpl index dd4037f..9346aa3 100644 --- a/ui/ui/page-edit.tpl +++ b/ui/ui/page-edit.tpl @@ -41,12 +41,11 @@ {if $PageFile=='Voucher'}

- [[company_name]] {Lang::T('Your Company Name at Settings.')}
- [[price]] {Lang::T('Plan Price.')}
- [[voucher_code]] {Lang::T('Voucher Code.')}
- [[plan]] {Lang::T('Voucher Plan.')}
- [[counter]] {Lang::T('Counter. -')}
+ [[company_name]] {Lang::T('Your Company Name at Settings')}.
+ [[price]] {Lang::T('Plan Price')}.
+ [[voucher_code]] {Lang::T('Voucher Code')}.
+ [[plan]] {Lang::T('Voucher Plan')}.
+ [[counter]] {Lang::T('Counter')}.

{/if} From 147e0f5d926789473085b4a0e9be9dbddf24a02b Mon Sep 17 00:00:00 2001 From: Ahmad Husein <48185559+ahmadhusein17@users.noreply.github.com> Date: Sat, 17 Aug 2024 23:59:35 +0700 Subject: [PATCH 05/11] Update reports.tpl --- ui/ui/reports.tpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/ui/reports.tpl b/ui/ui/reports.tpl index 234d715..fbc88bc 100644 --- a/ui/ui/reports.tpl +++ b/ui/ui/reports.tpl @@ -137,8 +137,8 @@ {include file="pagination.tpl"}
-

Information

-

Export and Print will show all data without pagination.

+

{Lang::T('Information')}

+

{Lang::T('Export and Print will show all data without pagination')}.

@@ -265,4 +265,4 @@ {/literal} -{include file="sections/footer.tpl"} \ No newline at end of file +{include file="sections/footer.tpl"} From 9f997ec68f587b2beda3ab4ea32c1bafe964bb6c Mon Sep 17 00:00:00 2001 From: Ahmad Husein <48185559+ahmadhusein17@users.noreply.github.com> Date: Sun, 18 Aug 2024 00:07:43 +0700 Subject: [PATCH 06/11] Update dbstatus.tpl --- ui/ui/dbstatus.tpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/ui/dbstatus.tpl b/ui/ui/dbstatus.tpl index 235a8f0..0ea2421 100644 --- a/ui/ui/dbstatus.tpl +++ b/ui/ui/dbstatus.tpl @@ -3,7 +3,7 @@
-
Backup Database
+
{Lang::T('Backup Database')}
@@ -27,7 +27,7 @@
-
Dont select logs if it failed
+
{Lang::T('Dont select logs if it failed')}
-
Restoring database will clean up data and then restore all the data
+
{Lang::T('Restoring database will clean up data and then restore all the data')}
From fdaa87d02c658abb7dd523d7db0376267d09a294 Mon Sep 17 00:00:00 2001 From: Ahmad Husein <48185559+ahmadhusein17@users.noreply.github.com> Date: Sun, 18 Aug 2024 00:12:14 +0700 Subject: [PATCH 07/11] Update hotspot-add.tpl --- ui/ui/hotspot-add.tpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/ui/hotspot-add.tpl b/ui/ui/hotspot-add.tpl index b1106a8..c596ab2 100644 --- a/ui/ui/hotspot-add.tpl +++ b/ui/ui/hotspot-add.tpl @@ -13,8 +13,8 @@ data-content="Customer cannot buy disabled Plan, but admin can recharge it, use it if you want only admin recharge it">?
- Enable - Disable + {Lang::T('Enable')} + {Lang::T('Disable')}
@@ -247,4 +247,4 @@ {/literal} {/if} -{include file="sections/footer.tpl"} \ No newline at end of file +{include file="sections/footer.tpl"} From be0bbcb570b7749ddab16423fb9f608550a99833 Mon Sep 17 00:00:00 2001 From: Ahmad Husein <48185559+ahmadhusein17@users.noreply.github.com> Date: Sun, 18 Aug 2024 00:13:33 +0700 Subject: [PATCH 08/11] Update hotspot.tpl --- ui/ui/hotspot.tpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/ui/hotspot.tpl b/ui/ui/hotspot.tpl index 3181c6d..b1d65a9 100644 --- a/ui/ui/hotspot.tpl +++ b/ui/ui/hotspot.tpl @@ -174,12 +174,12 @@
{include file="pagination.tpl"}
-

Create expired Internet Plan

-

When customer expired, you can move it to Expired Internet Plan

+

{Lang::T('Create expired Internet Plan')}

+

{Lang::T('When customer expired, you can move it to Expired Internet Plan')}

-{include file="sections/footer.tpl"} \ No newline at end of file +{include file="sections/footer.tpl"} From ef6672d78680964b78f181b029637364f7a3e3bb Mon Sep 17 00:00:00 2001 From: ABDALRAHMAN MOLOOD Date: Thu, 15 Aug 2024 18:46:44 +0300 Subject: [PATCH 09/11] Update init.php - replace ismysqlRadius with isTableExist , to use it any many diffrent position. --- init.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/init.php b/init.php index a4edd79..d3da03d 100644 --- a/init.php +++ b/init.php @@ -360,12 +360,13 @@ function displayMaintenanceMessage(): void die(); } -function isMysqlRadius() +function isTableExist($table) { try { - $record = ORM::forTable('radacct', 'radius')->find_one(); + $record = ORM::forTable($table)->find_one(); return $record !== false; } catch (Exception $e) { return false; } } + From b8a02bb8373d40c69204b872e76315e19c641bef Mon Sep 17 00:00:00 2001 From: iBNu Maksum Date: Sat, 17 Aug 2024 11:07:55 +0700 Subject: [PATCH 10/11] Update version.json --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index 9ffbb96..e5dcfa1 100644 --- a/version.json +++ b/version.json @@ -1,3 +1,3 @@ { - "version": "2024.8.17" +"version": "2024.8.17" } \ No newline at end of file From 08c7de15598140ce3d1a29d27badd18e223adafc Mon Sep 17 00:00:00 2001 From: Ibnu Maksum Date: Sat, 17 Aug 2024 23:08:20 +0700 Subject: [PATCH 11/11] same template name will overwrite --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index e5dcfa1..9ffbb96 100644 --- a/version.json +++ b/version.json @@ -1,3 +1,3 @@ { -"version": "2024.8.17" + "version": "2024.8.17" } \ No newline at end of file