From b53116d22adee8637f8ed47e56eaf4b0d975a17f Mon Sep 17 00:00:00 2001
From: Ibnu Maksum <ibnumaksum@gmail.com>
Date: Sun, 3 Mar 2024 17:24:01 +0700
Subject: [PATCH] Customer Announcement

---
 pages_template/Announcement.html            |  4 +++-
 pages_template/Announcement_Customer.html   |  8 ++++++++
 pages_template/Announcement_Users.html.html |  1 -
 system/lan/english.json                     |  4 +++-
 system/updates.json                         |  4 +++-
 ui/ui/sections/header.tpl                   | 14 +++++++-------
 ui/ui/user-dashboard.tpl                    |  2 +-
 7 files changed, 25 insertions(+), 12 deletions(-)
 create mode 100644 pages_template/Announcement_Customer.html
 delete mode 100644 pages_template/Announcement_Users.html.html

diff --git a/pages_template/Announcement.html b/pages_template/Announcement.html
index 3f0a6c99..4eec3810 100644
--- a/pages_template/Announcement.html
+++ b/pages_template/Announcement.html
@@ -1 +1,3 @@
-Pengumuman!!<br>Besok libur<br><br>Announcement!!<br>Tomorrow holiday<br>
\ No newline at end of file
+Pengumuman!!<br>Besok libur<br><br>Announcement!!<br>Tomorrow holiday<br><br>
+<br>
+This Announcement is for Login Page.
\ No newline at end of file
diff --git a/pages_template/Announcement_Customer.html b/pages_template/Announcement_Customer.html
new file mode 100644
index 00000000..4eaa8063
--- /dev/null
+++ b/pages_template/Announcement_Customer.html
@@ -0,0 +1,8 @@
+Pengumuman Pelanggan!!<br>
+Besok libur<br>
+<br>
+Customer Announcement!!<br>
+Tomorrow holiday<br>
+<br>
+<br>
+This Announcement is for Customer Dashboard
\ No newline at end of file
diff --git a/pages_template/Announcement_Users.html.html b/pages_template/Announcement_Users.html.html
deleted file mode 100644
index 3f0a6c99..00000000
--- a/pages_template/Announcement_Users.html.html
+++ /dev/null
@@ -1 +0,0 @@
-Pengumuman!!<br>Besok libur<br><br>Announcement!!<br>Tomorrow holiday<br>
\ No newline at end of file
diff --git a/system/lan/english.json b/system/lan/english.json
index e4e269d5..e78ff21b 100644
--- a/system/lan/english.json
+++ b/system/lan/english.json
@@ -456,5 +456,7 @@
     "Click_Here": "Click Here",
     "danger": "danger",
     "Logout_Successful": "Logout Successful",
-    "warning": "warning"
+    "warning": "warning",
+    "Users_Announcement": "Users Announcement",
+    "Customer_Announcement": "Customer Announcement"
 }
\ No newline at end of file
diff --git a/system/updates.json b/system/updates.json
index 237741ae..aa67225a 100644
--- a/system/updates.json
+++ b/system/updates.json
@@ -68,7 +68,9 @@
     ],
     "2024.2.23" : [
         "ALTER TABLE `tbl_transactions` ADD `admin_id` INT NOT NULL DEFAULT '1' AFTER `type`;",
-        "ALTER TABLE `tbl_user_recharges` ADD `admin_id` INT NOT NULL DEFAULT '1' AFTER `type`;",
+        "ALTER TABLE `tbl_user_recharges` ADD `admin_id` INT NOT NULL DEFAULT '1' AFTER `type`;"
+    ],
+    "2024.3.3" : [
 		"ALTER TABLE `tbl_plans` CHANGE `validity_unit` `validity_unit` ENUM('Mins','Hrs','Days','Months','Period') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL;"
     ]
 }
\ No newline at end of file
diff --git a/ui/ui/sections/header.tpl b/ui/ui/sections/header.tpl
index d1d3a003..521f82c7 100644
--- a/ui/ui/sections/header.tpl
+++ b/ui/ui/sections/header.tpl
@@ -57,13 +57,13 @@
             max-height: 1em;
             line-height: 1em;
         }
-   
-        
+
+
         .loading {
           pointer-events: none;
           opacity: 0.7;
         }
-    
+
         .loading::after {
           content: "";
           display: inline-block;
@@ -76,12 +76,12 @@
           border-radius: 50%;
           animation: spin 0.8s infinite linear;
         }
-    
+
         @keyframes spin {
           0% {
             transform: rotate(0deg);
           }
-    
+
           100% {
             transform: rotate(360deg);
           }
@@ -277,8 +277,8 @@
                                         href="{$_url}pages/Voucher">{Lang::T('Voucher')} Template</a></li>
                                 <li {if $_routes[1] eq 'Announcement'}class="active" {/if}><a
                                         href="{$_url}pages/Announcement">{Lang::T('Announcement')}</a></li>
-								<li {if $_routes[1] eq 'Announcement_Users'}class="active" {/if}><a
-                                        href="{$_url}pages/Announcement_Users">{Lang::T('Users Announcement')}</a></li>
+								<li {if $_routes[1] eq 'Announcement_Customer'}class="active" {/if}><a
+                                        href="{$_url}pages/Announcement_Customer">{Lang::T('Customer Announcement')}</a></li>
                                 <li {if $_routes[1] eq 'Registration_Info'}class="active" {/if}><a
                                         href="{$_url}pages/Registration_Info">{Lang::T('Registration Info')}</a></li>
                                 <li {if $_routes[1] eq 'Privacy_Policy'}class="active" {/if}><a
diff --git a/ui/ui/user-dashboard.tpl b/ui/ui/user-dashboard.tpl
index 1725a2e8..2e1cb5db 100644
--- a/ui/ui/user-dashboard.tpl
+++ b/ui/ui/user-dashboard.tpl
@@ -53,7 +53,7 @@
                 <h3 class="box-title">{Lang::T('Announcement')}</h3>
             </div>
             <div class="box-body">
-                {include file="$_path/../pages/Announcement_Users.html"}
+                {include file="$_path/../pages/Announcement_Customer.html"}
             </div>
         </div>
     </div>