From 1bbc7a30f08c221bd35ca7256a3eab722c693373 Mon Sep 17 00:00:00 2001
From: Ahmad Husein <48185559+ahmadhusein17@users.noreply.github.com>
Date: Tue, 27 Aug 2024 18:38:39 +0700
Subject: [PATCH 1/5] Update hotspot-edit.tpl

---
 ui/ui/hotspot-edit.tpl | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/ui/ui/hotspot-edit.tpl b/ui/ui/hotspot-edit.tpl
index 96b18e9f..0818009a 100644
--- a/ui/ui/hotspot-edit.tpl
+++ b/ui/ui/hotspot-edit.tpl
@@ -5,7 +5,7 @@
     <div class="row">
         <div class="col-md-6">
             <div class="panel panel-primary panel-hovered panel-stacked mb30">
-                <div class="panel-heading">{Lang::T('Edit Service Plan')} || {$d['name_plan']}</div>
+                <div class="panel-heading">{Lang::T('Edit Service Package')} || {$d['name_plan']}</div>
                 <div class="panel-body">
                     <input type="hidden" name="id" value="{$d['id']}">
                     <div class="form-group">
@@ -34,7 +34,7 @@
                         </div>
                     </div>
                     <div class="form-group">
-                        <label class="col-md-3 control-label">{Lang::T('Plan Type')}
+                        <label class="col-md-3 control-label">{Lang::T('Package Type')}
                             <a tabindex="0" class="btn btn-link btn-xs" role="button" data-toggle="popover"
                                 data-trigger="focus" data-container="body"
                                 data-content="Personal Plan will only show to personal Customer, Business plan will only show to Business Customer">?</a>
@@ -74,14 +74,14 @@
                         </div>
                     </div>
                     <div class="form-group">
-                        <label class="col-md-3 control-label">{Lang::T('Plan Name')}</label>
+                        <label class="col-md-3 control-label">{Lang::T('Package Name')}</label>
                         <div class="col-md-9">
                             <input type="text" class="form-control" id="name" name="name" maxlength="40"
                                 value="{$d['name_plan']}">
                         </div>
                     </div>
                     <div class="form-group">
-                        <label class="col-md-3 control-label">{Lang::T('Plan Type')}</label>
+                        <label class="col-md-3 control-label">{Lang::T('Package Type')}</label>
                         <div class="col-md-9">
                             <input type="radio" id="Unlimited" name="typebp" value="Unlimited"
                                 {if $d['typebp'] eq 'Unlimited'} checked {/if}> {Lang::T('Unlimited')}
@@ -152,7 +152,7 @@
                         </div>
                     </div>
                     <div class="form-group">
-                        <label class="col-md-3 control-label">{Lang::T('Plan Price')}</label>
+                        <label class="col-md-3 control-label">{Lang::T('Package Price')}</label>
                         <div class="col-md-9">
                             <div class="input-group">
                                 <span class="input-group-addon">{$_c['currency_code']}</span>
@@ -182,7 +182,7 @@
                         </div>
                     </div>
                     <div class="form-group">
-                        <label class="col-md-3 control-label">{Lang::T('Plan Validity')}</label>
+                        <label class="col-md-3 control-label">{Lang::T('Package Validity')}</label>
                         <div class="col-md-3">
                             <input type="text" class="form-control" id="validity" name="validity"
                                 value="{$d['validity']}">
@@ -231,7 +231,7 @@
                     </span>
                     <legend>{Lang::T('Expired Action')} <sub>{Lang::T('Optional')}</sub></legend>
                     <div class="form-group">
-                        <label class="col-md-3 control-label">{Lang::T('Expired Internet Plan')}</label>
+                        <label class="col-md-3 control-label">{Lang::T('Expired Internet Package')}</label>
                         <div class="col-md-9">
                             <select id="plan_expired" name="plan_expired" class="form-control select2">
                                 <option value='0'>{Lang::T('Default - Remove Customer')}</option>
@@ -241,7 +241,7 @@
                                 {/foreach}
                             </select>
                             <p class="help-block">
-                                {Lang::T('When Expired, customer will be move to selected internet plan')}</p>
+                                {Lang::T('When Expired, customer will be move to selected internet package')}</p>
                         </div>
                     </div>
 

From dcaa7f9cea58a29397fb084393952b99a5641d83 Mon Sep 17 00:00:00 2001
From: Ahmad Husein <48185559+ahmadhusein17@users.noreply.github.com>
Date: Tue, 27 Aug 2024 18:41:11 +0700
Subject: [PATCH 2/5] Update hotspot-add.tpl

---
 ui/ui/hotspot-add.tpl | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/ui/ui/hotspot-add.tpl b/ui/ui/hotspot-add.tpl
index 9baeb77f..ee01b1aa 100644
--- a/ui/ui/hotspot-add.tpl
+++ b/ui/ui/hotspot-add.tpl
@@ -3,14 +3,14 @@
 <div class="row">
     <div class="col-sm-12 col-md-12">
         <div class="panel panel-primary panel-hovered panel-stacked mb30">
-            <div class="panel-heading">{Lang::T('Add Service Plan')}</div>
+            <div class="panel-heading">{Lang::T('Add Service Package')}</div>
             <div class="panel-body">
                 <form class="form-horizontal" method="post" role="form" action="{$_url}services/add-post">
                     <div class="form-group">
                         <label class="col-md-2 control-label">{Lang::T('Status')}
                             <a tabindex="0" class="btn btn-link btn-xs" role="button" data-toggle="popover"
                                 data-trigger="focus" data-container="body"
-                                data-content="Customer cannot buy disabled Plan, but admin can recharge it, use it if you want only admin recharge it">?</a>
+                                data-content="Customer cannot buy disabled Package, but admin can recharge it, use it if you want only admin recharge it">?</a>
                         </label>
                         <div class="col-md-10">
                             <input type="radio" name="enabled" value="1" checked> {Lang::T('Active')}
@@ -30,10 +30,10 @@
                     </div>
 
                     <div class="form-group">
-                        <label class="col-md-2 control-label">{Lang::T('Plan Type')}
+                        <label class="col-md-2 control-label">{Lang::T('Package Type')}
                             <a tabindex="0" class="btn btn-link btn-xs" role="button" data-toggle="popover"
                                 data-trigger="focus" data-container="body"
-                                data-content="Personal Plan will only show to personal Customer, Business plan will only show to Business Customer">?</a>
+                                data-content="Personal Plan will only show to personal Customer, Business package will only show to Business Customer">?</a>
                         </label>
                         <div class="col-md-10">
                             <input type="radio" name="plan_type" value="Personal" checked> {Lang::T('Personal')}
@@ -70,13 +70,13 @@
                         </div>
                     </div>
                     <div class="form-group">
-                        <label class="col-md-2 control-label">{Lang::T('Plan Name')}</label>
+                        <label class="col-md-2 control-label">{Lang::T('Package Name')}</label>
                         <div class="col-md-6">
                             <input type="text" class="form-control" id="name" name="name" maxlength="40">
                         </div>
                     </div>
                     <div class="form-group">
-                        <label class="col-md-2 control-label">{Lang::T('Plan Type')}</label>
+                        <label class="col-md-2 control-label">{Lang::T('Package Type')}</label>
                         <div class="col-md-10">
                             <input type="radio" id="Unlimited" name="typebp" value="Unlimited" checked>
                             {Lang::T('Unlimited')}
@@ -137,7 +137,7 @@
                         </div>
                     </div>
                     <div class="form-group">
-                        <label class="col-md-2 control-label">{Lang::T('Plan Price')}</label>
+                        <label class="col-md-2 control-label">{Lang::T('Package Price')}</label>
                         <div class="col-md-6">
                             <div class="input-group">
                                 <span class="input-group-addon">{$_c['currency_code']}</span>
@@ -165,7 +165,7 @@
                         </div>
                     </div>
                     <div class="form-group">
-                        <label class="col-md-2 control-label">{Lang::T('Plan Validity')}</label>
+                        <label class="col-md-2 control-label">{Lang::T('Package Validity')}</label>
                         <div class="col-md-4">
                             <input type="text" class="form-control" id="validity" name="validity">
                         </div>

From 00f65c6aab42fe9ad71ef71e5b656eb2dea8992a Mon Sep 17 00:00:00 2001
From: Ahmad Husein <48185559+ahmadhusein17@users.noreply.github.com>
Date: Tue, 27 Aug 2024 18:44:41 +0700
Subject: [PATCH 3/5] Update hotspot.tpl

---
 ui/ui/hotspot.tpl | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/ui/ui/hotspot.tpl b/ui/ui/hotspot.tpl
index 47516488..d083d0b8 100644
--- a/ui/ui/hotspot.tpl
+++ b/ui/ui/hotspot.tpl
@@ -6,7 +6,7 @@
             <div class="panel-heading">
                 <div class="btn-group pull-right">
                     <a class="btn btn-primary btn-xs" title="save" href="{$_url}services/sync/hotspot"
-                        onclick="return confirm('This will sync/send hotspot plan to Mikrotik?')"><span
+                        onclick="return confirm('This will sync/send hotspot package to Mikrotik?')"><span
                             class="glyphicon glyphicon-refresh" aria-hidden="true"></span> sync</a>
                 </div>{Lang::T('Hotspot Plans')}
             </div>
@@ -98,7 +98,7 @@
                         </div>
                         <div class="col-lg-1 col-xs-4">
                             <a href="{$_url}services/add" class="btn btn-primary btn-block"
-                                title="{Lang::T('New Service Plan')}"><i class="ion ion-android-add"></i></a>
+                                title="{Lang::T('New Service Package')}"><i class="ion ion-android-add"></i></a>
                         </div>
                     </div>
                 </div>
@@ -108,8 +108,8 @@
                     <thead>
                         <tr>
                             <th></th>
-                            <th colspan="5" class="text-center">{Lang::T('Internet Plan')}</th>
-                            <th colspan="2" class="text-center" style="background-color: rgb(246, 244, 244);">Limit</th>
+                            <th colspan="5" class="text-center">{Lang::T('Internet Package')}</th>
+                            <th colspan="2" class="text-center" style="background-color: rgb(246, 244, 244);">{Lang::T('Limit')}</th>
                             <th colspan="2"></th>
                             <th colspan="2" class="text-center" style="background-color: rgb(243, 241, 172);">
                                 {Lang::T('Expired')}</th>
@@ -126,7 +126,7 @@
                             <th style="background-color: rgb(246, 244, 244);">{Lang::T('Data')}</th>
                             <th><a href="{$_url}routers/list">{Lang::T('Location')}</a></th>
                             <th>{Lang::T('Device')}</th>
-                            <th style="background-color: rgb(243, 241, 172);">{Lang::T('Internet Plan')}</th>
+                            <th style="background-color: rgb(243, 241, 172);">{Lang::T('Internet Package')}</th>
                             <th style="background-color: rgb(243, 241, 172);">{Lang::T('Date')}</th>
                             <th>{Lang::T('ID')}</th>
                             <th>{Lang::T('Manage')}</th>
@@ -174,8 +174,8 @@
             <div class="panel-footer">
                 {include file="pagination.tpl"}
                 <div class="bs-callout bs-callout-info" id="callout-navbar-role">
-                    <h4>{Lang::T('Create expired Internet Plan')}</h4>
-                    <p>{Lang::T('When customer expired, you can move it to Expired Internet Plan')}</p>
+                    <h4>{Lang::T('Create expired Internet Package')}</h4>
+                    <p>{Lang::T('When customer expired, you can move it to Expired Internet Package')}</p>
                 </div>
             </div>
         </div>

From 20e212eaa6ad18327efe8728e842013842caf85b Mon Sep 17 00:00:00 2001
From: Ahmad Husein <48185559+ahmadhusein17@users.noreply.github.com>
Date: Tue, 27 Aug 2024 18:46:21 +0700
Subject: [PATCH 4/5] Update balance-add.tpl

---
 ui/ui/balance-add.tpl | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ui/ui/balance-add.tpl b/ui/ui/balance-add.tpl
index 828c1d1f..ea1dfc93 100644
--- a/ui/ui/balance-add.tpl
+++ b/ui/ui/balance-add.tpl
@@ -3,29 +3,29 @@
 <div class="row">
     <div class="col-sm-12 col-md-12">
         <div class="panel panel-primary panel-hovered panel-stacked mb30">
-            <div class="panel-heading">{Lang::T('Add Service Plan')}</div>
+            <div class="panel-heading">{Lang::T('Add Service Package')}</div>
             <div class="panel-body">
                 <form class="form-horizontal" method="post" role="form" action="{$_url}services/balance-add-post">
                     <div class="form-group">
                         <label class="col-md-2 control-label">{Lang::T('Status')}</label>
                         <div class="col-md-10">
                             <label class="radio-inline warning">
-                                <input type="radio" checked name="enabled" value="1"> {Lang::T('Enable')}
+                                <input type="radio" checked name="enabled" value="1"> {Lang::T('Active')}
                             </label>
                             <label class="radio-inline">
-                                <input type="radio" name="enabled" value="0"> {Lang::T('Disable')}
+                                <input type="radio" name="enabled" value="0"> {Lang::T('Not Active')}
                             </label>
                         </div>
                     </div>
                     <div class="form-group">
-                        <label class="col-md-2 control-label">{Lang::T('Plan Name')}</label>
+                        <label class="col-md-2 control-label">{Lang::T('Package Name')}</label>
                         <div class="col-md-6">
                             <input type="text" required class="form-control" id="name" name="name" maxlength="40"
                                 placeholder="Topup 100">
                         </div>
                     </div>
                     <div class="form-group">
-                        <label class="col-md-2 control-label">{Lang::T('Plan Price')}</label>
+                        <label class="col-md-2 control-label">{Lang::T('Package Price')}</label>
                         <div class="col-md-6">
                             <div class="input-group">
                                 <span class="input-group-addon">{$_c['currency_code']}</span>
@@ -56,4 +56,4 @@
     </div>
 </div>
 
-{include file="sections/footer.tpl"}
\ No newline at end of file
+{include file="sections/footer.tpl"}

From d99a51d40e01f5e91197baea512c28a639bdb935 Mon Sep 17 00:00:00 2001
From: Ahmad Husein <48185559+ahmadhusein17@users.noreply.github.com>
Date: Wed, 28 Aug 2024 08:57:02 +0700
Subject: [PATCH 5/5] Update plan.tpl

---
 ui/ui/plan.tpl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ui/ui/plan.tpl b/ui/ui/plan.tpl
index 34ae76ea..4cf71280 100644
--- a/ui/ui/plan.tpl
+++ b/ui/ui/plan.tpl
@@ -17,6 +17,7 @@
                     </div> *}
                 {/if}
                 &nbsp;
+{Lang::T('Active Customers')}
             </div>
             <form id="site-search" method="post" action="{$_url}plan/list/">
                 <div class="panel-body">
@@ -136,4 +137,4 @@
     }
 </script>
 
-{include file="sections/footer.tpl"}
\ No newline at end of file
+{include file="sections/footer.tpl"}