From d3e813e7dfd63b266595d442d30f9250b58e1d3e Mon Sep 17 00:00:00 2001 From: Ahmad Husein <48185559+ahmadhusein17@users.noreply.github.com> Date: Tue, 4 Feb 2025 21:48:26 +0700 Subject: [PATCH 01/15] Update 404.tpl --- ui/ui/admin/404.tpl | 49 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 43 insertions(+), 6 deletions(-) diff --git a/ui/ui/admin/404.tpl b/ui/ui/admin/404.tpl index b5bddfcb..ef3cb304 100644 --- a/ui/ui/admin/404.tpl +++ b/ui/ui/admin/404.tpl @@ -1,9 +1,46 @@ {include file="sections/header.tpl"} -
-
-

404

-
-
+ + +
+
+

404

+

{Lang::T("Oops! The page you are looking for was not found")}.

+ {Lang::T("Back to Dashboard")} +
+
+ +{include file="sections/footer.tpl"} From 9adf1412bc02d5859876f819663f8afa99e195b8 Mon Sep 17 00:00:00 2001 From: Ahmad Husein <48185559+ahmadhusein17@users.noreply.github.com> Date: Tue, 4 Feb 2025 21:57:26 +0700 Subject: [PATCH 02/15] Update 404.tpl --- ui/ui/customer/404.tpl | 43 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 40 insertions(+), 3 deletions(-) diff --git a/ui/ui/customer/404.tpl b/ui/ui/customer/404.tpl index 21a49ccf..7e820a77 100644 --- a/ui/ui/customer/404.tpl +++ b/ui/ui/customer/404.tpl @@ -1,10 +1,47 @@ {include file="customer/header-public.tpl"} - + + +

404

-

{Lang::T('Coming Soon! Next Version...')}

+

{Lang::T("Oops! The page you are looking for was not found")}.

+ {Lang::T("Back to dashboard")}
-{include file="customer/footer-public.tpl"} \ No newline at end of file + +{include file="customer/footer-public.tpl"} From 09eedf4999c3168abe27c68f1e36939acd815646 Mon Sep 17 00:00:00 2001 From: Ahmad Husein <48185559+ahmadhusein17@users.noreply.github.com> Date: Tue, 4 Feb 2025 22:09:35 +0700 Subject: [PATCH 03/15] Update login.tpl --- ui/ui/admin/admin/login.tpl | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/ui/ui/admin/admin/login.tpl b/ui/ui/admin/admin/login.tpl index 045f2589..553a37f7 100644 --- a/ui/ui/admin/admin/login.tpl +++ b/ui/ui/admin/admin/login.tpl @@ -10,7 +10,29 @@ - + @@ -34,7 +56,7 @@ - {Lang::T('Go Back')} + {Lang::T('Go Back')} From 01d966082c2a19ae27bad1c6a6a6e045657e27e7 Mon Sep 17 00:00:00 2001 From: iBNu Maksum Date: Wed, 5 Feb 2025 09:20:54 +0700 Subject: [PATCH 04/15] fix test wa email sms --- ui/ui/admin/settings/app.tpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ui/ui/admin/settings/app.tpl b/ui/ui/admin/settings/app.tpl index c990038b..593a9f53 100644 --- a/ui/ui/admin/settings/app.tpl +++ b/ui/ui/admin/settings/app.tpl @@ -1253,14 +1253,14 @@ function testWa() { var target = prompt("Phone number\nSave First before Test", ""); if (target != null) { - window.location.href = '{$_url}settings/app&testWa=' + target; + window.location.href = '{Text::url('settings/app&testWa=')}' + target; } } function testSms() { var target = prompt("Phone number\nSave First before Test", ""); if (target != null) { - window.location.href = '{$_url}settings/app&testSms=' + target; + window.location.href = '{Text::url('settings/app&testSms=')}' + target; } } @@ -1268,12 +1268,12 @@ function testEmail() { var target = prompt("Email\nSave First before Test", ""); if (target != null) { - window.location.href = '{$_url}settings/app&testEmail=' + target; + window.location.href = '{Text::url('settings/app&testEmail=')}' + target; } } function testTg() { - window.location.href = '{$_url}settings/app&testTg=test'; + window.location.href = '{Text::url('settings/app&testTg=test')}'; } From cbacb1c52f2ec6456f70874e10cdc536a46fc657 Mon Sep 17 00:00:00 2001 From: iBNu Maksum Date: Wed, 5 Feb 2025 09:37:52 +0700 Subject: [PATCH 05/15] pretty url stage 4 --- ui/ui/admin/404.tpl | 4 ++-- ui/ui/admin/admin/add.tpl | 4 ++-- ui/ui/admin/admin/edit.tpl | 6 +++--- ui/ui/admin/admin/list.tpl | 12 ++++++------ ui/ui/admin/change-password.tpl | 8 ++++---- ui/ui/admin/community.tpl | 2 +- ui/ui/admin/dashboard.tpl | 22 +++++++++++----------- ui/ui/admin/error.tpl | 2 +- ui/ui/admin/footer.tpl | 4 ++-- 9 files changed, 32 insertions(+), 32 deletions(-) diff --git a/ui/ui/admin/404.tpl b/ui/ui/admin/404.tpl index ef3cb304..de7875d9 100644 --- a/ui/ui/admin/404.tpl +++ b/ui/ui/admin/404.tpl @@ -37,9 +37,9 @@
-

404

+

404

{Lang::T("Oops! The page you are looking for was not found")}.

- {Lang::T("Back to Dashboard")} + {Lang::T("Back to Dashboard")}
diff --git a/ui/ui/admin/admin/add.tpl b/ui/ui/admin/admin/add.tpl index 640747e2..8661abe6 100644 --- a/ui/ui/admin/admin/add.tpl +++ b/ui/ui/admin/admin/add.tpl @@ -1,7 +1,7 @@ {include file="sections/header.tpl"} -
+
@@ -102,7 +102,7 @@
- Or {Lang::T('Cancel')} + Or {Lang::T('Cancel')}
{literal} diff --git a/ui/ui/admin/admin/edit.tpl b/ui/ui/admin/admin/edit.tpl index f4679171..268656a2 100644 --- a/ui/ui/admin/admin/edit.tpl +++ b/ui/ui/admin/admin/edit.tpl @@ -2,7 +2,7 @@
+ action="{Text::url('settings/users-edit-post')}">
@@ -144,7 +144,7 @@
- Or {Lang::T('Cancel')} + Or {Lang::T('Cancel')}
@@ -160,7 +160,7 @@ function deletePhoto(id) { if (confirm('Delete photo?')) { if (confirm('Are you sure to delete photo?')) { - window.location.href = '{$_url}settings/users-edit/'+id+'/deletePhoto' + window.location.href = '{Text::url('settings/users-edit/')}'+id+'/deletePhoto' } } } diff --git a/ui/ui/admin/admin/list.tpl b/ui/ui/admin/admin/list.tpl index a88b715e..39589001 100644 --- a/ui/ui/admin/admin/list.tpl +++ b/ui/ui/admin/admin/list.tpl @@ -8,7 +8,7 @@
- @@ -53,16 +53,16 @@ {$ds['user_type']} {$ds['city']}, {$ds['subdistrict']}, {$ds['ward']} {if $ds['root']} - + {$admins[$ds['root']]}{/if} {if $ds['last_login']}{Lang::timeElapsed($ds['last_login'])}{/if} - {Lang::T('View')} - {Lang::T('Edit')} {if ($_admin['id']) neq ($ds['id'])} - {/if} diff --git a/ui/ui/admin/change-password.tpl b/ui/ui/admin/change-password.tpl index 7d3c0feb..891fd5ee 100644 --- a/ui/ui/admin/change-password.tpl +++ b/ui/ui/admin/change-password.tpl @@ -5,7 +5,7 @@
{Lang::T('Change Password')}
-
+
@@ -25,15 +25,15 @@
- +
- {Lang::T('Or')} {Lang::T('Cancel')} + {Lang::T('Or')} {Lang::T('Cancel')}
- +
diff --git a/ui/ui/admin/community.tpl b/ui/ui/admin/community.tpl index aeb31dec..34a4fc0d 100644 --- a/ui/ui/admin/community.tpl +++ b/ui/ui/admin/community.tpl @@ -167,7 +167,7 @@ {Lang::T('Download Latest Version')}
-
{Lang::T('Select Old Version')} +
{Lang::T('Select Old Version')}
{/if} @@ -35,7 +35,7 @@
- {Lang::T('Active')}/{Lang::T('Expired')} + {Lang::T('Active')}/{Lang::T('Expired')} @@ -54,7 +54,7 @@
  • {Lang::dateFormat($start_date)}
  • {Lang::dateFormat($current_date)}
  • {if $_c['enable_balance'] == 'yes' && in_array($_admin['user_type'],['SuperAdmin','Admin', 'Report'])} -
  • +
  • {Lang::T('Customer Balance')} {$_c['currency_code']} {number_format($cb,0,$_c['dec_point'],$_c['thousands_sep'])}
  • @@ -74,7 +74,7 @@ @@ -95,7 +95,7 @@ @@ -154,7 +154,7 @@ {assign var="rem_exp" value="{$expired['expiration']} {$expired['time']}"} {assign var="rem_started" value="{$expired['recharged_on']} {$expired['recharged_time']}"} - {$expired['username']} + {$expired['username']} {Lang::timeElapsed($rem_started)} / @@ -183,7 +183,7 @@ {foreach $routeroffs as $ros} - {$ros['name']} + {$ros['name']} {Lang::timeElapsed($ros['last_seen'])} @@ -229,7 +229,7 @@ {/if} {if $_c['hide_al'] != 'yes'}
    - +
      {foreach $dlog as $dlogs} @@ -438,7 +438,7 @@ showConfirmButton: true, showCloseButton: true, timer: 30000, - confirmButtonText: 'Update Now', + confirmButtonText: 'Update Now', timerProgressBar: true, didOpen: (toast) => { toast.addEventListener('mouseenter', Swal.stopTimer) diff --git a/ui/ui/admin/error.tpl b/ui/ui/admin/error.tpl index 93e0030c..2821e6ac 100644 --- a/ui/ui/admin/error.tpl +++ b/ui/ui/admin/error.tpl @@ -59,7 +59,7 @@
    diff --git a/ui/ui/admin/admin/view.tpl b/ui/ui/admin/admin/view.tpl index 002255ed..c45562bc 100644 --- a/ui/ui/admin/admin/view.tpl +++ b/ui/ui/admin/admin/view.tpl @@ -39,9 +39,9 @@
    diff --git a/ui/ui/admin/balance/add.tpl b/ui/ui/admin/balance/add.tpl index 87d63897..22c8f09f 100644 --- a/ui/ui/admin/balance/add.tpl +++ b/ui/ui/admin/balance/add.tpl @@ -5,7 +5,7 @@
    {Lang::T('Add Service Package')}
    -
    +
    @@ -47,7 +47,7 @@
    - Or {Lang::T('Cancel')} + Or {Lang::T('Cancel')}
    diff --git a/ui/ui/admin/balance/edit.tpl b/ui/ui/admin/balance/edit.tpl index 0704e625..cc4d3d39 100644 --- a/ui/ui/admin/balance/edit.tpl +++ b/ui/ui/admin/balance/edit.tpl @@ -5,7 +5,7 @@
    {Lang::T('Edit Service Package')}
    -
    +
    @@ -56,7 +56,7 @@
    - Or {Lang::T('Cancel')} + Or {Lang::T('Cancel')}
    diff --git a/ui/ui/admin/balance/list.tpl b/ui/ui/admin/balance/list.tpl index 6166148a..2e25c68a 100644 --- a/ui/ui/admin/balance/list.tpl +++ b/ui/ui/admin/balance/list.tpl @@ -1,58 +1,65 @@ {include file="sections/header.tpl"} -
    -
    -
    -
    {Lang::T('Balance Package')}
    -
    -
    -
    - -
    -   -
    -
    - - - - - - - - - - {foreach $d as $ds} - - - - - - {/foreach} - -
    {Lang::T('Package Name')}{Lang::T('Package Price')}{Lang::T('Manage')}
    {$ds['name_plan']}{Lang::moneyFormat($ds['price'])}{if !empty($ds['price_old'])} - {Lang::moneyFormat($ds['price_old'])} - {/if} - {Lang::T('Edit')} - -
    -
    - {include file="pagination.tpl"} - +
    +
    +
    +
    {Lang::T('Balance Package')}
    +
    +
    +
    +
    +
    +   +
    +
    + + + + + + + + + + {foreach $d as $ds} + + + + + + {/foreach} + +
    {Lang::T('Package Name')}{Lang::T('Package Price')}{Lang::T('Manage')}
    {$ds['name_plan']}{Lang::moneyFormat($ds['price'])}{if !empty($ds['price_old'])} + {Lang::moneyFormat($ds['price_old'])} + {/if} + + {Lang::T('Edit')} + +
    +
    + {include file="pagination.tpl"} -{include file="sections/footer.tpl"} +
    +
    +
    +
    + +{include file="sections/footer.tpl"} \ No newline at end of file diff --git a/ui/ui/admin/bandwidth/add.tpl b/ui/ui/admin/bandwidth/add.tpl index 882bcbef..d7df5547 100644 --- a/ui/ui/admin/bandwidth/add.tpl +++ b/ui/ui/admin/bandwidth/add.tpl @@ -5,7 +5,7 @@
    {Lang::T('Add New Bandwidth')}
    -
    +
    @@ -70,7 +70,7 @@
    - Or {Lang::T('Cancel')} + Or {Lang::T('Cancel')}
    diff --git a/ui/ui/admin/bandwidth/edit.tpl b/ui/ui/admin/bandwidth/edit.tpl index cffb86eb..be7bb80c 100644 --- a/ui/ui/admin/bandwidth/edit.tpl +++ b/ui/ui/admin/bandwidth/edit.tpl @@ -6,7 +6,7 @@
    {Lang::T('Edit Bandwidth')}
    -
    +
    @@ -87,7 +87,7 @@
    - {Lang::T("Or")} {Lang::T('Cancel')} + {Lang::T("Or")} {Lang::T('Cancel')}
    diff --git a/ui/ui/admin/bandwidth/list.tpl b/ui/ui/admin/bandwidth/list.tpl index 322ff693..d7e1b62d 100644 --- a/ui/ui/admin/bandwidth/list.tpl +++ b/ui/ui/admin/bandwidth/list.tpl @@ -7,7 +7,7 @@
    - @@ -43,9 +44,9 @@ {$ds['burst']} - {Lang::T('Edit')} - @@ -66,4 +67,4 @@
    -{include file="sections/footer.tpl"} +{include file="sections/footer.tpl"} \ No newline at end of file diff --git a/ui/ui/admin/coupons/add.tpl b/ui/ui/admin/coupons/add.tpl index 19c3d433..b7b71c6a 100644 --- a/ui/ui/admin/coupons/add.tpl +++ b/ui/ui/admin/coupons/add.tpl @@ -6,7 +6,7 @@
    {Lang::T('Add Coupon')}
    -
    + @@ -16,7 +16,8 @@
    - +

    {Lang::T('Unique code for the coupon')}

    @@ -38,8 +39,11 @@
    - -

    {Lang::T('Value of the discount (amount or percentage)')}

    + +

    {Lang::T('Value of the discount (amount or percentage)')} +

    @@ -56,8 +60,11 @@
    - -

    {Lang::T('Maximum number of times this coupon can be used 0 is Unlimited')}

    + +

    + {Lang::T('Maximum number of times this coupon can be used 0 is Unlimited')} +

    @@ -66,7 +73,8 @@
    -

    {Lang::T('Minimum cart total required to use this coupon')}

    +

    + {Lang::T('Minimum cart total required to use this coupon')}

    @@ -75,7 +83,8 @@
    -

    {Lang::T('Maximum discount amount applicable (for percent type)')}

    +

    + {Lang::T('Maximum discount amount applicable (for percent type)')}

    @@ -114,7 +123,7 @@ - Or {Lang::T('Cancel')} + Or {Lang::T('Cancel')}
    @@ -150,4 +159,4 @@ -{include file="sections/footer.tpl"} +{include file="sections/footer.tpl"} \ No newline at end of file diff --git a/ui/ui/admin/coupons/edit.tpl b/ui/ui/admin/coupons/edit.tpl index 2a2293a9..c91f2784 100644 --- a/ui/ui/admin/coupons/edit.tpl +++ b/ui/ui/admin/coupons/edit.tpl @@ -8,7 +8,7 @@
    {Lang::T('Edit Coupon')}
    -
    + @@ -116,7 +116,7 @@ - Or {Lang::T('Cancel')} + Or {Lang::T('Cancel')}
    diff --git a/ui/ui/admin/coupons/list.tpl b/ui/ui/admin/coupons/list.tpl index 11d5d20f..7001760c 100644 --- a/ui/ui/admin/coupons/list.tpl +++ b/ui/ui/admin/coupons/list.tpl @@ -120,7 +120,7 @@
    @@ -153,66 +153,66 @@ {if $coupons} - {foreach $coupons as $coupon} - - - - {$coupon['code']} - - {$coupon['type']} - {$coupon['value']} - {$coupon['description']} - {$coupon['max_usage']} - {$coupon['usage_count']} - - {if $coupon['status'] == 'inactive'} - {Lang::T('Inactive')} - {elseif $coupon['status'] == 'active'} - {Lang::T('Active')} - {else} - {Lang::T('Unknown')} - {/if} - - {$coupon['min_order_amount']} - {$coupon['max_discount_amount']} - {$coupon['start_date']} - {$coupon['end_date']} - {$coupon['created_at']} - {$coupon['updated_at']} - - -
    - {Lang::T('Edit')} - {if $coupon['status'] neq 'inactive'} - - {Lang::T('Block')} - - {else} - - {Lang::T('Unblock')} - - {/if} -
    - - - {/foreach} + +
    + {Lang::T('Edit')} + {if $coupon['status'] neq 'inactive'} + + {Lang::T('Block')} + + {else} + + {Lang::T('Unblock')} + + {/if} +
    + + + {/foreach} {else} - - - {Lang::T('No coupons found.')} - - + + + {Lang::T('No coupons found.')} + + {/if} @@ -222,7 +222,7 @@
    {if in_array($_admin['user_type'],['SuperAdmin','Admin'])} - {/if}
    @@ -247,9 +247,9 @@ }).then((result) => { if (result.isConfirmed) { var xhr = new XMLHttpRequest(); - xhr.open('POST', '{$_url}coupons/delete', true); + xhr.open('POST', '{Text::url('coupons/delete')}', true); xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'); - xhr.onload = function () { + xhr.onload = function() { if (xhr.status === 200) { var response = JSON.parse(xhr.responseText); @@ -293,9 +293,9 @@ } // Example usage for selected coupons - document.getElementById('deleteSelectedCoupons').addEventListener('click', function () { + document.getElementById('deleteSelectedCoupons').addEventListener('click', function() { var selectedCoupons = []; - document.querySelectorAll('input[name="coupon_ids[]"]:checked').forEach(function (checkbox) { + document.querySelectorAll('input[name="coupon_ids[]"]:checked').forEach(function(checkbox) { selectedCoupons.push(checkbox.value); }); @@ -312,8 +312,8 @@ }); // Example usage for single coupon deletion - document.querySelectorAll('.delete-coupon').forEach(function (button) { - button.addEventListener('click', function () { + document.querySelectorAll('.delete-coupon').forEach(function(button) { + button.addEventListener('click', function() { var couponId = this.getAttribute('data-id'); deleteCoupons([couponId]); }); @@ -321,7 +321,7 @@ // Select or deselect all checkboxes - document.getElementById('select-all').addEventListener('change', function () { + document.getElementById('select-all').addEventListener('change', function() { var checkboxes = document.querySelectorAll('input[name="coupon_ids[]"]'); for (var checkbox of checkboxes) { checkbox.checked = this.checked; @@ -329,29 +329,29 @@ }); {literal} - + {/literal} -{include file="sections/footer.tpl"} +{include file="sections/footer.tpl"} \ No newline at end of file diff --git a/ui/ui/admin/plan/edit.tpl b/ui/ui/admin/plan/edit.tpl index 5f2b3e3a..7ea20804 100644 --- a/ui/ui/admin/plan/edit.tpl +++ b/ui/ui/admin/plan/edit.tpl @@ -7,7 +7,7 @@

    Edit Plan

    -
    +
    @@ -59,7 +59,7 @@
    - Or {Lang::T('Cancel')} + Or {Lang::T('Cancel')}
    diff --git a/ui/ui/admin/plan/invoice.tpl b/ui/ui/admin/plan/invoice.tpl index f3fa0c0e..ad082ff0 100644 --- a/ui/ui/admin/plan/invoice.tpl +++ b/ui/ui/admin/plan/invoice.tpl @@ -5,20 +5,20 @@
    {$in['invoice']}
    -
    +
    
                         
                         
    -                    {Lang::T('Finish')}
                         
                              WhatsApp
    -                     {Lang::T("Resend")}
                         
    - + {Lang::T('Print')} HTML
    - {Lang::T('Cancel')} + {Lang::T('Cancel')}
    diff --git a/ui/ui/admin/plan/recharge.tpl b/ui/ui/admin/plan/recharge.tpl index 8a3da30c..1b221e3f 100644 --- a/ui/ui/admin/plan/recharge.tpl +++ b/ui/ui/admin/plan/recharge.tpl @@ -5,14 +5,16 @@
    {Lang::T('Recharge Account')}
    -
    +
    - {if $cust} - + {/if}
    @@ -20,8 +22,10 @@
    - - + +
    @@ -55,13 +59,14 @@
    -

    {Lang::T('Postpaid Recharge for the first time use')} {$_c['currency_code']} 0

    +

    {Lang::T('Postpaid Recharge for the first time use')} + {$_c['currency_code']} 0

    - {Lang::T('Or')} {Lang::T('Cancel')} + {Lang::T('Or')} {Lang::T('Cancel')}
    @@ -70,4 +75,4 @@
    -{include file="sections/footer.tpl"} +{include file="sections/footer.tpl"} \ No newline at end of file diff --git a/ui/ui/admin/plan/refill.tpl b/ui/ui/admin/plan/refill.tpl index 30cb2fe7..b0481567 100644 --- a/ui/ui/admin/plan/refill.tpl +++ b/ui/ui/admin/plan/refill.tpl @@ -5,7 +5,7 @@
    {Lang::T('Refill Account')}
    -
    +
    @@ -26,7 +26,7 @@
    - Or {Lang::T('Cancel')} + Or {Lang::T('Cancel')}
    @@ -36,4 +36,4 @@
    -{include file="sections/footer.tpl"} +{include file="sections/footer.tpl"} \ No newline at end of file diff --git a/ui/ui/admin/pool/add.tpl b/ui/ui/admin/pool/add.tpl index a332d131..f4f8b596 100644 --- a/ui/ui/admin/pool/add.tpl +++ b/ui/ui/admin/pool/add.tpl @@ -6,7 +6,7 @@
    {Lang::T('Add Pool')}
    -
    +
    @@ -26,7 +26,7 @@
    - +
    -
    + + +
    - +
    -
    -
    +
    +
    - +
    -
    -
    +
    +
    - +
    -
    -
    +
    +
    - +
    - {if $_c['radius_enable']} -

    {Lang::T('For Radius, you need to add')} {Lang::T('Name')} Pool {Lang::T('in Mikrotik manually')}

    - {/if} -
    + {if $_c['radius_enable']} +

    {Lang::T('For Radius, you need to add')} {Lang::T('Name')} + Pool {Lang::T('in Mikrotik manually')}

    + {/if} +
    - - Or {Lang::T('Cancel')} + + Or {Lang::T('Cancel')}
    - + -
    -
    +
    +
    -{include file="sections/footer.tpl"} +{include file="sections/footer.tpl"} \ No newline at end of file diff --git a/ui/ui/admin/pool/list.tpl b/ui/ui/admin/pool/list.tpl index 56c76010..118ee446 100644 --- a/ui/ui/admin/pool/list.tpl +++ b/ui/ui/admin/pool/list.tpl @@ -5,7 +5,7 @@
    @@ -14,7 +14,7 @@
    - @@ -52,8 +52,9 @@ {$ds['range_ip']} {$ds['routers']} - {Lang::T('Edit')} - {Lang::T('Edit')} + @@ -64,13 +65,13 @@
    {include file="pagination.tpl"} -
    -

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

    -

    {Lang::T('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"} +{include file="sections/footer.tpl"} \ No newline at end of file diff --git a/ui/ui/admin/port/add.tpl b/ui/ui/admin/port/add.tpl index 3b794d4a..657711c2 100644 --- a/ui/ui/admin/port/add.tpl +++ b/ui/ui/admin/port/add.tpl @@ -1,51 +1,55 @@ {include file="sections/header.tpl"} -
    -
    -
    -
    {Lang::T('Add Port Pool')}
    -
    - -
    -
    +
    +
    +
    +
    {Lang::T('Add Port Pool')}
    +
    + +
    -
    -
    +
    +
    - +
    -
    -
    +
    +
    - +
    -
    - +
    +
    + {/foreach} +
    -
    +
    - - Or {Lang::T('Cancel')} + + Or {Lang::T('Cancel')}
    - + -
    -
    +
    +
    -{include file="sections/footer.tpl"} +{include file="sections/footer.tpl"} \ No newline at end of file diff --git a/ui/ui/admin/port/edit.tpl b/ui/ui/admin/port/edit.tpl index 7b9ddd01..616b7da0 100644 --- a/ui/ui/admin/port/edit.tpl +++ b/ui/ui/admin/port/edit.tpl @@ -1,49 +1,54 @@ {include file="sections/header.tpl"} -
    -
    -
    -
    {Lang::T('Edit Port')}
    -
    +
    +
    +
    +
    {Lang::T('Edit Port')}
    +
    -
    - -
    + + +
    -
    -
    +
    +
    - +
    -
    -
    +
    +
    - +
    -
    -
    +
    +
    - +
    -
    +
    - - Or {Lang::T('Cancel')} + + Or {Lang::T('Cancel')}
    -
    + -
    -
    +
    +
    -{include file="sections/footer.tpl"} +{include file="sections/footer.tpl"} \ No newline at end of file diff --git a/ui/ui/admin/port/list.tpl b/ui/ui/admin/port/list.tpl index d880de4c..3d2470e3 100644 --- a/ui/ui/admin/port/list.tpl +++ b/ui/ui/admin/port/list.tpl @@ -5,7 +5,7 @@
    @@ -14,7 +14,7 @@
    - @@ -52,8 +52,8 @@ {$ds['range_port']} {$ds['routers']} - {Lang::T('Edit')} - {Lang::T('Edit')} + diff --git a/ui/ui/admin/pppoe/add.tpl b/ui/ui/admin/pppoe/add.tpl index 9ce303fe..d59bce25 100644 --- a/ui/ui/admin/pppoe/add.tpl +++ b/ui/ui/admin/pppoe/add.tpl @@ -5,7 +5,7 @@
    {Lang::T('Add Service Plan')}
    -
    +
    @@ -158,7 +162,8 @@
    - +
    -
    @@ -118,13 +118,13 @@ {Lang::T('Name')} {Lang::T('Type')} - {Lang::T('Bandwidth')} + {Lang::T('Bandwidth')} {Lang::T('Price')} {Lang::T('Validity')} - {Lang::T('IP Pool')} + {Lang::T('IP Pool')} {Lang::T('Internet Plan')} {Lang::T('Date')} - {Lang::T('Location')} + {Lang::T('Location')} {Lang::T('Device')} {Lang::T('Manage')} ID @@ -135,19 +135,20 @@ {$ds['name_plan']} {$ds['plan_type']} {if $ds['prepaid'] != - 'yes'}{Lang::T('Postpaid')} + 'yes'}{Lang::T('Postpaid')} {else} {Lang::T('Prepaid')} {/if} {$ds['name_bw']} {Lang::moneyFormat($ds['price'])}{if !empty($ds['price_old'])} - {Lang::moneyFormat($ds['price_old'])} - {/if} + {Lang::moneyFormat($ds['price_old'])} + {/if} {$ds['validity']} {$ds['validity_unit']} {$ds['pool']} {if $ds['plan_expired']}{Lang::T('Yes')}{else}{Lang::T('No')} + href="{Text::url('')}services/pppoe-edit/{$ds['plan_expired']}">{Lang::T('Yes')}{else}{Lang::T('No')} {/if} {if $ds['prepaid'] == no}{$ds['expired_date']}{/if} @@ -155,15 +156,15 @@ RADIUS {else} {if $ds['routers']!=''} - {$ds['routers']} + {$ds['routers']} {/if} {/if} {$ds['device']} - {Lang::T('Edit')} - diff --git a/ui/ui/admin/print/voucher.tpl b/ui/ui/admin/print/voucher.tpl index 68e9a3a1..63b2d35c 100644 --- a/ui/ui/admin/print/voucher.tpl +++ b/ui/ui/admin/print/voucher.tpl @@ -9,14 +9,14 @@ .ukuran { size: A4; } - + body, td, th { font-size: 12px; font-family: Segoe, "Segoe UI", "DejaVu Sans", "Trebuchet MS", Verdana, sans-serif; } - + page[size="A4"] { background: white; width: 21cm; @@ -24,28 +24,32 @@ display: block; margin: 0 auto; margin-bottom: 0.5cm; + html, body { width: 210mm; height: 297mm; } } - + @media print { body { size: auto; margin: 0; box-shadow: 0; } + page[size="A4"] { margin: 0; size: auto; box-shadow: 0; } + .page-break { display: block; page-break-before: always; } + .no-print, .no-print * { display: none !important; @@ -56,14 +60,16 @@ - + + + -
    From ID > limit - Voucher PerLine vouchers PageBreak after vouchers + PageBreak after + vouchers Plans Date

    -

    {Lang::T('Print side by side, it will easy to cut')}
    show {$v|@count} vouchers from {$vc} vouchers
    from ID {$v[0]['id']} limit {$limit} vouchers +

    + {Lang::T('Print side by side, it will easy to cut')}
    show {$v|@count} vouchers from {$vc} + vouchers
    from ID {$v[0]['id']} limit {$limit} vouchers
    -
    {$n = 1} {foreach $voucher as $vs} {$jml = $jml + 1} {if $n == 1} - - - {/if} - - {if $n == $vpl} -
    {$vs}
    - {$n = 1} {else} {$n = $n + 1} {/if} {if $jml == $pagebreak} {$jml = 0} - -
    -
    -- pageBreak -- -
    -
    -
    - {/if} {/foreach} +
    {$n = 1} {foreach $voucher as $vs} {$jml = $jml + 1} + {if $n == 1} + + + {/if} + + {if $n == $vpl} +
    {$vs}
    + {$n = 1} {else} {$n = $n + 1} {/if} {if $jml == $pagebreak} {$jml = 0} + +
    +
    -- pageBreak -- +
    +
    +
    + {/if} + {/foreach}
    diff --git a/ui/ui/admin/radius/nas-add.tpl b/ui/ui/admin/radius/nas-add.tpl index d1c16cf1..0c1156ae 100644 --- a/ui/ui/admin/radius/nas-add.tpl +++ b/ui/ui/admin/radius/nas-add.tpl @@ -7,11 +7,12 @@
    Radius - {Lang::T('Add NAS')}
    -
    +
    - +

    {Lang::T('Name of Area that router operated')}

    @@ -58,22 +59,24 @@
    - -
    - {foreach $routers as $rs} - + {/foreach} -
    +

    {Lang::T('Assign NAS to Router')}

    - - Or {Lang::T('Cancel')} + Or {Lang::T('Cancel')}
    @@ -83,4 +86,4 @@
    -{include file="sections/footer.tpl"} +{include file="sections/footer.tpl"} \ No newline at end of file diff --git a/ui/ui/admin/radius/nas-edit.tpl b/ui/ui/admin/radius/nas-edit.tpl index 4f180c50..aca3cde1 100644 --- a/ui/ui/admin/radius/nas-edit.tpl +++ b/ui/ui/admin/radius/nas-edit.tpl @@ -7,73 +7,83 @@
    Radius - {Lang::T('Edit NAS')}
    -
    +
    - +

    {Lang::T('Name of Area that router operated')}

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

    {Lang::T('Explain Coverage of router')}

    - -
    - {foreach $routers as $rs} - + {/foreach} -
    +

    {Lang::T('Assign NAS to Router')}

    - - Or {Lang::T('Cancel')} + Or {Lang::T('Cancel')}
    @@ -83,4 +93,4 @@
    -{include file="sections/footer.tpl"} +{include file="sections/footer.tpl"} \ No newline at end of file diff --git a/ui/ui/admin/radius/nas.tpl b/ui/ui/admin/radius/nas.tpl index f67db0b1..de66283f 100644 --- a/ui/ui/admin/radius/nas.tpl +++ b/ui/ui/admin/radius/nas.tpl @@ -9,7 +9,7 @@
    - @@ -53,8 +53,9 @@ {$ds['community']} {$ds['routers']} - {Lang::T('Edit')} - {Lang::T('Edit')} + @@ -67,11 +68,12 @@ {include file="pagination.tpl"}

    RADIUS REST

    -

    {Lang::T("For Radius REST, you don't need to add NAS, NAS need to add to client.conf manually")}

    +

    {Lang::T("For Radius REST, you don't need to add NAS, NAS need to add to client.conf manually")} +

    -{include file="sections/footer.tpl"} +{include file="sections/footer.tpl"} \ No newline at end of file diff --git a/ui/ui/admin/reports/activation.tpl b/ui/ui/admin/reports/activation.tpl index 2845f27e..4ced97a9 100644 --- a/ui/ui/admin/reports/activation.tpl +++ b/ui/ui/admin/reports/activation.tpl @@ -9,7 +9,7 @@
    -
    -

    {Lang::dateFormat($sd)} - {Lang::dateFormat($ed)} {Lang::T('Max 30 days')}

    +

    {Lang::dateFormat($sd)} - {Lang::dateFormat($ed)} + {Lang::T('Max 30 days')} +

    -
    -
       -
    - - - - - - - - - - - - - - - - - - - {foreach $d as $ds} +
    +
       +
    +
    - - -
    {Lang::T('Username')}{Lang::T('Type')}{Lang::T('Plan Name')}{Lang::T('Plan Price')}{Lang::T('Created On')}{Lang::T('Expires On')}{Lang::T('Method')}{Lang::T('Routers')}
    + - - - - - - - - + + - {/foreach} - - - - - - - -
    {$ds['username']}{$ds['type']}{$ds['plan_name']}{Lang::moneyFormat($ds['price'])}{Lang::dateAndTimeFormat($ds['recharged_on'],$ds['recharged_time'])}{Lang::dateAndTimeFormat($ds['expiration'],$ds['time'])}{$ds['method']}{$ds['routers']} + + +
    {Lang::T('Total')}{Lang::moneyFormat($dr)}
    + + {Lang::T('Username')} + {Lang::T('Type')} + {Lang::T('Plan Name')} + {Lang::T('Plan Price')} + {Lang::T('Created On')} + {Lang::T('Expires On')} + {Lang::T('Method')} + {Lang::T('Routers')} + + + + {foreach $d as $ds} + + {$ds['username']} + {$ds['type']} + {$ds['plan_name']} + {Lang::moneyFormat($ds['price'])} + {Lang::dateAndTimeFormat($ds['recharged_on'],$ds['recharged_time'])} + {Lang::dateAndTimeFormat($ds['expiration'],$ds['time'])} + {$ds['method']} + {$ds['routers']} + + {/foreach} + + {Lang::T('Total')} + + {Lang::moneyFormat($dr)} + + + + +
    -
    - + -
    + diff --git a/ui/ui/admin/reports/period.tpl b/ui/ui/admin/reports/period.tpl index 9574087e..a7267037 100644 --- a/ui/ui/admin/reports/period.tpl +++ b/ui/ui/admin/reports/period.tpl @@ -6,7 +6,7 @@
    {Lang::T('Period Reports')}
    - +
    @@ -16,7 +16,7 @@
    - +
    @@ -33,7 +33,8 @@
    - +
    diff --git a/ui/ui/admin/routers/add.tpl b/ui/ui/admin/routers/add.tpl index cdbc8d32..3bc58b85 100644 --- a/ui/ui/admin/routers/add.tpl +++ b/ui/ui/admin/routers/add.tpl @@ -7,7 +7,7 @@
    {Lang::T('Add Router')}
    -
    +
    @@ -63,7 +63,7 @@
    - Or {Lang::T('Cancel')} + Or {Lang::T('Cancel')}
    diff --git a/ui/ui/admin/routers/edit.tpl b/ui/ui/admin/routers/edit.tpl index ad6eb159..ccf1555d 100644 --- a/ui/ui/admin/routers/edit.tpl +++ b/ui/ui/admin/routers/edit.tpl @@ -6,7 +6,7 @@
    {Lang::T('Edit Router')}
    -
    +
    @@ -79,7 +79,7 @@
    - Or {Lang::T('Cancel')} + Or {Lang::T('Cancel')}
    From 129302d558042341f434f9a79a7df1936c2b3ade Mon Sep 17 00:00:00 2001 From: iBNu Maksum Date: Wed, 5 Feb 2025 14:45:04 +0700 Subject: [PATCH 08/15] pretty url stage 7, thanks regex --- system/lan/english.json | 8 +- ui/ui/admin/routers/list.tpl | 17 ++-- ui/ui/admin/settings/app.tpl | 56 ++++++++---- ui/ui/admin/settings/customfield.tpl | 48 +++++----- ui/ui/admin/settings/dbstatus.tpl | 9 +- ui/ui/admin/settings/language-add.tpl | 4 +- ui/ui/admin/settings/localisation.tpl | 21 ++--- ui/ui/admin/settings/notifications.tpl | 16 ++-- ui/ui/admin/settings/page.tpl | 7 +- ui/ui/admin/settings/plugin-manager.tpl | 26 +++--- ui/ui/admin/voucher/add.tpl | 17 ++-- ui/ui/admin/voucher/list.tpl | 115 ++++++++++++------------ ui/ui/admin/voucher/view.tpl | 23 ++--- ui/ui/admin/vpn/add.tpl | 10 +-- ui/ui/admin/vpn/edit.tpl | 25 ++++-- ui/ui/admin/vpn/list.tpl | 27 +++--- ui/ui/customer/404.tpl | 4 +- ui/ui/customer/activation-list.tpl | 5 +- ui/ui/customer/activation.tpl | 8 +- 19 files changed, 251 insertions(+), 195 deletions(-) diff --git a/system/lan/english.json b/system/lan/english.json index dbbb3784..3ce054d7 100644 --- a/system/lan/english.json +++ b/system/lan/english.json @@ -1010,5 +1010,11 @@ "Plan_Expiry_Date": "Plan Expiry Date", "Make_Payment": "Make Payment", "Validity_Period": "Validity Period", - "Buy_Balance_Package": "Buy Balance Package" + "Buy_Balance_Package": "Buy Balance Package", + "Backup_Database": "Backup Database", + "Choose": "Choose", + "Dont_select_logs_if_it_failed": "Dont select logs if it failed", + "Download_Backup": "Download Backup", + "Restore": "Restore", + "Restoring_database_will_clean_up_data_and_then_restore_all_the_data": "Restoring database will clean up data and then restore all the data" } \ No newline at end of file diff --git a/ui/ui/admin/routers/list.tpl b/ui/ui/admin/routers/list.tpl index ddf5f952..3c5a4ee1 100644 --- a/ui/ui/admin/routers/list.tpl +++ b/ui/ui/admin/routers/list.tpl @@ -6,7 +6,7 @@
    {Lang::T('Routers')}
    @@ -14,7 +14,7 @@
    - @@ -82,9 +83,9 @@ {/if} {if $ds['enabled'] == 1}{Lang::T('Enabled')}{else}{Lang::T('Disabled')}{/if} - {Lang::T('Edit')} - @@ -97,7 +98,9 @@ {include file="pagination.tpl"}

    {Lang::T('Check if Router Online?')}

    -

    {Lang::T('To check whether the Router is online or not, please visit the following page')} {Lang::T('Cek Now')}

    +

    {Lang::T('To check whether the Router is online or not, please visit the following page')} {Lang::T('Cek Now')}

    @@ -105,4 +108,4 @@
    -{include file="sections/footer.tpl"} +{include file="sections/footer.tpl"} \ No newline at end of file diff --git a/ui/ui/admin/settings/app.tpl b/ui/ui/admin/settings/app.tpl index 593a9f53..3747e2c5 100644 --- a/ui/ui/admin/settings/app.tpl +++ b/ui/ui/admin/settings/app.tpl @@ -6,7 +6,8 @@ } -
    +
    -
    +
    -
    @@ -285,7 +287,8 @@
    -
    +