diff --git a/template/javascript/global.html b/template/javascript/global.html
index 048e6b7..148dda9 100644
--- a/template/javascript/global.html
+++ b/template/javascript/global.html
@@ -5,23 +5,23 @@
 
         // Sự kiện click để hiển thị menu
         $('#js-show-menu').click(function () {
-            AdminFunction.capNhatTrangThaiMenu(false);
+            AdminFunctions.toggleMenuVisibility(false);
         });
 
         // Sự kiện click để ẩn menu
         $('#js-hide-menu').click(function () {
-            AdminFunction.capNhatTrangThaiMenu(true);
+            AdminFunctions.toggleMenuVisibility(true);
         });
 
         // Kiểm tra localStorage và thiết lập trạng thái ban đầu của menu
         const hideMenuBig = localStorage.getItem('menu_big') === 'hidden';
-        AdminFunction.capNhatTrangThaiMenu(hideMenuBig);
+        AdminFunctions.toggleMenuVisibility(hideMenuBig);
 
-        AdminFunction.run_search('#js-input-search')
+        AdminFunctions.searchSuggestions('#js-input-search')
 
-        AdminFunction.searchSelect('#js-assign-admin');
+        AdminFunctions.initializeSearchDropdown('#js-assign-admin');
 
-        AdminFunction.searchSelect('#js-order-status-select');
+        AdminFunctions.initializeSearchDropdown('#js-order-status-select');
 
     })
 
diff --git a/template/theme.html b/template/theme.html
index 4e651a1..0f86434 100644
--- a/template/theme.html
+++ b/template/theme.html
@@ -18,10 +18,7 @@
     <link rel="stylesheet" media="screen" href="{{ 'select2.css' | asset_url }}?v2.1" />
     <link rel="stylesheet" media="screen" href="{{ 'pc_style.css' | asset_url }}?v2024.1" />
 
-    <script src="{{ 'tailwindcss.js' | asset_url }}"></script>
-    <script src="{{ 'fancybox.js' | asset_url }}"></script>
-    <script src="{{ 'jquery.js' | asset_url }}"></script>
-    <script src="{{ 'select2.js' | asset_url }}"></script>
+
 </head>
 
 
@@ -301,7 +298,6 @@
 
     </div>
 
-
     <div class="status-notificatiom">
         <a href="javascript:void(0)" class="icon-close" onclick="AdminFunction.closeForm()"><i
                 class="fa fa-times"></i></a>
@@ -314,9 +310,12 @@
 
 
 
-
+    <script src="{{ 'jquery.js' | asset_url }}"></script>
+    <script src="{{ 'tailwindcss.js' | asset_url }}"></script>
+    <script src="{{ 'fancybox.js' | asset_url }}"></script>
+    <script src="{{ 'select2.js' | asset_url }}"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/flowbite/2.3.0/datepicker.min.js"></script>
-    <script src="{{ 'global.js' | asset_url }}?v=1"></script>
+    <script src="/assets/typescript/main.js?v=1.111"></script>
 
     {% include javascript/index %}