diff --git a/init/full.sql b/init/full.sql
index 7786b4c7..ec020e99 100644
--- a/init/full.sql
+++ b/init/full.sql
@@ -22,7 +22,7 @@ create table Food (
 	food_status			bit not null,
 	food_rate			tinyint not null,
 	discount_percent	tinyint not null,
-	food_img_url		varchar(255) null,
+	food_img_url		varchar(255) not null,
 	food_type_id		tinyint not null foreign key references FoodType(food_type_id)
 );
 
@@ -52,7 +52,11 @@ go
 create table Voucher (
 	voucher_id					tinyint identity(1,1) not null primary key,
 	voucher_name				nvarchar(200) not null,
-	voucher_discount_percent	tinyint not null
+	voucher_code				char(16) not null,
+	voucher_discount_percent	tinyint not null,
+	voucher_quantity			tinyint not null,
+	voucher_status				bit not null,
+	voucher_date				datetime not null
 );
 
 go
@@ -378,12 +382,10 @@ insert into OrderStatus (order_status) values (N'Đã giao');
 insert into OrderStatus (order_status) values (N'Đã hủy');
 
 -- Voucher
-insert into Voucher (voucher_name , voucher_discount_percent) values ( N'Quốc tế phụ nữ', 30);
-insert into Voucher (voucher_name , voucher_discount_percent) values ( N'Khách hàng may mắn', 20);
-insert into Voucher (voucher_name , voucher_discount_percent) values (N'Quà tặng Noel', 40);
-insert into Voucher (voucher_name , voucher_discount_percent) values ( N'Người đặc biệt', 50);
-
-
+insert into Voucher (voucher_name, voucher_code, voucher_discount_percent, voucher_quantity, voucher_status, voucher_date) values ( N'Quốc tế phụ nữ', 'ADASD2FD23123DBE', 30, 100, 0,'20231019 00:00:01 AM' );
+insert into Voucher (voucher_name, voucher_code, voucher_discount_percent, voucher_quantity, voucher_status, voucher_date) values ( N'Khách hàng may mắn', 'ADEF38BDYOQM875V', 20, 10, 0,'20230808 00:00:01 AM');
+insert into Voucher (voucher_name, voucher_code, voucher_discount_percent, voucher_quantity, voucher_status, voucher_date) values (N'Quà tặng Noel', 'DUEMAHWOPUNH62GH', 40, 50, 1,'20231215 00:00:01 AM' );
+insert into Voucher (voucher_name, voucher_code, voucher_discount_percent, voucher_quantity, voucher_status, voucher_date) values ( N'Người đặc biệt', 'DJWOA975N4B92BH6', 50, 5, 1,'20231108 00:00:01 AM' );
 
 -- Cart, CartItem, Order test data
 insert into Cart (customer_id) values (1);
diff --git a/src/main/java/Controllers/AdminController.java b/src/main/java/Controllers/AdminController.java
index 772f82be..97f0048e 100644
--- a/src/main/java/Controllers/AdminController.java
+++ b/src/main/java/Controllers/AdminController.java
@@ -22,7 +22,10 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.math.BigDecimal;
+import java.sql.Timestamp;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -196,6 +199,7 @@ private void doPostUpdateUser(HttpServletRequest request, HttpServletResponse re
 
         int result = accountDAO.update(account);
 
+
         if (result == 1) {
             response.sendRedirect("/admin");
             return;
@@ -209,10 +213,16 @@ private void doPostAddVoucher(HttpServletRequest request, HttpServletResponse re
             throws ServletException, IOException {
 
         String voucherName = (String) request.getParameter("txtvoucher_name");
-        byte voucher_discount_percent = Byte.parseByte(request.getParameter("txtAddVoucher_discount_percent"));
-
+        String voucherCode = (String) request.getParameter("txtvoucher_code");
+        Byte voucher_discount_percent = Byte.parseByte(request.getParameter("txtvoucher_discount_percent"));
+        Byte voucher_quantity = Byte.parseByte(request.getParameter("txtvoucher_quantity"));
+        Byte voucher_status = Byte.parseByte(request.getParameter("txtvoucher_status"));
+        String datetimelocal = request.getParameter("txtvoucher_time");
+       
+        Timestamp datetime = Timestamp.valueOf(datetimelocal.replace("T"," ")+":00");
+        
         VoucherDAO voucherDAO = new VoucherDAO();
-        Voucher voucher = new Voucher(voucherName, voucher_discount_percent);
+        Voucher voucher = new Voucher(voucherName, voucherCode, voucher_discount_percent, voucher_quantity, voucher_status, datetime);
 
         int result = voucherDAO.add(voucher);
 
@@ -227,12 +237,19 @@ private void doPostAddVoucher(HttpServletRequest request, HttpServletResponse re
     
      private void doPostUpdateVoucher(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
-        byte voucherID =  Byte.parseByte(request.getParameter("txtvoucher_id"));      
+        Byte voucherID =  Byte.parseByte(request.getParameter("txtvoucher_id"));      
         String voucherName = (String) request.getParameter("txtvoucher_name");
-        byte voucher_discount_percent = Byte.parseByte(request.getParameter("txtvoucher_discount_percent"));
-
+        String voucherCode = (String) request.getParameter("txtvoucher_code");
+        Byte voucher_discount_percent = Byte.parseByte(request.getParameter("txtvoucher_discount_percent"));
+        Byte voucher_quantity = Byte.parseByte(request.getParameter("txtvoucher_quantity"));
+        Byte voucher_status = Byte.parseByte(request.getParameter("txtvoucher_status"));
+        
+        String datetimelocal = request.getParameter("txtvoucher_time");
+       
+        Timestamp datetime = Timestamp.valueOf(datetimelocal.replace("T"," ")+":00");
+        
         VoucherDAO voucherDAO = new VoucherDAO();
-        Voucher voucher = new Voucher(voucherName, voucher_discount_percent);
+        Voucher voucher = new Voucher(voucherName, voucherCode, voucher_discount_percent, voucher_quantity, voucher_status, datetime);
         voucher.setVoucherID(voucherID);
 
         int result = voucherDAO.update(voucher);
diff --git a/src/main/java/Controllers/PromotionManagerController.java b/src/main/java/Controllers/PromotionManagerController.java
index 18dd790c..e8d79b95 100644
--- a/src/main/java/Controllers/PromotionManagerController.java
+++ b/src/main/java/Controllers/PromotionManagerController.java
@@ -2,7 +2,6 @@
  * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
  * Click nbfs://nbhost/SystemFileSystem/Templates/JSP_Servlet/Servlet.java to edit this template
  */
-
 package Controllers;
 
 import DAOs.AccountDAO;
@@ -19,34 +18,38 @@
 import jakarta.servlet.http.HttpServlet;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import java.sql.Timestamp;
+import java.time.LocalDateTime;
 import java.util.List;
 
 public class PromotionManagerController extends HttpServlet {
-   
-    /** 
-     * Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods.
+
+    /**
+     * Processes requests for both HTTP <code>GET</code> and <code>POST</code>
+     * methods.
+     *
      * @param request servlet request
      * @param response servlet response
      * @throws ServletException if a servlet-specific error occurs
      * @throws IOException if an I/O error occurs
      */
     protected void processRequest(HttpServletRequest request, HttpServletResponse response)
-    throws ServletException, IOException {
+            throws ServletException, IOException {
         response.setContentType("text/html;charset=UTF-8");
-        try (PrintWriter out = response.getWriter()) {
+        try ( PrintWriter out = response.getWriter()) {
             /* TODO output your page here. You may use following sample code. */
             out.println("<!DOCTYPE html>");
             out.println("<html>");
             out.println("<head>");
-            out.println("<title>Servlet PromotionManagerController</title>");  
+            out.println("<title>Servlet PromotionManagerController</title>");
             out.println("</head>");
             out.println("<body>");
-            out.println("<h1>Servlet PromotionManagerController at " + request.getContextPath () + "</h1>");
+            out.println("<h1>Servlet PromotionManagerController at " + request.getContextPath() + "</h1>");
             out.println("</body>");
             out.println("</html>");
         }
-    } 
-    
+    }
+
     private void doGetVoucher(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
         String path = request.getRequestURI();
@@ -59,14 +62,22 @@ private void doGetVoucher(HttpServletRequest request, HttpServletResponse respon
         }
         response.sendRedirect("/promotionManager");
     }
-    
+
     private void doPostAddVoucher(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
+
         String voucherName = (String) request.getParameter("txtvoucher_name");
-        byte voucher_discount_percent = Byte.parseByte(request.getParameter("txtAddVoucher_discount_percent"));
+        String voucherCode = (String) request.getParameter("txtvoucher_code");
+        Byte voucher_discount_percent = Byte.parseByte(request.getParameter("txtvoucher_discount_percent"));
+        Byte voucher_quantity = Byte.parseByte(request.getParameter("txtvoucher_quantity"));
+        Byte voucher_status = Byte.parseByte(request.getParameter("txtvoucher_status"));
+        // Lấy thời gian hiện tại
+        LocalDateTime currentTime = LocalDateTime.now();
+        // Chuyển đổi thời gian hiện tại thành Timestamp
+        Timestamp datetime = Timestamp.valueOf(currentTime);
 
         VoucherDAO voucherDAO = new VoucherDAO();
-        Voucher voucher = new Voucher(voucherName, voucher_discount_percent);
+        Voucher voucher = new Voucher(voucherName, voucherCode, voucher_discount_percent, voucher_quantity, voucher_status, datetime);
 
         int result = voucherDAO.add(voucher);
 
@@ -78,15 +89,23 @@ private void doPostAddVoucher(HttpServletRequest request, HttpServletResponse re
             return;
         }
     }
-    
-     private void doPostUpdateVoucher(HttpServletRequest request, HttpServletResponse response)
+
+    private void doPostUpdateVoucher(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
-        byte voucherID =  Byte.parseByte(request.getParameter("txtvoucher_id"));      
+        byte voucherID = Byte.parseByte(request.getParameter("txtvoucher_id"));
         String voucherName = (String) request.getParameter("txtvoucher_name");
-        byte voucher_discount_percent = Byte.parseByte(request.getParameter("txtvoucher_discount_percent"));
+        String voucherCode = (String) request.getParameter("txtvoucher_code");
+        Byte voucher_discount_percent = Byte.parseByte(request.getParameter("txtvoucher_discount_percent"));
+        Byte voucher_quantity = Byte.parseByte(request.getParameter("txtvoucher_quantity"));
+        Byte voucher_status = Byte.parseByte(request.getParameter("txtvoucher_status"));
+
+        // Lấy thời gian hiện tại
+        LocalDateTime currentTime = LocalDateTime.now();
+        // Chuyển đổi thời gian hiện tại thành Timestamp
+        Timestamp datetime = Timestamp.valueOf(currentTime);
 
         VoucherDAO voucherDAO = new VoucherDAO();
-        Voucher voucher = new Voucher(voucherName, voucher_discount_percent);
+        Voucher voucher = new Voucher(voucherName, voucherCode, voucher_discount_percent, voucher_quantity, voucher_status, datetime);
         voucher.setVoucherID(voucherID);
 
         int result = voucherDAO.update(voucher);
@@ -101,8 +120,9 @@ private void doPostUpdateVoucher(HttpServletRequest request, HttpServletResponse
     }
 
     // <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
-    /** 
+    /**
      * Handles the HTTP <code>GET</code> method.
+     *
      * @param request servlet request
      * @param response servlet response
      * @throws ServletException if a servlet-specific error occurs
@@ -110,10 +130,10 @@ private void doPostUpdateVoucher(HttpServletRequest request, HttpServletResponse
      */
     @Override
     protected void doGet(HttpServletRequest request, HttpServletResponse response)
-    throws ServletException, IOException {
+            throws ServletException, IOException {
         String path = request.getRequestURI();
         if (path.endsWith("/promotionManager")) {
-           
+
             VoucherDAO voucherDAO = new VoucherDAO();
             List<Voucher> voucherList = voucherDAO.getAllList();
 
@@ -127,10 +147,11 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
             // response.setContentType("text/css");
             request.getRequestDispatcher("/promotionManager.jsp").forward(request, response);
         }
-    } 
+    }
 
-    /** 
+    /**
      * Handles the HTTP <code>POST</code> method.
+     *
      * @param request servlet request
      * @param response servlet response
      * @throws ServletException if a servlet-specific error occurs
@@ -138,9 +159,9 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
      */
     @Override
     protected void doPost(HttpServletRequest request, HttpServletResponse response)
-    throws ServletException, IOException {
+            throws ServletException, IOException {
         if (request.getParameter("btnSubmit") != null) {
-            switch (request.getParameter("btnSubmit")) {               
+            switch (request.getParameter("btnSubmit")) {
                 case "SubmitAddVoucher":
                     doPostAddVoucher(request, response);
                     break;
@@ -153,8 +174,9 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
         }
     }
 
-    /** 
+    /**
      * Returns a short description of the servlet.
+     *
      * @return a String containing servlet description
      */
     @Override
diff --git a/src/main/java/DAOs/VoucherDAO.java b/src/main/java/DAOs/VoucherDAO.java
index c589dd73..4816c799 100644
--- a/src/main/java/DAOs/VoucherDAO.java
+++ b/src/main/java/DAOs/VoucherDAO.java
@@ -43,7 +43,7 @@ public Voucher getVoucher(byte id) {
             ps.setByte(1, id);
             rs = ps.executeQuery();
             if (rs.next()) {
-                voucher = new Voucher(rs.getByte("voucher_id"), rs.getString("voucher_name"), rs.getByte("voucher_discount_percent"));
+                voucher = new Voucher(rs.getByte("voucher_id"), rs.getString("voucher_name"), rs.getString("voucher_code"),rs.getByte("voucher_discount_percent"),rs.getByte("voucher_quantity"), rs.getByte("voucher_status"), rs.getTimestamp("voucher_date"));
             }
         } catch (SQLException ex) {
             Logger.getLogger(VoucherDAO.class.getName()).log(Level.SEVERE, null, ex);
@@ -58,8 +58,13 @@ public List<Voucher> getAllList() {
             while (voucherRS.next()) {
                 Voucher voucher = new Voucher(
                         voucherRS.getByte("voucher_id"),
-                        voucherRS.getString("voucher_name"),                      
-                        voucherRS.getByte("voucher_discount_percent"));
+                        voucherRS.getString("voucher_name"),   
+                        voucherRS.getString("voucher_code"),    
+                        voucherRS.getByte("voucher_discount_percent"),
+                        voucherRS.getByte("voucher_quantity"),
+                        voucherRS.getByte("voucher_status"),
+                        voucherRS.getTimestamp("voucher_date")
+                );                
                 voucherList.add(voucher);
             }
         } catch (SQLException ex) {
@@ -69,12 +74,16 @@ public List<Voucher> getAllList() {
     }
 
     public int add(Voucher voucher) {
-        String sql = "insert into Voucher values (?,?)";
+        String sql = "insert into Voucher values (?,?,?,?,?,?)";
         int result = 0;
         try {
             PreparedStatement ps = conn.prepareStatement(sql);
-            ps.setString(1, voucher.getName());
-            ps.setInt(2, voucher.getVoucher_discount_percent());
+            ps.setString(1, voucher.getVoucher_name());
+            ps.setString(2, voucher.getVoucher_code());
+            ps.setByte(3, voucher.getVoucher_discount_percent());
+            ps.setByte(4, voucher.getVoucher_quantity());
+            ps.setByte(5, voucher.getVoucher_status());
+            ps.setTimestamp(6, voucher.getVoucher_date());
             result = ps.executeUpdate();
         } catch (SQLException ex) {
             Logger.getLogger(VoucherDAO.class.getName()).log(Level.SEVERE, null, ex);
@@ -96,13 +105,17 @@ public int delete(byte id) {
     }
 
     public int update(Voucher voucher) {
-        String sql = "update Voucher set voucher_name = ?, voucher_discount_percent = ? where voucher_id = ?";
+        String sql = "update Voucher set voucher_name = ?, voucher_code = ?,voucher_discount_percent = ?, voucher_quantity = ?, voucher_status = ?, voucher_date = ? where voucher_id = ?";
         int result = 0;
         try {
             PreparedStatement ps = conn.prepareStatement(sql);
-            ps.setString(1, voucher.getName());
-            ps.setByte(2, voucher.getVoucher_discount_percent());
-            ps.setByte(3, voucher.getVoucherID());
+            ps.setString(1, voucher.getVoucher_name());
+            ps.setString(2, voucher.getVoucher_code());           
+            ps.setByte(3, voucher.getVoucher_discount_percent());
+            ps.setByte(4, voucher.getVoucher_quantity());
+            ps.setByte(5, voucher.getVoucher_status());
+            ps.setTimestamp(6, voucher.getVoucher_date());
+            ps.setByte(7, voucher.getVoucherID());
             result = ps.executeUpdate();
         } catch (SQLException ex) {
             Logger.getLogger(VoucherDAO.class.getName()).log(Level.SEVERE, null, ex);
diff --git a/src/main/java/Models/Voucher.java b/src/main/java/Models/Voucher.java
index 5b743bef..8382f1a7 100644
--- a/src/main/java/Models/Voucher.java
+++ b/src/main/java/Models/Voucher.java
@@ -4,31 +4,50 @@
  */
 package Models;
 
+import java.sql.Timestamp;
+import java.util.Date;
+
 public class Voucher {
     private byte voucherID;
-    private String name;
+    private String voucher_name;
+    private String voucher_code;
     private byte voucher_discount_percent;
+    private byte voucher_quantity;
+    private byte voucher_status;
+    private Timestamp voucher_date;
    
 
     public Voucher() {
     }
-    public Voucher(byte voucherID, String name, byte voucher_discount_percent) {
+    public Voucher(byte voucherID, String voucher_name, byte voucher_discount_percent) {
         this.voucherID = voucherID;
-        this.name = name;
+        this.voucher_name = voucher_name;
         this.voucher_discount_percent = voucher_discount_percent;
     }
     
-    public Voucher(String name, byte voucher_discount_percent) {
-        this.name = name;
+    public Voucher(String voucher_name, byte voucher_discount_percent) {
+        this.voucher_name = voucher_name;
         this.voucher_discount_percent = voucher_discount_percent;
     }
-
-    public byte getVoucher_discount_percent() {
-        return voucher_discount_percent;
+    
+    public Voucher(String voucher_name, String voucher_code, byte voucher_discount_percent, byte voucher_quantity, byte voucher_status, Timestamp voucher_date) {
+        this.voucherID = voucherID;
+        this.voucher_name = voucher_name;
+        this.voucher_code = voucher_code;
+        this.voucher_discount_percent = voucher_discount_percent;
+        this.voucher_quantity = voucher_quantity;
+        this.voucher_status = voucher_status;
+        this.voucher_date = voucher_date;
     }
 
-    public void setVoucher_discount_percent(byte voucher_discount_percent) {
+    public Voucher(byte voucherID, String voucher_name, String voucher_code, byte voucher_discount_percent, byte voucher_quantity, byte voucher_status, Timestamp voucher_date) {
+        this.voucherID = voucherID;
+        this.voucher_name = voucher_name;
+        this.voucher_code = voucher_code;
         this.voucher_discount_percent = voucher_discount_percent;
+        this.voucher_quantity = voucher_quantity;
+        this.voucher_status = voucher_status;
+        this.voucher_date = voucher_date;
     }
 
     public byte getVoucherID() {
@@ -39,13 +58,52 @@ public void setVoucherID(byte voucherID) {
         this.voucherID = voucherID;
     }
 
-    public String getName() {
-        return name;
+    public String getVoucher_name() {
+        return voucher_name;
+    }
+
+    public void setVoucher_name(String voucher_name) {
+        this.voucher_name = voucher_name;
+    }
+
+    public String getVoucher_code() {
+        return voucher_code;
+    }
+
+    public void setVoucher_code(String voucher_code) {
+        this.voucher_code = voucher_code;
+    }
+
+    public byte getVoucher_quantity() {
+        return voucher_quantity;
+    }
+
+    public void setVoucher_quantity(byte voucher_quantity) {
+        this.voucher_quantity = voucher_quantity;
+    }
+
+    public byte getVoucher_status() {
+        return voucher_status;
+    }
+
+    public void setVoucher_status(byte voucher_status) {
+        this.voucher_status = voucher_status;
+    }
+
+    public byte getVoucher_discount_percent() {
+        return voucher_discount_percent;
+    }
+
+    public void setVoucher_discount_percent(byte voucher_discount_percent) {
+        this.voucher_discount_percent = voucher_discount_percent;
     }
 
-    public void setName(String name) {
-        this.name = name;
+    public Timestamp getVoucher_date() {
+        return voucher_date;
     }
 
+    public void setVoucher_date(Timestamp voucher_date) {
+        this.voucher_date = voucher_date;
+    }
 }
 
diff --git a/src/main/webapp/WEB-INF/jspf/admin/components/addVoucher.jspf b/src/main/webapp/WEB-INF/jspf/admin/components/addVoucher.jspf
index 4cc7182a..f7b1c4ef 100644
--- a/src/main/webapp/WEB-INF/jspf/admin/components/addVoucher.jspf
+++ b/src/main/webapp/WEB-INF/jspf/admin/components/addVoucher.jspf
@@ -1,35 +1,55 @@
 <%-- any content can be specified here e.g.: --%>
 <%@ page pageEncoding="UTF-8" %>
-<div class="modal" tabindex="-1" id="add-voucher-modal">
-  <div class="modal-dialog modal-lg">
-    <div class="modal-content">
-      <form class="add-vouhcer-form" method="POST" action="/admin">
-        <div class="modal-header">
-          <h5 class="modal-title">Thêm Voucher </h5>
-          <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+<div class="modal" tabindex="-1" id="add-voucher-modal" onshow="generateRandomCode()">
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+            <form class="add-voucher-form" method="POST" action="/admin">
+                <div class="modal-header">
+                    <h5 class="modal-title">Thêm Voucher </h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                </div>
+                <div class="modal-body px-5">
+                    <!-- Voucher Name -->
+                    <div class="mb-3">
+                        <label for="txtvoucher_name" class="form-label">Tên Voucher</label>
+                        <input type="text" class="form-control" id="txtvoucher_name" name="txtvoucher_name" maxlength="50" required>
+                    </div>
+                    <!--Voucher code-->
+                    <div class="mb-3">
+                        <label for="txtvoucher_code" class="form-label">Mã Code</label>
+                        <input type="text" class="form-control" id="txtvoucher_code" name="txtvoucher_code" maxlength="16" required>
+                    </div>
+                    <!-- Discount Percentage -->
+                    <div class="mb-3">
+                        <label for="txtvoucher_discount_percent" class="form-label">Giảm giá (%)</label>
+                        <input type="number" class="form-control" id="txtvoucher_discount_percent" name="txtvoucher_discount_percent" required>
+                    </div>
+                    <!--Voucher quantity-->
+                    <div class="mb-3">
+                        <label for="txtvoucher_quantity" class="form-label">Số lượng</label>
+                        <input type="number" class="form-control" id="txtvoucher_quantity" name="txtvoucher_quantity" required>
+                    </div>
+                    <!--Voucher status-->
+                    <div class="mb-3">
+                        <label for="txtvoucher_status" class="form-label">Trạng thái</label>
+                        <select class="form-select" id="txtvoucher_status" name="txtvoucher_status" required>
+                            <option value="1" selected>Còn</option>
+                            <option value="0">Hết</option>
+                        </select>
+                    </div>
+                    <div class="mb-3">
+                        <label for="txtvoucher_time" class="form-label">Thời hạn</label>
+                        <input type="datetime-local" class="form-control" id="txtvoucher_time" name="txtvoucher_time" required>
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    <!-- Submit Button -->
+                    <button type="button" class="btn btn-danger" data-bs-dismiss="modal">Hủy</button>
+                    <button type="submit" class="btn btn-success" onclick="validateForm()">Thêm</button>
+                    <!-- Hidden Submit Value -->
+                    <input type="hidden" id="btnSubmit" name="btnSubmit" value="SubmitAddVoucher">
+                </div>
+            </form>
         </div>
-        <div class="modal-body px-5">
-         
-          <!-- Food Name -->
-          <div class="mb-3">
-            <label for="txtvoucher_name" class="form-label">Tên Voucher</label>
-            <input type="text" class="form-control" id="txtvoucher_name" name="txtvoucher_name" maxlength="50" required>
-          </div>
-          <!-- Discount Percentage -->
-          <div class="mb-3">
-            <label for="txtAddVoucher_discount_percent" class="form-label">Giảm giá (%)</label>
-            <input type="number" class="form-control" id="txtAddVoucher_discount_percent" name="txtAddVoucher_discount_percent" required>
-          </div>
-
-        </div>
-        <div class="modal-footer">
-          <!-- Submit Button -->
-          <button type="button" class="btn btn-danger" data-bs-dismiss="modal">Hủy</button>
-          <button type="submit" class="btn btn-success" onclick="validateForm()">Thêm</button>
-          <!-- Hidden Submit Value -->
-          <input type="hidden" id="btnSubmit" name="btnSubmit" value="SubmitAddVoucher">
-        </div>
-      </form>
     </div>
-  </div>
 </div>
diff --git a/src/main/webapp/WEB-INF/jspf/admin/components/updatevoucher.jspf b/src/main/webapp/WEB-INF/jspf/admin/components/updatevoucher.jspf
index d67b8d10..9c368b38 100644
--- a/src/main/webapp/WEB-INF/jspf/admin/components/updatevoucher.jspf
+++ b/src/main/webapp/WEB-INF/jspf/admin/components/updatevoucher.jspf
@@ -1,40 +1,60 @@
 <%-- any content can be specified here e.g.: --%>
 <%@ page pageEncoding="UTF-8" %>
 <div class="modal" tabindex="-1" id="update-voucher-modal">
-  <div class="modal-dialog modal-lg">
-    <div class="modal-content">
-      <form class="update-voucher-form" method="POST" action="/admin">
-        <div class="modal-header">
-          <h5 class="modal-title">Cập nhật Voucher</h5>
-          <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+            <form class="update-voucher-form" method="POST" action="/admin">
+                <div class="modal-header">
+                    <h5 class="modal-title">Cập nhật Voucher</h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                </div>
+                <div class="modal-body px-5">
+                    <!-- Hidden - Food ID -->
+                    <input type="hidden" id="txtvoucher_id" name="txtvoucher_id" value=""/>
+                    <!-- Food Name -->
+                    <div class="mb-3">
+                        <label for="txtvoucher_name" class="form-label">Tên voucher</label>
+                        <input type="text" class="form-control" id="txtvoucher_name" name="txtvoucher_name" maxlength="50" required value="">
+                    </div>         
+                    <!--Voucher code-->
+                    <div class="mb-3">
+                        <label for="txtvoucher_code" class="form-label">Mã Code</label>
+                        <input type="text" class="form-control" id="txtvoucher_code" name="txtvoucher_code" maxlength="16" required>
+                    </div>
+                    <!-- Discount Percentage -->
+                    <div class="mb-3">
+                        <label for="txtvoucher-discount-percent" class="form-label">Giảm giá (%)</label>
+                        <input type="number" class="form-control" id="txtvoucher_discount_percent" name="txtvoucher_discount_percent" min="0" max="100" required value="">
+                    </div>
+                    <!--Voucher quantity-->
+                    <div class="mb-3">
+                        <label for="txtvoucher_quantity" class="form-label">Số lượng</label>
+                        <input type="number" class="form-control" id="txtvoucher_quantity" name="txtvoucher_quantity" required>
+                    </div>
+                    <!--Voucher status-->
+                    <div class="mb-3">
+                        <label for="txtvoucher_status" class="form-label">Trạng thái</label>
+                        <select class="form-select" id="txtvoucher_status" name="txtvoucher_status" required>
+                            <option value="1" selected>Còn</option>
+                            <option value="0">Hết</option>
+                        </select>
+                    </div>
+                    <div class="mb-3">
+                        <label for="txtvoucher_time" class="form-label">Thời hạn</label>
+                        <input type="datetime-local" class="form-control" id="txtvoucher_time" name="txtvoucher_time" required>
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    <!-- Submit Button -->
+                    <button style="color: white;border-color: rgba(207, 126, 0, 1); background-color: rgba(207, 126, 0, 1);"
+                            type="button" class="btn btn-danger" data-bs-dismiss="modal">Hủy</button>
+                    <button style="color: white;border-color: rgba(207, 126, 0, 1); background-color: rgba(207, 126, 0, 1);"
+                            type="submit" class="btn btn-success" onclick="validateForm()">Cập nhật</button>
+                    <!-- Hidden Submit Value -->
+                    <input style="color: white;border-color: rgba(207, 126, 0, 1); background-color: rgba(207, 126, 0, 1);"
+                           type="hidden" id="btnSubmit" name="btnSubmit" value="SubmitUpdateVoucher">
+                </div>
+            </form>
         </div>
-        <div class="modal-body px-5">
-          <!-- Hidden - Food ID -->
-          <input type="hidden" id="txtvoucher_id" name="txtvoucher_id" value=""/>
-          <!-- Food Name -->
-          <div class="mb-3">
-            <label for="txtvoucher_name" class="form-label">Tên voucher</label>
-            <input type="text" class="form-control" id="txtvoucher_name" name="txtvoucher_name" maxlength="50" required value="">
-          </div>
-         
-          <!-- Discount Percentage -->
-          <div class="mb-3">
-            <label for="txtvoucher-discount-percent" class="form-label">Giảm giá (%)</label>
-            <input type="number" class="form-control" id="txtvoucher_discount_percent" name="txtvoucher_discount_percent" min="0" max="100" required value="">
-          </div>
-
-        </div>
-        <div class="modal-footer">
-          <!-- Submit Button -->
-          <button style="color: white;border-color: rgba(207, 126, 0, 1); background-color: rgba(207, 126, 0, 1);"
-                  type="button" class="btn btn-danger" data-bs-dismiss="modal">Hủy</button>
-          <button style="color: white;border-color: rgba(207, 126, 0, 1); background-color: rgba(207, 126, 0, 1);"
-                  type="submit" class="btn btn-success" onclick="validateForm()">Cập nhật</button>
-          <!-- Hidden Submit Value -->
-          <input style="color: white;border-color: rgba(207, 126, 0, 1); background-color: rgba(207, 126, 0, 1);"
-                 type="hidden" id="btnSubmit" name="btnSubmit" value="SubmitUpdateVoucher">
-        </div>
-      </form>
     </div>
-  </div>
 </div>
diff --git a/src/main/webapp/WEB-INF/jspf/promotionManager/components/addVoucher.jspf b/src/main/webapp/WEB-INF/jspf/promotionManager/components/addVoucher.jspf
index 2d8c896a..227c82bf 100644
--- a/src/main/webapp/WEB-INF/jspf/promotionManager/components/addVoucher.jspf
+++ b/src/main/webapp/WEB-INF/jspf/promotionManager/components/addVoucher.jspf
@@ -1,35 +1,52 @@
 <%-- any content can be specified here e.g.: --%>
 <%@ page pageEncoding="UTF-8" %>
-<div class="modal" tabindex="-1" id="add-voucher-modal">
-  <div class="modal-dialog modal-lg">
-    <div class="modal-content">
-      <form class="add-vouhcer-form" method="POST" action="/promotionManager">
-        <div class="modal-header">
-          <h5 class="modal-title">Thêm Voucher </h5>
-          <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-        </div>
-        <div class="modal-body px-5">
-         
-          <!-- Food Name -->
-          <div class="mb-3">
-            <label for="txtvoucher_name" class="form-label">Tên Voucher</label>
-            <input type="text" class="form-control" id="txtvoucher_name" name="txtvoucher_name" maxlength="50" required>
-          </div>
-          <!-- Discount Percentage -->
-          <div class="mb-3">
-            <label for="txtvoucher-discount-percent" class="form-label">Giảm giá (%)</label>
-            <input type="number" class="form-control" id="txtvoucher-discount-percent" name="txtAddVoucher_discount_percent" min="0" max="100" required>
-          </div>
+<div class="modal" tabindex="-1" id="add-voucher-modal" onshow="generateRandomCode()">
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+            <form class="add-voucher-form" method="POST" action="/promotionManager">
+                <div class="modal-header">
+                    <h5 class="modal-title">Thêm Voucher </h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                </div>
+                <div class="modal-body px-5">
+                    <!-- Voucher Name -->
+                    <div class="mb-3">
+                        <label for="txtvoucher_name" class="form-label">Tên Voucher</label>
+                        <input type="text" class="form-control" id="txtvoucher_name" name="txtvoucher_name" maxlength="50" required>
+                    </div>
+                    <!--Voucher code-->
+                    <div class="mb-3">
+                        <label for="txtvoucher_code" class="form-label">Mã Code</label>
+                        <input type="text" class="form-control" id="txtvoucher_code" name="txtvoucher_code" maxlength="16" required>
+                    </div>
+                    <!-- Discount Percentage -->
+                    <div class="mb-3">
+                        <label for="txtvoucher_discount_percent" class="form-label">Giảm giá (%)</label>
+                        <input type="number" class="form-control" id="txtvoucher_discount_percent" name="txtvoucher_discount_percent" required>
+                    </div>
+                    <!--Voucher quantity-->
+                    <div class="mb-3">
+                        <label for="txtvoucher_quantity" class="form-label">Số lượng</label>
+                        <input type="number" class="form-control" id="txtvoucher_quantity" name="txtvoucher_quantity" required>
+                    </div>
+                    <!--Voucher status-->
+                    <div class="mb-3">
+                        <label for="txtvoucher_status" class="form-label">Trạng thái</label>
+                        <select class="form-select" id="txtvoucher_status" name="txtvoucher_status" required>
+                            <option value="1" selected>Còn</option>
+                            <option value="0">Hết</option>
+                        </select>
+                    </div>
 
+                </div>
+                <div class="modal-footer">
+                    <!-- Submit Button -->
+                    <button type="button" class="btn btn-danger" data-bs-dismiss="modal">Hủy</button>
+                    <button type="submit" class="btn btn-success" onclick="validateForm()">Thêm</button>
+                    <!-- Hidden Submit Value -->
+                    <input type="hidden" id="btnSubmit" name="btnSubmit" value="SubmitAddVoucher">
+                </div>
+            </form>
         </div>
-        <div class="modal-footer">
-          <!-- Submit Button -->
-          <button type="button" class="btn btn-danger" data-bs-dismiss="modal">Hủy</button>
-          <button type="submit" class="btn btn-success">Thêm</button>
-          <!-- Hidden Submit Value -->
-          <input type="hidden" id="btnSubmit" name="btnSubmit" value="SubmitAddVoucher">
-        </div>
-      </form>
     </div>
-  </div>
 </div>
diff --git a/src/main/webapp/WEB-INF/jspf/promotionManager/components/updatevoucher.jspf b/src/main/webapp/WEB-INF/jspf/promotionManager/components/updatevoucher.jspf
index 0bcc7935..1895680e 100644
--- a/src/main/webapp/WEB-INF/jspf/promotionManager/components/updatevoucher.jspf
+++ b/src/main/webapp/WEB-INF/jspf/promotionManager/components/updatevoucher.jspf
@@ -1,40 +1,56 @@
 <%-- any content can be specified here e.g.: --%>
 <%@ page pageEncoding="UTF-8" %>
 <div class="modal" tabindex="-1" id="update-voucher-modal">
-  <div class="modal-dialog modal-lg">
-    <div class="modal-content">
-      <form class="update-voucher-form" method="POST" action="/promotionManager">
-        <div class="modal-header">
-          <h5 class="modal-title">Cập nhật Voucher</h5>
-          <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+            <form class="update-voucher-form" method="POST" action="/promotionManager">
+                <div class="modal-header">
+                    <h5 class="modal-title">Cập nhật Voucher</h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                </div>
+                <div class="modal-body px-5">
+                    <!-- Hidden - Food ID -->
+                    <input type="hidden" id="txtvoucher_id" name="txtvoucher_id" value=""/>
+                    <!-- Food Name -->
+                    <div class="mb-3">
+                        <label for="txtvoucher_name" class="form-label">Tên voucher</label>
+                        <input type="text" class="form-control" id="txtvoucher_name" name="txtvoucher_name" maxlength="50" required value="">
+                    </div>         
+                    <!--Voucher code-->
+                    <div class="mb-3">
+                        <label for="txtvoucher_code" class="form-label">Mã Code</label>
+                        <input type="text" class="form-control" id="txtvoucher_code" name="txtvoucher_code" maxlength="16" required>
+                    </div>
+                    <!-- Discount Percentage -->
+                    <div class="mb-3">
+                        <label for="txtvoucher-discount-percent" class="form-label">Giảm giá (%)</label>
+                        <input type="number" class="form-control" id="txtvoucher_discount_percent" name="txtvoucher_discount_percent" min="0" max="100" required value="">
+                    </div>
+                    <!--Voucher quantity-->
+                    <div class="mb-3">
+                        <label for="txtvoucher_quantity" class="form-label">Số lượng</label>
+                        <input type="number" class="form-control" id="txtvoucher_quantity" name="txtvoucher_quantity" required>
+                    </div>
+                    <!--Voucher status-->
+                    <div class="mb-3">
+                        <label for="txtvoucher_status" class="form-label">Trạng thái</label>
+                        <select class="form-select" id="txtvoucher_status" name="txtvoucher_status" required>
+                            <option value="1" selected>Còn</option>
+                            <option value="0">Hết</option>
+                        </select>
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    <!-- Submit Button -->
+                    <button style="color: white;border-color: rgba(207, 126, 0, 1); background-color: rgba(207, 126, 0, 1);"
+                            type="button" class="btn btn-danger" data-bs-dismiss="modal">Hủy</button>
+                    <button style="color: white;border-color: rgba(207, 126, 0, 1); background-color: rgba(207, 126, 0, 1);"
+                            type="submit" class="btn btn-success" onclick="validateForm()">Cập nhật</button>
+                    <!-- Hidden Submit Value -->
+                    <input style="color: white;border-color: rgba(207, 126, 0, 1); background-color: rgba(207, 126, 0, 1);"
+                           type="hidden" id="btnSubmit" name="btnSubmit" value="SubmitUpdateVoucher">
+                </div>
+            </form>
         </div>
-        <div class="modal-body px-5">
-          <!-- Hidden - Food ID -->
-          <input type="hidden" id="txtvoucher_id" name="txtvoucher_id" value=""/>
-          <!-- Food Name -->
-          <div class="mb-3">
-            <label for="txtvoucher_name" class="form-label">Tên voucher</label>
-            <input type="text" class="form-control" id="txtvoucher_name" name="txtvoucher_name" maxlength="50" required value="">
-          </div>
-         
-          <!-- Discount Percentage -->
-          <div class="mb-3">
-            <label for="txtvoucher-discount-percent" class="form-label">Giảm giá (%)</label>
-            <input type="number" class="form-control" id="txtvoucher_discount_percent" name="txtvoucher_discount_percent" min="0" max="100" required value="">
-          </div>
-
-        </div>
-        <div class="modal-footer">
-          <!-- Submit Button -->
-          <button style="color: white;border-color: rgba(207, 126, 0, 1); background-color: rgba(207, 126, 0, 1);"
-                  type="button" class="btn btn-danger" data-bs-dismiss="modal">Hủy</button>
-          <button style="color: white;border-color: rgba(207, 126, 0, 1); background-color: rgba(207, 126, 0, 1);"
-                  type="submit" class="btn btn-success" onclick="validateForm()">Cập nhật</button>
-          <!-- Hidden Submit Value -->
-          <input style="color: white;border-color: rgba(207, 126, 0, 1); background-color: rgba(207, 126, 0, 1);"
-                 type="hidden" id="btnSubmit" name="btnSubmit" value="SubmitUpdateVoucher">
-        </div>
-      </form>
     </div>
-  </div>
 </div>
diff --git a/src/main/webapp/admin.jsp b/src/main/webapp/admin.jsp
index 379c3251..f114f305 100644
--- a/src/main/webapp/admin.jsp
+++ b/src/main/webapp/admin.jsp
@@ -196,20 +196,24 @@
                             </div>
                         </div>
 
-                        <!-- Promotion Tab Content -->
+                        <!-- Voucher Tab Content -->
                         <div class="tab-pane fade" id="promotions">
                             <div class="container-fluid p-2">
                                 <table id="users-table" class="table table-bordered table-striped">
                                     <h1 class="text-center fw-bold fs-3" align="left">Khuyến mãi</h1>
                                     <button style="color: white;border-color: rgba(207, 126, 0, 1); background-color: rgba(207, 126, 0, 1);"
-                                            type="button" class="btn btn-sm btn-success py-1 my-2 me-2" data-bs-toggle="modal" data-bs-target="#add-voucher-modal">
+                                            type="button" id="btn-add-voucher" class="btn btn-sm btn-success py-1 my-2 me-2" data-bs-toggle="modal" data-bs-target="#add-voucher-modal">
                                         Tạo Khuyến mãi
                                     </button>
                                     <thead>
                                         <tr>
                                             <th class="col-sm-3 col-gap-5">Mã Khuyến mãi</th>  
                                             <th>Tên Khuyến mãi</th>
-                                            <th>Voucher</th>
+                                            <th>Mã Code</th>
+                                            <th>Phần trăm KM</th>
+                                            <th>Số lượng</th>
+                                            <th>Trạng thái</th>
+                                            <th>Thời gian</th>
                                             <th >Thao tác</th>
 
                                         </tr>
@@ -218,16 +222,23 @@
                                         <c:forEach items="${voucherList}" var="v">
                                             <tr>
                                                 <td>${v.voucherID}</td>
-                                                <td>${v.name}</td>
-
+                                                <td>${v.voucher_name}</td>
+                                                <td>${v.voucher_code}</td>
                                                 <td>${(v.voucher_discount_percent == null) ? 0 : v.voucher_discount_percent}%</td>                                 
+                                                <td>${v.voucher_quantity}</td>
+                                                <td>${v.voucher_status eq 0 ? 'Hết' : 'Còn'}</td>
+                                                <td>${v.voucher_date}</td>
                                                 <td>
                                                     <button style="color: white;border-color: rgba(207, 126, 0, 1); background-color: rgba(207, 126, 0, 1);"
                                                             type="button" id="btn-update-voucher"
                                                             class="btn btn-sm btn-success py-1 m-1"
                                                             data-voucher-id="${v.voucherID}"
-                                                            data-voucher-name="${v.name}"
+                                                            data-voucher-name="${v.voucher_name}"
+                                                            data-voucher-code ="${v.voucher_code}"
                                                             data-voucher-discount-percent="${v.voucher_discount_percent}"
+                                                            data-voucher-quantity ="${v.voucher_quantity}"
+                                                            data-voucher-status ="${v.voucher_status}"
+                                                            data-voucher-date ="${v.voucher_date}"
                                                             data-bs-toggle="modal" data-bs-target="#update-voucher-modal">
                                                         Cập nhật
                                                     </button>
@@ -235,7 +246,7 @@
                                                             type="button" id="btn-delete-voucher"
                                                             class="btn btn-sm btn-danger py-1 m-1"
                                                             data-voucher-id="${v.voucherID}"
-                                                            data-voucher-name="${v.name}"
+                                                            data-voucher-name="${v.voucher_name}"
                                                             data-bs-toggle="modal" data-bs-target="#delete-voucher-modal">
                                                         Xóa
                                                     </button>
diff --git a/src/main/webapp/assets/js/admin.js b/src/main/webapp/assets/js/admin.js
index f8949f89..c21d7cc8 100644
--- a/src/main/webapp/assets/js/admin.js
+++ b/src/main/webapp/assets/js/admin.js
@@ -1,103 +1,122 @@
 $(document).on("click", "#btn-update-food", function () {
-  let foodID = $(this).attr("data-food-id");
-  let foodType = $(this).attr("data-food-type");
-  let foodName = $(this).attr("data-food-name");
-  let foodDescription = $(this).attr("data-food-description");
-  let foodPrice = $(this).attr("data-food-price");
-  let foodStatus = $(this).attr("data-food-status");
-  let foodRate = $(this).attr("data-food-rate");
-  let discountPercent = $(this).attr("data-discount-percent");
-  let imageURL = $(this).attr("data-image-url");
-
-  // Set the values of the corresponding form inputs in the modal
-  let modal = $("#update-food-modal");
-  modal.find("input[name='txtFoodID']").attr("value", foodID);
-  modal.find("#txtFoodName").attr("value", foodName);
-  modal.find("#txtFoodDescription").val(foodDescription);
-  modal.find("#txtFoodPrice").attr("value", Number(foodPrice).toFixed(2));
-  modal.find("#txtFoodStatus").val( foodStatus);
-  console.log(foodStatus);
-  modal.find("#txtFoodRate").val( foodRate);
-  console.log(foodRate);
-
-  modal.find("#txtDiscountPercent").attr("value", discountPercent);
-  modal.find("#txtImageURL").attr("value", imageURL);
-  for (let i = 1; i < 7; i++) {
-    let foodTypes = {1: "Cơm", 2: "Mì", 3: "Bánh mì", 4: "Đồ ăn vặt", 5: "Tráng miệng", 6: "Đồ uống"};
-    if (foodType === foodTypes[i]) {
-      modal.find("#txtFoodTypeID option[value = " + i + "]").attr("selected", "selected");
-    } else {
-      modal.find("#txtFoodTypeID option[value = " + i + "]").removeAttr("selected");
+    let foodID = $(this).attr("data-food-id");
+    let foodType = $(this).attr("data-food-type");
+    let foodName = $(this).attr("data-food-name");
+    let foodDescription = $(this).attr("data-food-description");
+    let foodPrice = $(this).attr("data-food-price");
+    let foodStatus = $(this).attr("data-food-status");
+    let foodRate = $(this).attr("data-food-rate");
+    let discountPercent = $(this).attr("data-discount-percent");
+    let imageURL = $(this).attr("data-image-url");
+
+    // Set the values of the corresponding form inputs in the modal
+    let modal = $("#update-food-modal");
+    modal.find("input[name='txtFoodID']").attr("value", foodID);
+    modal.find("#txtFoodName").attr("value", foodName);
+    modal.find("#txtFoodDescription").val(foodDescription);
+    modal.find("#txtFoodPrice").attr("value", Number(foodPrice).toFixed(2));
+    modal.find("#txtFoodStatus").val(foodStatus);
+    modal.find("#txtFoodRate").val(foodRate);
+
+    modal.find("#txtDiscountPercent").attr("value", discountPercent);
+    modal.find("#txtImageURL").attr("value", imageURL);
+    for (let i = 1; i < 7; i++) {
+        let foodTypes = {1: "Cơm", 2: "Mì", 3: "Bánh mì", 4: "Đồ ăn vặt", 5: "Tráng miệng", 6: "Đồ uống"};
+        if (foodType === foodTypes[i]) {
+            modal.find("#txtFoodTypeID option[value = " + i + "]").attr("selected", "selected");
+        } else {
+            modal.find("#txtFoodTypeID option[value = " + i + "]").removeAttr("selected");
+        }
     }
-  }
 });
 
 $(document).on("click", "#btn-delete-food", function () {
-  let modal = $("#delete-food-modal");
-  // Clear the list of foods in the modal every time the button is clicked
-  modal.find(".modal-body ul").empty();
+    let modal = $("#delete-food-modal");
+    // Clear the list of foods in the modal every time the button is clicked
+    modal.find(".modal-body ul").empty();
 
-  // Retrieves selected rows' data in JSON format, so that it can be iterated
-  let foods = JSON.parse($(this).attr("data-foods"));
+    // Retrieves selected rows' data in JSON format, so that it can be iterated
+    let foods = JSON.parse($(this).attr("data-foods"));
 
-  // Populate the list of foods in the modal
-  for (let foodId in foods) {
-    let foodName = foods[foodId];
-    modal.find("#delete-food-list").append("<li>" + foodName + "</li>");
-  }
+    // Populate the list of foods in the modal
+    for (let foodId in foods) {
+        let foodName = foods[foodId];
+        modal.find("#delete-food-list").append("<li>" + foodName + "</li>");
+    }
 
-  // Keep food IDs as strings
-  let foodIds = Object.keys(foods).toString();
+    // Keep food IDs as strings
+    let foodIds = Object.keys(foods).toString();
 
-  // Set the values to the hidden input in the modal
-  modal.find("input[name='foodData']").attr("value", foodIds);
+    // Set the values to the hidden input in the modal
+    modal.find("input[name='foodData']").attr("value", foodIds);
 });
 
 $(document).on("click", "#btn-update-user", function () {
-  let accountID = $(this).data("account-id");
-  let username = $(this).data("username");
-  let email = $(this).data("email");
-  // Set the values of the corresponding form inputs in the modal
-  $("#update-user-modal").find("input[name='txtAccountID']").attr("value", accountID);
-  $("#update-user-modal").find("#txtAccountUsername").attr("value", username);
-  $("#update-user-modal").find("#txtEmail").attr("value", email);
+    let accountID = $(this).data("account-id");
+    let username = $(this).data("username");
+    let email = $(this).data("email");
+    // Set the values of the corresponding form inputs in the modal
+    $("#update-user-modal").find("input[name='txtAccountID']").attr("value", accountID);
+    $("#update-user-modal").find("#txtAccountUsername").attr("value", username);
+    $("#update-user-modal").find("#txtEmail").attr("value", email);
 });
 
 $(document).on("click", "#btn-delete-user", function () {
-  let username = $(this).data("username");
-  let accountID = $(this).data("account-id");
-  let deleteAccountLink = "";
-  if (accountID === null) {
-    deleteAccountLink = "/admin";
-  } else {
-    deleteAccountLink = "/admin/user/delete/" + accountID;
-  }
-  // Set the values of the corresponding form inputs in the modal
-  $("#delete-user-modal").find("#username").html(username + " ");
-  $("#delete-user-modal").find("#deleteAccountLink").attr("href", deleteAccountLink);
+    let username = $(this).data("username");
+    let accountID = $(this).data("account-id");
+    let deleteAccountLink = "";
+    if (accountID === null) {
+        deleteAccountLink = "/admin";
+    } else {
+        deleteAccountLink = "/admin/user/delete/" + accountID;
+    }
+    // Set the values of the corresponding form inputs in the modal
+    $("#delete-user-modal").find("#username").html(username + " ");
+    $("#delete-user-modal").find("#deleteAccountLink").attr("href", deleteAccountLink);
 });
 
 $(document).on("click", "#btn-update-voucher", function () {
-  let voucherID = $(this).data("voucher-id");
-  let voucherName = $(this).data("voucher-name");
-  let discount_percent = $(this).data("voucher-discount-percent");
-  // Set the values of the corresponding form inputs in the modal
-  $("#update-voucher-modal").find("input[name='txtvoucher_id']").attr("value", voucherID);
-  $("#update-voucher-modal").find("#txtvoucher_name").attr("value", voucherName);
-  $("#update-voucher-modal").find("#txtvoucher_discount_percent").attr("value", discount_percent);
+    let voucherID = $(this).data("voucher-id");
+    let voucherName = $(this).data("voucher-name");
+    let voucherCode = $(this).data("voucher-code");
+    let discount_percent = $(this).data("voucher-discount-percent");
+    let voucherQuantity = $(this).data("voucher-quantity");
+    let voucherStatus = $(this).data("voucher-status");
+//  let voucherDate = $(this).data("voucher-date");
+
+    // Set the values of the corresponding form inputs in the modal
+    $("#update-voucher-modal").find("input[name='txtvoucher_id']").attr("value", voucherID);
+    $("#update-voucher-modal").find("#txtvoucher_name").attr("value", voucherName);
+    $("#update-voucher-modal").find("#txtvoucher_code").attr("value", voucherCode);
+    $("#update-voucher-modal").find("#txtvoucher_discount_percent").attr("value", discount_percent);
+    $("#update-voucher-modal").find("#txtvoucher_quantity").attr("value", voucherQuantity);
+    $("#update-voucher-modal").find("#txtvoucher_status").attr("value", voucherStatus);
+});
+
+
+$(document).on("click", "#btn-add-voucher", function () {
+    const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+    let randomCode = '';
+    for (let i = 0; i < 16; i++) {
+        const randomIndex = Math.floor(Math.random() * characters.length);
+        randomCode += characters[randomIndex];
+    }
+    // Set the values of the corresponding form inputs in the modal
+    $("#add-voucher-modal").find("#txtvoucher_code").attr("value", randomCode);
+
 });
 
 $(document).on("click", "#btn-delete-voucher", function () {
-  let voucherName = $(this).data("voucher-name");
-  let voucherID = $(this).data("voucher-id");
-  let deleteVoucherLink = "";
-  if (voucherID === null) {
-    deleteVoucherLink = "/admin";
-  } else {
-    deleteVoucherLink = "/admin/voucher/delete/" + voucherID;
-  }
-  // Set the values of the corresponding form inputs in the modal
-  $("#delete-voucher-modal").find("#voucher_name").html(voucherName + " ");
-  $("#delete-voucher-modal").find("#deleteVoucherLink").attr("href", deleteVoucherLink);
+    let voucherName = $(this).data("voucher-name");
+    let voucherID = $(this).data("voucher-id");
+    let deleteVoucherLink = "";
+    if (voucherID === null) {
+        deleteVoucherLink = "/admin";
+    } else {
+        deleteVoucherLink = "/admin/voucher/delete/" + voucherID;
+    }
+    // Set the values of the corresponding form inputs in the modal
+    $("#delete-voucher-modal").find("#voucher_name").html(voucherName + " ");
+    $("#delete-voucher-modal").find("#deleteVoucherLink").attr("href", deleteVoucherLink);
 });
 
diff --git a/src/main/webapp/assets/js/promotionManager.js b/src/main/webapp/assets/js/promotionManager.js
index 6005cbb4..13ec36ee 100644
--- a/src/main/webapp/assets/js/promotionManager.js
+++ b/src/main/webapp/assets/js/promotionManager.js
@@ -1,11 +1,19 @@
 $(document).on("click", "#btn-update-voucher", function () {
   let voucherID = $(this).data("voucher-id");
   let voucherName = $(this).data("voucher-name");
+  let voucherCode = $(this).data("voucher-code");
   let discount_percent = $(this).data("voucher-discount-percent");
+  let voucherQuantity = $(this).data("voucher-quantity");
+  let voucherStatus = $(this).data("voucher-status");
+//  let voucherDate = $(this).data("voucher-date");
+
   // Set the values of the corresponding form inputs in the modal
   $("#update-voucher-modal").find("input[name='txtvoucher_id']").attr("value", voucherID);
   $("#update-voucher-modal").find("#txtvoucher_name").attr("value", voucherName);
+  $("#update-voucher-modal").find("#txtvoucher_code").attr("value", voucherCode);
   $("#update-voucher-modal").find("#txtvoucher_discount_percent").attr("value", discount_percent);
+  $("#update-voucher-modal").find("#txtvoucher_quantity").attr("value", voucherQuantity);
+  $("#update-voucher-modal").find("#txtvoucher_status").attr("value", voucherStatus);
 });
 
 $(document).on("click", "#btn-delete-voucher", function () {
@@ -22,3 +30,14 @@ $(document).on("click", "#btn-delete-voucher", function () {
   $("#delete-voucher-modal").find("#deleteVoucherLink").attr("href", deleteVoucherLink);
 });
 
+$(document).on("click", "#btn-add-voucher", function () {
+    const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+    let randomCode = '';
+    for (let i = 0; i < 16; i++) {
+        const randomIndex = Math.floor(Math.random() * characters.length);
+        randomCode += characters[randomIndex];
+    }
+    // Set the values of the corresponding form inputs in the modal
+    $("#add-voucher-modal").find("#txtvoucher_code").attr("value", randomCode);
+});
+
diff --git a/src/main/webapp/assets/js/validateForm.js b/src/main/webapp/assets/js/validateForm.js
index 75c9b6cf..753fcba6 100644
--- a/src/main/webapp/assets/js/validateForm.js
+++ b/src/main/webapp/assets/js/validateForm.js
@@ -240,27 +240,40 @@ function validateForm() {
             form.submit();
         }
     });
-    
-    $(".add-vouhcer-form").validate({
+   
+    $(".add-voucher-form").validate({
         rules: {
             txtvoucher_name: {
                 required: true,
                 maxlength: 100,
             },
+            txtvoucher_code: {
+                required: true,
+                maxlength: 16,
+            },
             txtvoucher_discount_percent: {
                 required: true,
                 range: [0, 100]
+            },
+            txtvoucher_quantity: {
+                required: true,
             }
-
         },
         messages: {
             txtvoucher_name: {
                 required: "Vui lòng nhập tên Voucher",
                 maxlength: "Tên Voucher không được vượt quá 100 ký tự"
             },
+            txtvoucher_code: {
+                required: "Vui lòng nhập mã code",
+                maxlength: "Tên Voucher không được vượt quá 16 ký tự"
+            },
             txtvoucher_discount_percent: {
                 required: "Vui lòng nhập phần trăm giảm giá",
                 range: "Vui lòng nhập từ 0% đến 100%"
+            },
+            txtvoucher_quantity: {
+                required: "Vui lòng nhập số lượng giảm giá",
             }
         },
         submitHandler: function (form) {
@@ -268,16 +281,23 @@ function validateForm() {
             form.submit();
         }
     });
-    
-    $(".update-vouhcer-form").validate({
+  
+    $(".update-voucher-form").validate({
         rules: {
             txtvoucher_name: {
                 required: true,
                 maxlength: 100,
             },
+            txtvoucher_code: {
+                required: true,
+                maxlength: 16,
+            },
             txtvoucher_discount_percent: {
                 required: true,
                 range: [0, 100]
+            },
+            txtvoucher_quantity: {
+                required: true,
             }
         },
         messages: {
@@ -285,9 +305,16 @@ function validateForm() {
                 required: "Vui lòng nhập tên Voucher",
                 maxlength: "Tên Voucher không được vượt quá 100 ký tự"
             },
+            txtvoucher_code: {
+                required: "Vui lòng nhập mã code",
+                maxlength: "Tên Voucher không được vượt quá 16 ký tự"
+            },
             txtvoucher_discount_percent: {
                 required: "Vui lòng nhập phần trăm giảm giá",
                 range: "Vui lòng nhập từ 0% đến 100%"
+            },
+            txtvoucher_quantity: {
+                required: "Vui lòng nhập số lượng giảm giá",
             }
         },
         submitHandler: function (form) {
diff --git a/src/main/webapp/promotionManager.jsp b/src/main/webapp/promotionManager.jsp
index eba9add1..e091ca2e 100644
--- a/src/main/webapp/promotionManager.jsp
+++ b/src/main/webapp/promotionManager.jsp
@@ -14,8 +14,8 @@
 
         <title>FFood | Promotion Manager Dashboard</title>
 
-    <%@ include file="WEB-INF/jspf/common/imports/resources.jspf" %>
-    <%@ include file="WEB-INF/jspf/admin/imports/dataTablesStyle.jspf" %>
+        <%@ include file="WEB-INF/jspf/common/imports/resources.jspf" %>
+        <%@ include file="WEB-INF/jspf/admin/imports/dataTablesStyle.jspf" %>
     </head>
     <body>
         <div class="container-fluid m-0 p-0">
@@ -23,7 +23,7 @@
                 <%@ include file="WEB-INF/jspf/promotionManager/components/addVoucher.jspf" %>
                 <%@ include file="WEB-INF/jspf/promotionManager/components/updatevoucher.jspf" %>
                 <%@ include file="WEB-INF/jspf/promotionManager/components/deleteVoucher.jspf" %>
-                
+
                 <%@ include file="WEB-INF/jspf/promotionManager/components/promotionManagerSidebar.jspf" %>
 
                 <!-- Main Content -->
@@ -31,23 +31,26 @@
                     <div class="tab-content">
                         <!-- Home Tab Content -->
                         <%@ include file="WEB-INF/jspf/promotionManager/home.jspf" %>
-                     
-                        
-                          <!-- Promotion Tab Content -->
+
+                        <!-- Voucher Tab Content -->
                         <div class="tab-pane fade" id="promotions">
                             <div class="container-fluid p-2">
                                 <table id="users-table" class="table table-bordered table-striped">
                                     <h1 class="text-center fw-bold fs-3" align="left">Khuyến mãi</h1>
                                     <button style="color: white;border-color: rgba(207, 126, 0, 1); background-color: rgba(207, 126, 0, 1);"
-                                            type="button" class="btn btn-sm btn-success py-1 my-2 me-2" data-bs-toggle="modal" data-bs-target="#add-voucher-modal">
+                                            type="button" id="btn-add-voucher" class="btn btn-sm btn-success py-1 my-2 me-2" data-bs-toggle="modal" data-bs-target="#add-voucher-modal">
                                         Tạo Khuyến mãi
                                     </button>
                                     <thead>
                                         <tr>
                                             <th class="col-sm-3 col-gap-5">Mã Khuyến mãi</th>  
                                             <th>Tên Khuyến mãi</th>
-                                            <th>Voucher</th>
-                                            <th >Thao tác</th>
+                                            <th>Mã Code</th>
+                                            <th>Phần trăm KM</th>
+                                            <th>Số lượng</th>
+                                            <th>Trạng thái</th>
+                                            <th>Thời gian</th>
+                                            <th>Thao tác</th>
 
                                         </tr>
                                     </thead>
@@ -55,16 +58,23 @@
                                         <c:forEach items="${voucherList}" var="v">
                                             <tr>
                                                 <td>${v.voucherID}</td>
-                                                <td>${v.name}</td>
-
+                                                <td>${v.voucher_name}</td>
+                                                <td>${v.voucher_code}</td>
                                                 <td>${(v.voucher_discount_percent == null) ? 0 : v.voucher_discount_percent}%</td>                                 
+                                                <td>${v.voucher_quantity}</td>
+                                                <td>${v.voucher_status eq 0 ? 'Hết' : 'Còn'}</td>
+                                                <td>${v.voucher_date}</td>
                                                 <td>
                                                     <button style="color: white;border-color: rgba(207, 126, 0, 1); background-color: rgba(207, 126, 0, 1);"
                                                             type="button" id="btn-update-voucher"
                                                             class="btn btn-sm btn-success py-1 m-1"
                                                             data-voucher-id="${v.voucherID}"
-                                                            data-voucher-name="${v.name}"
+                                                            data-voucher-name="${v.voucher_name}"
+                                                            data-voucher-code ="${v.voucher_code}"
                                                             data-voucher-discount-percent="${v.voucher_discount_percent}"
+                                                            data-voucher-quantity ="${v.voucher_quantity}"
+                                                            data-voucher-status ="${v.voucher_status}"
+                                                            data-voucher-date ="${v.voucher_date}"
                                                             data-bs-toggle="modal" data-bs-target="#update-voucher-modal">
                                                         Cập nhật
                                                     </button>
@@ -72,7 +82,7 @@
                                                             type="button" id="btn-delete-voucher"
                                                             class="btn btn-sm btn-danger py-1 m-1"
                                                             data-voucher-id="${v.voucherID}"
-                                                            data-voucher-name="${v.name}"
+                                                            data-voucher-name="${v.voucher_name}"
                                                             data-bs-toggle="modal" data-bs-target="#delete-voucher-modal">
                                                         Xóa
                                                     </button>
@@ -83,8 +93,6 @@
                                 </table>
                             </div>
                         </div>
-
-                 
                     </div>
                 </main>
             </div>