From 56bcbd810e47d08e4cd0e2fc8075127dc8008a8c Mon Sep 17 00:00:00 2001
From: Ibnu Maksum <ibnumaksum@gmail.com>
Date: Wed, 20 Sep 2023 14:32:53 +0700
Subject: [PATCH] 2023.9.20

---
 CHANGELOG.md                                             | 3 ++-
 ...erms_of_Conditions.html => Terms_and_Conditions.html} | 0
 ui/ui/register-otp.tpl                                   | 2 +-
 ui/ui/register-rotp.tpl                                  | 2 +-
 ui/ui/register.tpl                                       | 2 +-
 ui/ui/sections/header.tpl                                | 4 ++--
 ui/ui/user-login.tpl                                     | 9 +++++----
 version.json                                             | 2 +-
 8 files changed, 13 insertions(+), 11 deletions(-)
 rename pages_template/{Terms_of_Conditions.html => Terms_and_Conditions.html} (100%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 586403e3..fb4577c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,12 +2,13 @@
 
 # CHANGELOG
 
-## 2023.9.15
+## 2023.9.20
 
 - Fix Customer balance header
 - Deactivate Customer active plan
 - Sync Customer Plan to Mikrotik
 - Recharge Customer from Customer Details
+- Add Privacy Policy and Terms and Conditions Pages
 
 ## 2023.9.13
 
diff --git a/pages_template/Terms_of_Conditions.html b/pages_template/Terms_and_Conditions.html
similarity index 100%
rename from pages_template/Terms_of_Conditions.html
rename to pages_template/Terms_and_Conditions.html
diff --git a/ui/ui/register-otp.tpl b/ui/ui/register-otp.tpl
index ab55baa0..6342bb51 100644
--- a/ui/ui/register-otp.tpl
+++ b/ui/ui/register-otp.tpl
@@ -107,7 +107,7 @@
                                 <center>
                                     <a href="./pages/Privacy_Policy.html" target="_blank">Privacy</a>
                                     &bull;
-                                    <a href="./pages/Terms_of_Conditions.html" target="_blank">ToC</a>
+                                    <a href="./pages/Terms_and_Conditions.html" target="_blank">T &amp; C</a>
                                 </center>
                             </div>
                         </div>
diff --git a/ui/ui/register-rotp.tpl b/ui/ui/register-rotp.tpl
index 04a720a1..0949761c 100644
--- a/ui/ui/register-rotp.tpl
+++ b/ui/ui/register-rotp.tpl
@@ -82,7 +82,7 @@
                             <center>
                                 <a href="./pages/Privacy_Policy.html" target="_blank">Privacy</a>
                                 &bull;
-                                <a href="./pages/Terms_of_Conditions.html" target="_blank">ToC</a>
+                                <a href="./pages/Terms_and_Conditions.html" target="_blank">T &amp; C</a>
                             </center>
                         </div>
                     </div>
diff --git a/ui/ui/register.tpl b/ui/ui/register.tpl
index da77841a..7e171af9 100644
--- a/ui/ui/register.tpl
+++ b/ui/ui/register.tpl
@@ -98,7 +98,7 @@
                                 <center>
                                     <a href="./pages/Privacy_Policy.html" target="_blank">Privacy</a>
                                     &bull;
-                                    <a href="./pages/Terms_of_Conditions.html" target="_blank">ToC</a>
+                                    <a href="./pages/Terms_and_Conditions.html" target="_blank">T &amp; C</a>
                                 </center>
                             </div>
                         </div>
diff --git a/ui/ui/sections/header.tpl b/ui/ui/sections/header.tpl
index ce3619fa..a1bc6bad 100644
--- a/ui/ui/sections/header.tpl
+++ b/ui/ui/sections/header.tpl
@@ -223,8 +223,8 @@
                                     href="{$_url}pages/Registration_Info">{$_L['Registration_Info']}</a></li>
                                 <li {if $_routes[1] eq 'Privacy_Policy'}class="active" {/if}><a
                                     href="{$_url}pages/Privacy_Policy">Privacy Policy</a></li>
-                                <li {if $_routes[1] eq 'Terms_of_Conditions'}class="active" {/if}><a
-                                        href="{$_url}pages/Terms_of_Conditions">Terms and Conditions</a></li>
+                                <li {if $_routes[1] eq 'Terms_and_Conditions'}class="active" {/if}><a
+                                        href="{$_url}pages/Terms_and_Conditions">Terms and Conditions</a></li>
                                 {$_MENU_PAGES}
                             </ul>
                         </li>
diff --git a/ui/ui/user-login.tpl b/ui/ui/user-login.tpl
index be8bb430..02b8f2a9 100644
--- a/ui/ui/user-login.tpl
+++ b/ui/ui/user-login.tpl
@@ -77,10 +77,11 @@
                                     <button type="submit" class="btn btn-primary">{$_L['Login']}</button>
                                 </div>
                             </div>
-                            <br><center>
-                            <a href="./pages/Privacy_Policy.html" target="_blank">Privacy</a>
-                            &bull;
-                            <a href="./pages/Terms_of_Conditions.html" target="_blank">ToC</a>
+                            <br>
+                            <center>
+                                <a href="./pages/Privacy_Policy.html" target="_blank">Privacy</a>
+                                &bull;
+                                <a href="./pages/Terms_and_Conditions.html" target="_blank">T &amp; C</a>
                             </center>
                         </form>
                     </div>
diff --git a/version.json b/version.json
index 5e926093..64c1fe39 100644
--- a/version.json
+++ b/version.json
@@ -1,3 +1,3 @@
 {
-    "version": "2023.9.15"
+    "version": "2023.9.20"
 }
\ No newline at end of file