diff --git a/assets/script/pc_style.css b/assets/script/pc_style.css
index 87957c4..6a61274 100644
--- a/assets/script/pc_style.css
+++ b/assets/script/pc_style.css
@@ -11,6 +11,7 @@ select {
   outline: none !important;
   color: #000;
   border-radius: 0;
+  cursor: pointer;
 }
 
 button,
@@ -762,6 +763,7 @@ input[type=radio]:focus:before {
 .order-page .order-page-table td {
   padding: 14px 8px;
   text-align: center;
+  vertical-align: middle;
 }
 .order-page .order-page-table td:nth-child(4), .order-page .order-page-table td:nth-child(10) {
   text-align: left;
@@ -797,6 +799,7 @@ input[type=radio]:focus:before {
 .order-page-table td {
   padding: 10px;
   border: 1px solid #ececec;
+  vertical-align: top;
 }
 .order-page-table select {
   border-radius: 4px;
@@ -841,6 +844,12 @@ input[type=radio]:focus:before {
   color: #9e9e9e !important;
 }
 
+.td-border-0 td {
+  border: 0 !important;
+  padding: 3px 0;
+  width: auto;
+}
+
 .paging {
   margin: 30px 0;
   display: flex;
@@ -949,4 +958,4 @@ input[type=radio]:focus:before {
 .list-info-reply td {
   padding: 7px 6px;
   border: 1px solid #ececec;
-}/*# sourceMappingURL=pc_style.css.map */
+}/*# sourceMappingURL=pc_style.css.map */
\ No newline at end of file
diff --git a/assets/script/pc_style.css.map b/assets/script/pc_style.css.map
index fe12250..a0309cf 100644
--- a/assets/script/pc_style.css.map
+++ b/assets/script/pc_style.css.map
@@ -1 +1 @@
-{"version":3,"sources":["pc_style.css","pc_style.scss"],"names":[],"mappings":"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","file":"pc_style.css"}
\ No newline at end of file
+{"version":3,"sources":["pc_style.css","pc_style.scss"],"names":[],"mappings":"AAAA,gBAAgB;ACAhB;;;EAGI,sBAAA;ADEJ;;ACAA;;;EAGI,wBAAA;EACA,WAAA;EACA,gBAAA;EACA,eAAA;ADGJ;;ACDA;;EAEI,iBAAA;ADIJ;;ACFA;;;;;EAKI,SAAA;EACA,oBAAA;EACA,kBAAA;EACA,oBAAA;EACA,gBAAA;ADKJ;;ACHA;;EAEI,wBAAA;ADMJ;;ACJA;EACI,0BAAA;ADOJ;;ACLA;EACI,uBAAA;EACA,SAAA;EACA,kBAAA;EACA,eAAA;EACA,YAAA;EACA,OAAA;EACA,kBAAA;EACA,QAAA;EACA,MAAA;EACA,WAAA;ADQJ;;ACNA;EACI,WAAA;EACA,gCAAA;EACA,mBAAA;EACA,kBAAA;EACA,eAAA;EACA,sBAAA;EACA,sBAAA;EACA,gBAAA;EACA,gBAAA;EACA,YAAA;EACA,iBAAA;ADSJ;;ACPA;EACI,eAAA;EACA,YAAA;ADUJ;;ACRA;EACI,WAAA;ADWJ;;ACTA;EACI,qBAAA;ADYJ;;ACVA;EACI,mBAAA;ADaJ;;ACXA;EACI,gBAAA;EACA,kBAAA;ADcJ;;ACZA;EACI,gBAAA;ADeJ;;ACbA;EACI,UAAA;EACA,YAAA;ADgBJ;;ACbI;EACI,WAAA;EACA,WAAA;EACA,cAAA;ADgBR;;ACbA;EACI,kBAAA;EACA,oBAAA;EACA,oBAAA;EACA,SAAA;ADgBJ;;ACdA;EACI,uBAAA;EACA,qBAAA;EACA,oBAAA;EACA,4BAAA;EACA,gBAAA;ADiBJ;;ACfA;EACI,uBAAA;EACA,qBAAA;EACA,oBAAA;EACA,4BAAA;EACA,gBAAA;ADkBJ;;AChBA;EACI,uBAAA;EACA,qBAAA;EACA,oBAAA;EACA,4BAAA;EACA,gBAAA;ADmBJ;;ACjBA;EACI,uBAAA;EACA,qBAAA;EACA,oBAAA;EACA,4BAAA;EACA,gBAAA;ADoBJ;;AClBA;EACI,sDAAA;EACA,4BAAA;EACA,2BAAA;ADqBJ;;ACnBA;EACI,iBAAA;EACA,YAAA;EACA,aAAA;ADsBJ;;ACpBA;EACI,kBAAA;EACA,cAAA;EACA,mBAAA;EACA,WAAA;EACA,UAAA;EACA,eAAA;EACA,iBAAA;ADuBJ;ACtBI;EACI,WAAA;ADwBR;ACtBI;EACI,cAAA;EACA,mBAAA;EACA,iBAAA;ADwBR;ACvBQ;EACI,YAAA;ADyBZ;ACtBI;EACI,cAAA;ADwBR;ACpBY;EACI,wBAAA;ADsBhB;ACpBY;EACI,mBAAA;ADsBhB;ACrBgB;EACI,gBAAA;ADuBpB;ACpBY;EACI,uBAAA;ADsBhB;ACpBY;EACI,wBAAA;ADsBhB;AClBI;EACI,aAAA;EACA,mBAAA;EACA,8BAAA;EACA,eAAA;EACA,mBAAA;EACA,kBAAA;EACA,kBAAA;EACA,oBAAA;ADoBR;ACnBQ;EACI,iBAAA;EACA,aAAA;EACA,mBAAA;ADqBZ;AClBI;EACI,kBAAA;EACA,WAAA;EACA,oBAAA;ADoBR;AClBI;EACI,aAAA;EACA,mBAAA;EACA,eAAA;EACA,iBAAA;EACA,oBAAA;EACA,kBAAA;ADoBR;ACnBQ;EACI,mBAAA;ADqBZ;ACpBY;EACI,uBAAA;ADsBhB;ACnBQ;EACI,WAAA;EACA,YAAA;EACA,kBAAA;ADqBZ;AClBI;EACI,4BAAA;ADoBR;AClBI;EACI,4BAAA;EACA,kBAAA;ADoBR;ACnBQ;EACI,WAAA;EACA,UAAA;EACA,yBAAA;EACA,mBAAA;EACA,kBAAA;EACA,UAAA;EACA,SAAA;ADqBZ;ACnBQ;EACI,cAAA;EACA,mBAAA;EACA,kBAAA;ADqBZ;ACpBY;EACI,0BAAA;ADsBhB;ACpBY;EACI,gBAAA;EACA,qBAAA;ADsBhB;ACpBY;EACI,WAAA;EACA,UAAA;EACA,WAAA;EACA,kBAAA;EACA,mBAAA;EACA,kBAAA;EACA,QAAA;EACA,WAAA;ADsBhB;ACpBY;EACI,SAAA;ADsBhB;AClBI;EACI,8BAAA;ADoBR;AClBI;EACI,+BAAA;ADoBR;AClBI;EACI,+BAAA;ADoBR;AClBI;EACI,gCAAA;ADoBR;AClBI;EACI,gCAAA;ADoBR;AClBI;EACI,gCAAA;ADoBR;AClBI;EACI,gCAAA;ADoBR;AClBI;EACI,gCAAA;ADoBR;AClBI;EACI,gCAAA;ADoBR;AClBI;EACI,gCAAA;ADoBR;AClBI;EACI,gCAAA;ADoBR;AClBI;EACI,+BAAA;ADoBR;AClBI;EACI,kBAAA;EACA,WAAA;ADoBR;AClBI;EACI,gCAAA;ADoBR;AClBI;EACI,iCAAA;ADoBR;AClBI;EACI,iCAAA;ADoBR;AClBI;EACI,kCAAA;ADoBR;AClBI;EACI,kCAAA;ADoBR;;ACjBA;EACI,WAAA;EACA,UAAA;ADoBJ;ACnBI;EACI,aAAA;EACA,mBAAA;EACA,oBAAA;EACA,kBAAA;ADqBR;ACpBQ;EAEI,mBAAA;ADqBZ;ACpBY;EACI,uBAAA;ADsBhB;AClBY;EACI,sBAAA;EACA,UAAA;EACA,mBAAA;ADoBhB;AClBY;EACI,cAAA;ADoBhB;AChBY;EACI,UAAA;ADkBhB;ACfgB;EACI,SAAA;EACA,SAAA;ADiBpB;ACbQ;EACI,kBAAA;EACA,WAAA;EACA,WAAA;EACA,YAAA;EACA,YAAA;EACA,aAAA;ADeZ;ACZY;EACI,UAAA;ADchB;ACVI;EACI,4BAAA;EACA,kBAAA;EACA,mBAAA;EACA,+CAAA;EACA,mBAAA;EACA,gBAAA;EACA,WAAA;EACA,oBAAA;EACA,kBAAA;EACA,uBAAA;EACA,MAAA;EACA,UAAA;EACA,kBAAA;EACA,gBAAA;ADYR;ACXQ;EACI,cAAA;EACA,mBAAA;EACA,iBAAA;EACA,kBAAA;ADaZ;ACZY;EACI,0BAAA;ADchB;ACZY;EACI,gBAAA;EACA,qBAAA;ADchB;ACZY;EACI,WAAA;EACA,UAAA;EACA,WAAA;EACA,kBAAA;EACA,mBAAA;EACA,kBAAA;EACA,QAAA;EACA,WAAA;ADchB;ACZY;EACI,SAAA;ADchB;ACVI;EACI,kBAAA;EACA,gBAAA;EACA,kBAAA;EACA,iBAAA;EACA,gBAAA;EACA,mBAAA;EACA,mBAAA;ADYR;ACXQ;EACI,WAAA;EACA,YAAA;EACA,mBAAA;EACA,kBAAA;EACA,SAAA;EACA,QAAA;EACA,WAAA;ADaZ;ACXQ;EACI,gBAAA;ADaZ;ACXQ;EACI,uBAAA;ADaZ;ACVI;EACI,WAAA;EACA,YAAA;ADYR;ACVI;EACI,4BAAA;ADYR;ACVI;EACI,8BAAA;ADYR;ACVI;EACI,8BAAA;ADYR;ACVI;EACI,+BAAA;ADYR;ACVI;EACI,+BAAA;ADYR;ACVI;EACI,+BAAA;ADYR;ACVI;EACI,+BAAA;ADYR;ACVI;EACI,+BAAA;ADYR;ACVI;EACI,+BAAA;EACA,iBAAA;ADYR;ACVI;EACI,+BAAA;ADYR;ACVI;EACI,+BAAA;ADYR;ACVI;EACI,8BAAA;ADYR;ACVI;EACI,+BAAA;ADYR;ACVI;EACI,iCAAA;ADYR;ACVI;EACI,iCAAA;ADYR;ACVI;EACI,kCAAA;ADYR;ACVI;EACI,kCAAA;ADYR;ACVI;EACI,kBAAA;ADYR;ACVI;EACI,kBAAA;EACA,MAAA;EACA,YAAA;EACA,WAAA;EACA,cAAA;EACA,oDAAA;ADYR;ACXQ;EACI,cAAA;EACA,cAAA;EACA,kBAAA;EACA,iBAAA;ADaZ;;ACTA;EACI,wBAAA;ADYJ;ACXI;EACI,UAAA;EACA,cAAA;ADaR;ACXI;EACI,gBAAA;ADaR;ACZQ;EACI,cAAA;EACA,eAAA;EACA,iBAAA;EACA,oBAAA;ADcZ;ACbY;EACI,mBAAA;EACA,cAAA;EACA,gBAAA;ADehB;ACXI;EACI,yBAAA;ADaR;;ACVA;EACI,kBAAA;ADaJ;ACZI;EACI,iBAAA;EACA,yBAAA;ADcR;ACXQ;EACI,gBAAA;ADaZ;ACZY;EAEI,gBAAA;ADahB;ACXY;EACI,cAAA;ADahB;;ACRA;EACI,cAAA;ADWJ;ACVI;EACI,cAAA;EACA,kBAAA;EACA,kBAAA;EACA,+BAAA;EACA,mBAAA;ADYR;ACXQ;EACI,SAAA;ADaZ;ACXQ;EAEI,mBAAA;EACA,WAAA;ADYZ;;ACRA;EACI,aAAA;ADWJ;ACVI;EACI,WAAA;EACA,iBAAA;EACA,kBAAA;ADYR;ACVI;EACI,mBAAA;EACA,gBAAA;ADYR;ACVI;EACI,yBAAA;EACA,iBAAA;ADYR;ACXQ;EACI,cAAA;EACA,mBAAA;EACA,gBAAA;EACA,uBAAA;ADaZ;ACXQ;EACI,gBAAA;ADaZ;;ACRI;EACI,cAAA;EACA,sBAAA;ADWR;ACVQ;EAGI,mBAAA;ADUZ;;ACLI;EACI,aAAA;EACA,yBAAA;EACA,mBAAA;ADQR;ACNI;EACI,YAAA;EACA,yBAAA;ADQR;;ACHI;EACI,aAAA;EACA,yBAAA;ADMR;;ACFA;EACI,kBAAA;ADKJ;ACJI;EACI,WAAA;EACA,gBAAA;EACA,mBAAA;EACA,2BAAA;EACA,qBAAA;EACA,WAAA;EACA,YAAA;EACA,kBAAA;EACA,WAAA;EACA,iBAAA;EACA,mBAAA;EACA,eAAA;EACA,kBAAA;EACA,0BAAA;ADMR;ACFQ;EACI,yBAAA;EACA,gCAAA;ADIZ;ACAQ;EACI,aAAA;EACA,qBAAA;ADEZ;;ACII;EACI,aAAA;EACA,yBAAA;ADDR;;ACMI;EACI,aAAA;EACA,yBAAA;ADHR;;ACQI;EACI,iBAAA;EACA,mBAAA;EACA,yBAAA;ADLR;ACOI;EACI,aAAA;EACA,yBAAA;ADLR;;ACUI;EACI,iBAAA;EACA,mBAAA;EACA,yBAAA;ADPR;ACSI;EACI,iBAAA;EACA,yBAAA;ADPR;;ACWA;EACI,WAAA;EACA,YAAA;EACA,cAAA;ADRJ;ACSI;EACI,gCAAA;ADPR;ACSI;EACI,YAAA;EACA,iCAAA;ADPR;ACSI;EACI,YAAA;EACA,iCAAA;ADPR;ACSI;EACI,iCAAA;ADPR;ACSI;EACI,iCAAA;ADPR;ACSI;EACI,iCAAA;ADPR;ACSI;EACI,iCAAA;ADPR;ACSI;EACI,WAAA;EACA,YAAA;EACA,+BAAA;ADPR;ACSI;EACI,WAAA;EACA,YAAA;EACA,gCAAA;ADPR;ACSI;EACI,WAAA;EACA,YAAA;EACA,iCAAA;ADPR;ACSI;EACI,WAAA;EACA,YAAA;EACA,iCAAA;ADPR;ACSI;EACI,WAAA;EACA,YAAA;EACA,iCAAA;ADPR;ACSI;EACI,WAAA;EACA,YAAA;EACA,iCAAA;ADPR;;ACYI;EACI,iBAAA;ADTR;;ACaA,aAAA;AAGQ;EACI,iBAAA;EACA,8BAAA;EACA,mBAAA;EACA,cAAA;EACA,gBAAA;EACA,eAAA;ADZZ;ACaY;EAGI,mBAAA;EACA,WAAA;ADbhB;ACiBI;EACI,kBAAA;ADfR;ACiBY;EACI,YAAA;ADfhB;ACkBQ;EACI,iBAAA;EACA,kBAAA;EACA,sBAAA;ADhBZ;ACiBY;EAEI,gBAAA;ADhBhB;ACkBY;EACI,qBAAA;ADhBhB;;ACqBA;EACI,iBAAA;ADlBJ;ACmBI;EACI,cAAA;ADjBR;ACkBQ;EACI,0BAAA;ADhBZ;ACmBI;EACI,WAAA;ADjBR;ACmBI;EACI,mBAAA;EACA,gBAAA;EACA,kBAAA;EACA,mBAAA;ADjBR;ACkBQ;EACI,YAAA;ADhBZ;ACoBQ;EACI,mBAAA;ADlBZ;ACqBI;EACI,aAAA;EACA,yBAAA;EACA,mBAAA;ADnBR;ACqBI;EACI,kBAAA;EACA,yBAAA;EACA,+CAAA;EACA,YAAA;EACA,cAAA;EACA,WAAA;EACA,kBAAA;EACA,gBAAA;ADnBR;ACqBI;EACI,WAAA;EACA,YAAA;EACA,yBAAA;EACA,yBAAA;EACA,kBAAA;ADnBR;ACqBI;EACI,yBAAA;EACA,yBAAA;EACA,iCAAA;EACA,iBAAA;ADnBR;ACqBI;EACI,iCAAA;ADnBR;;ACuBI;EACI,mBAAA;EACA,6BAAA;EACA,SAAA;EACA,WAAA;EACA,YAAA;ADpBR;;ACuBA;EACI,8BAAA;EACA,kBAAA;EACA,oBAAA;EACA,sBAAA;EACA,yBAAA;ADpBJ;;ACuBI;EACI,oBAAA;EACA,cAAA;EACA,WAAA;ADpBR;;ACuBA;EACI,cAAA;EACA,aAAA;EACA,mBAAA;EACA,uBAAA;EACA,iBAAA;ADpBJ;ACqBI;EACI,aAAA;EACA,eAAA;EACA,kBAAA;EACA,eAAA;EACA,eAAA;EACA,kBAAA;ADnBR;ACoBQ;EAGI,mBAAA;EACA,WAAA;ADpBZ;;ACwBA;EACI,aAAA;EACA,iBAAA;ADrBJ;ACsBI;EACI,qBAAA;ADpBR;ACqBQ;EACI,cAAA;ADnBZ;ACqBQ;EACI,gBAAA;EACA,wBAAA;EACA,eAAA;EACA,aAAA;ADnBZ;ACqBQ;EACI,cAAA;ADnBZ;ACoBY;EACI,aAAA;ADlBhB;;ACwBI;EACI,gBAAA;EACA,mBAAA;EACA,yBAAA;ADrBR;ACuBI;EACI,gBAAA;EACA,yBAAA;ADrBR;;AC0BI;EACI,eAAA;EACA,gCAAA;ADvBR;ACwBQ;EACI,yBAAA;EACA,kBAAA;ADtBZ;ACwBQ;EACI,WAAA;EACA,cAAA;ADtBZ;ACwBQ;EACI,gBAAA;EACA,iBAAA;ADtBZ;ACwBQ;EACI,gBAAA;EACA,cAAA;EACA,iBAAA;EACA,cAAA;EACA,eAAA;ADtBZ;;AC4BI;EACI,gBAAA;EACA,mBAAA;EACA,yBAAA;EACA,mBAAA;ADzBR;AC2BI;EACI,gBAAA;EACA,yBAAA;ADzBR;;AC8BI;EACI,gBAAA;EACA,mBAAA;EACA,yBAAA;EACA,mBAAA;AD3BR;AC6BI;EACI,gBAAA;EACA,yBAAA;AD3BR;;ACgCI;EACI,gBAAA;EACA,mBAAA;EACA,yBAAA;EACA,mBAAA;AD7BR;AC+BI;EACI,gBAAA;EACA,yBAAA;AD7BR","file":"pc_style.css"}
\ No newline at end of file
diff --git a/assets/script/pc_style.scss b/assets/script/pc_style.scss
index 787f894..683c697 100644
--- a/assets/script/pc_style.scss
+++ b/assets/script/pc_style.scss
@@ -9,6 +9,7 @@ select {
     outline: none !important;
     color: #000;
     border-radius: 0;
+    cursor: pointer;
 }
 button,
 input {
@@ -779,6 +780,7 @@ input[type="radio"] {
         td {
             padding: 14px 8px;
             text-align: center;
+            vertical-align: middle;
             &:nth-child(4),
             &:nth-child(10) {
                 text-align: left;
@@ -817,6 +819,7 @@ input[type="radio"] {
     td {
         padding: 10px;
         border: 1px solid #ececec;
+        vertical-align: top;
     }
     select {
         border-radius: 4px;
@@ -861,6 +864,13 @@ input[type="radio"] {
     right: 10px !important;
     color: #9e9e9e !important;
 }
+.td-border-0{
+    td{
+        border: 0 !important;
+        padding: 3px 0;
+        width: auto;
+    }
+}
 .paging {
     margin: 30px 0;
     display: flex;
diff --git a/template/marketing/coupon.html b/template/marketing/coupon.html
index 1a6b886..93d42a6 100644
--- a/template/marketing/coupon.html
+++ b/template/marketing/coupon.html
@@ -57,9 +57,7 @@
                             <span class="inline-block m-[0_0_6px_0] bg-[#F9F2F2] font-[500] p-[0_7px] leading-[20px] rounded-[50px] text-[12px] text-[#E00000] shadow-[0_0_0_1px_#E00000]">
                                 Đã dừng 
                             </span>
-                        </div>
-
-                        <p>- Giá trị đơn hàng tối thiểu: <b class="text-[#E00000] font-bold">2.000.000 đ</b> </p>
+                        </div>                        
                     </td>
                     
                     <td>
@@ -69,7 +67,8 @@
                     
                     <td>
                         <p> - Tạo bởi: Đức (05-09-2022, 9:48 am) </p>
-                        <p> - Cập nhật cuối: hongvt@hurasoft.com<br>(03-10-2023, 8:31 am) </p>                        
+                        <p> - Cập nhật cuối: hongvt@hurasoft.com<br>(03-10-2023, 8:31 am) </p>
+                        <p>- Giá trị đơn hàng tối thiểu: <b class="text-[#E00000] font-bold">2.000.000 đ</b> </p>
                     </td>
 
                     <td>
@@ -85,7 +84,7 @@
                     </td>
                 </tr>
 
-                <tr> <td align="center"> 2 </td><td class="whitespace-nowrap"> CP231020233 </td><td> <p class="font-bold"> Test phiếu giảm giá </p><div> Test phiếu giảm giá </div></td><td> <p class="font-bold"> Tặng sản phẩm </p><p> Balo thời trang </p></td><td> <div style="display: block;"> <p class="inline-block m-[0_6px_6px_0]"> - Bắt đầu: 23-10-2023, 12:00 am </p><span class="inline-block m-[0_0_6px_0] bg-[#F7F5FF] font-[500] p-[0_7px] leading-[20px] rounded-[50px] text-[12px] text-[#0041E8] shadow-[0_0_0_1px_#0041E8]"> Đã chạy </span> </div><div> <p class="inline-block m-[0_6px_6px_0]"> - Kết thúc: 28-10-2023, 12:00 am </p><span class="inline-block m-[0_0_6px_0] bg-[#F9F2F2] font-[500] p-[0_7px] leading-[20px] rounded-[50px] text-[12px] text-[#E00000] shadow-[0_0_0_1px_#E00000]"> Đã dừng </span> </div><p>- Giá trị đơn hàng tối thiểu: <b class="text-[#E00000] font-bold">2.000.000 đ</b> </p></td><td> <p> 0 đã dùng </p><p> Tổng số: 20 </p></td><td> <p> - Tạo bởi: Đức (05-09-2022, 9:48 am) </p><p> - Cập nhật cuối: hongvt@hurasoft.com<br>(03-10-2023, 8:31 am) </p></td><td> <div class="items-center" style="display: flex;"> <a href="/admin/marketing/coupon-add?id=8" class="icons icon-edit" title="Sửa lại"></a> <a href="javascript:setStatus('8','off')" title="Hạ xuống" class="far fa-eye-slash bg-[#F9F9F9] leading-[30px] rounded-[5px] text-[#9E9E9E_!important] text-center w-[30px] border border-[#ECECEC] mr-[6px]"></a> <a href="javascript:delete_coupon('8')" class="icons icon-delete" title="Xóa"></a> </div></td></tr>
+                <tr> <td align="center"> 2 </td><td class="whitespace-nowrap"> CP231020233 </td><td> <p class="font-bold"> Test phiếu giảm giá </p><div> Test phiếu giảm giá </div></td><td> <p class="font-bold"> Tặng sản phẩm </p><p> Balo thời trang </p></td><td> <div style="display: block;"> <p class="inline-block m-[0_6px_6px_0]"> - Bắt đầu: 23-10-2023, 12:00 am </p><span class="inline-block m-[0_0_6px_0] bg-[#F7F5FF] font-[500] p-[0_7px] leading-[20px] rounded-[50px] text-[12px] text-[#0041E8] shadow-[0_0_0_1px_#0041E8]"> Đã chạy </span> </div><div> <p class="inline-block m-[0_6px_6px_0]"> - Kết thúc: 28-10-2023, 12:00 am </p><span class="inline-block m-[0_0_6px_0] bg-[#F9F2F2] font-[500] p-[0_7px] leading-[20px] rounded-[50px] text-[12px] text-[#E00000] shadow-[0_0_0_1px_#E00000]"> Đã dừng </span> </div></td><td> <p> 0 đã dùng </p><p> Tổng số: 20 </p></td><td> <p> - Tạo bởi: Đức (05-09-2022, 9:48 am) </p><p> - Cập nhật cuối: hongvt@hurasoft.com<br>(03-10-2023, 8:31 am) </p><p>- Giá trị đơn hàng tối thiểu: <b class="text-[#E00000] font-bold">2.000.000 đ</b> </p></td><td> <div class="items-center" style="display: flex;"> <a href="/admin/marketing/coupon-add?id=8" class="icons icon-edit" title="Sửa lại"></a> <a href="javascript:setStatus('8','off')" title="Hạ xuống" class="far fa-eye-slash bg-[#F9F9F9] leading-[30px] rounded-[5px] text-[#9E9E9E_!important] text-center w-[30px] border border-[#ECECEC] mr-[6px]"></a> <a href="javascript:delete_coupon('8')" class="icons icon-delete" title="Xóa"></a> </div></td></tr>
             </tbody>
         </table>
     </div>
diff --git a/template/marketing/coupon_add.html b/template/marketing/coupon_add.html
index 58146a5..577884e 100644
--- a/template/marketing/coupon_add.html
+++ b/template/marketing/coupon_add.html
@@ -4,29 +4,27 @@
 </div>
 
 <div class="max-w-[1141px] m-auto">
-    <div class="text-right m-[0_0_12px]">
-        <a href="/admin/marketing/coupon-add" class="inline-flex items-center whitespace-nowrap border border-[#0041E8] rounded-[4px] bg-[#F5F7FF] text-[#0041E8] leading-[35px] p-[0_12px] m-[0_10px_0_0] group hover:bg-[#0041E8] hover:text-[#fff]">
-            <span class="border-[1px] border-[#0041E8] h-[13px] w-[13px] leading-[10.2px] text-center rounded-[50%] mr-1 group-hover:border-[#fff]">+</span>
-            <span>Thêm phiếu mới</span>
-        </a>
-    
-        <a href="/admin/marketing/coupon" class="inline-flex items-center whitespace-nowrap border border-[#0041E8] rounded-[4px] bg-[#F5F7FF] text-[#0041E8] leading-[35px] p-[0_12px] group hover:bg-[#0041E8] hover:text-[#fff]">
-            <i class="fas fa-clipboard-list mr-[8px]"></i>
-            <span>Danh sách</span>
-        </a>
-    </div>    
-    
     <div class="flex flex-wrap items-start m-[16px_0]">
         {% if global.url contains 'id=' %} <!-- Form chỉnh sửa -->
+            <div class="w-[100%] p-[11px_16px] bg-white m-[0_0_16px] rounded-[10px] shadow-[0px_1px_1px_0px_rgba(0,0,0,0.10)] leading-[18px] flex flex-wrap items-center justify-between">
+                <p class="font-bold text-[20px]"> Cập nhật </p>
 
-            <p class="w-[100%] bg-white m-[0_0_16px] text-center rounded-[10px] shadow-[0px_1px_1px_0px_rgba(0,0,0,0.10)] leading-[54px] text-[18px] font-bold"> Cập nhật coupon: Giảm tiền mặt </p>
+                <a href="/admin/marketing/coupon-add" class="inline-flex items-center whitespace-nowrap border border-[#ECECEC] rounded-[4px] bg-[#fff] text-[#6B7280] leading-[35px] p-[0_12px] m-[0_10px_0_0] group hover:bg-[#0041E8] hover:text-[#fff]">
+                    <span class="border-[1px] border-[#6B7280] h-[13px] w-[13px] leading-[10.3px] text-center rounded-[50%] mr-1 group-hover:border-[#fff]">+</span>
+                    <span>Thêm phiếu mới</span>
+                </a>
+
+                <p class="w-[100%] text-[#6B7280]">
+                    Giảm 10.000đ khi mua đặt hàng online (nhập mã test2023)
+                </p>
+            </div>            
 
             <div class="w-[270px] m-[0_16px_0_0] bg-white rounded-[10px] shadow-[0px_1px_1px_0px_rgba(0,0,0,0.10)] font-[500] leading-[24px] overflow-hidden">
                 <a href="javascript:void(0)" class="block p-[6px_16px] text-[#919699] hover:text-[#fff] hover:bg-[#0041E8] transition" style="color: #Fff;background: #0041E8;"> Chỉnh sửa </a>
                 <a href="/admin/marketing/coupon-product?id=8" class="block p-[6px_16px] text-[#919699] hover:text-[#fff] hover:bg-[#0041E8] transition"> Danh sách sản phẩm </a>
             </div>
             
-            <form method="post" enctype="multipart/form-data" class="order-page-table w-[852px] bg-white p-[20px_16px] rounded-[15px] shadow-[0px_1px_1px_0px_rgba(0,0,0,0.10)] leading-[20px] block">
+            <form method="post" enctype="multipart/form-data" class="order-page-table w-[852px] bg-white p-[16px] rounded-[15px] shadow-[0px_1px_1px_0px_rgba(0,0,0,0.10)] leading-[20px] block">
 
                 <input type="hidden" name="info[id]" value="0" />
 
diff --git a/template/marketing/feed.html b/template/marketing/feed.html
new file mode 100644
index 0000000..112baaf
--- /dev/null
+++ b/template/marketing/feed.html
@@ -0,0 +1,82 @@
+{% if global.url contains 'view=' %}
+
+    {% include 'marketing/feed_add' %}
+
+{% else %}
+<div class="m-[16px_0_16px_16px] p-[20px_16px] bg-white rounded-[10px] shadow-[0px_1px_1px_0px_rgba(0,0,0,0.10)] leading-[20px]">
+    <p class="leading-[31px] font-bold text-[24px] mb-[12px]"> Facebook Product Ads </p>
+
+    <div class="flex items-center justify-between mb-[20px]">
+        <p class="mr-[15px]">Tổng hợp các danh sách chứa Sản phẩm dùng quảng cáo trên Facebook. Dùng link Facebook Feed ở danh sách phù hợp để nhập trong facebook ad manager</p>
+
+        <a href="/admin/marketing/feed" class="flex items-center whitespace-nowrap border border-[#0041E8] rounded-[4px] bg-[#F5F7FF] text-[#0041E8] leading-[34px] p-[0_12px] group hover:bg-[#0041E8] hover:text-[#fff]">
+            <span class="border-[1px] border-[#0041E8] h-[13px] w-[13px] leading-[10.2px] text-center rounded-[50%] mr-1 group-hover:border-[#fff]">+</span>
+            <span>Thêm danh sách mới</span>
+        </a>
+    </div>
+
+    <div class="order-page-table">
+        <table>
+            <thead>
+                <tr>
+                    <td width="45"> STT </td>
+                    <td> Danh sách </td>
+                    <td> Sản phẩm </td>
+                    <td> Facebook feed </td>
+                    <td> Google feed </td>
+                    <td> Cập nhật </td>
+                    <td width="270"> Lựa chọn </td>
+                </tr>
+            </thead>
+
+            <tbody>
+
+                <tr>
+                    <td align="center"> 1 </td>
+
+                    <td class="font-bold"> 2023 còn hàng </td>
+
+                    <td align="center"> 6.055 sp </td>
+
+                    <td>
+                        <input type="text" value="/feed/facebook.php?id=70" readonly class="block leading-[32px] w-[100%] bg-[#fff] p-[0_10px] m-[0_0_4px] rounded-[4px] shadow-[0px_2px_4px_0px_rgba(0,0,0,0.12)]"/>
+                        <a href=""> FB feed </a>
+                    </td>
+
+                    <td>
+                        <input type="text" value="/feed/google.php?id=70" readonly class="block leading-[32px] w-[100%] bg-[#fff] p-[0_10px] m-[0_0_4px] rounded-[4px] shadow-[0px_2px_4px_0px_rgba(0,0,0,0.12)]"/>
+                        <a href=""> Google feed </a>
+                    </td>
+
+                    <td>
+                        <p> Trương Thị Thái Ninh </p>
+                        <p> 25-10-2023, 3:05 pm </p>
+                    </td>
+
+                    <td>
+                        <div class="flex items-center flex-wrap justify-center">  
+                            <a href="" class="block text-center font-[500] text-[#fff_!important] bg-[#0041E8] rounded-[4px] p-[0_9px] leading-[30px] mr-[8px]">Xem sản phẩm</a>
+
+                            <a href="" class="icons icon-edit" title="Sửa lại"></a>
+                            
+                            <a href="/admin/marketing/feed?view=fb-product-select" class="fas fa-plus-circle w-[30px] leading-[30px] mr-[8px] text-center rounded-[4px] border border-[#0041E8] bg-[#F5F7FF]" title="Thêm sản phẩm"></a>
+
+                            <a href="" class="icons icon-delete" title="Xóa"></a>
+                        </div>
+                    </td>
+                </tr>
+
+            </tbody>
+        </table>
+    </div>
+
+    <div class="paging">
+        <a href="" class="paging-prev"><i class="fas fa-chevron-left"></i></a>
+        <a href="" class="current">1</a>
+        <a href="">2</a>
+        <a href="">3</a>
+        <a href="">4</a>
+        <a href="" class="paging-next"><i class="fas fa-chevron-right"></i></a>
+    </div>
+</div>
+{% endif %}
\ No newline at end of file
diff --git a/template/marketing/feed_add.html b/template/marketing/feed_add.html
new file mode 100644
index 0000000..875fdce
--- /dev/null
+++ b/template/marketing/feed_add.html
@@ -0,0 +1,83 @@
+<div class="global-breadcrumb-container">
+    <a href="/admin/marketing/feed"> Facebook Product Ads </a>
+    <a href=""> Thêm sản phẩm hiển thị Facebook </a>
+</div>
+
+<div class="m-[0_0_16px_16px] p-[20px_16px] bg-white rounded-[10px] shadow-[0px_1px_1px_0px_rgba(0,0,0,0.10)] leading-[20px]">
+    <p class="leading-[31px] font-bold text-[24px] mb-[12px]"> Chọn sản phẩm hiển thị Facebook </p>
+
+    <form method="get" enctype="multipart/form-data" action="/admin/" class="border border-[#F6F6F6] m-[12px_0_20px] p-[15px] bg-white rounded-[10px] shadow-[0px_1px_1px_0px_rgba(0,0,0,0.10)]">
+        <input type="text" name="q" id="keyword" value="" placeholder="Tìm sản phẩm" class="w-[375px] h-[36px] border border-[#D8D8D8] m-[0_10px_0_0] p-[0_10px] bg-white rounded-[4px] shadow-[0px_2px_4px_0px_rgba(0,0,0,0.12)] ">
+        <input type="submit" value="Tìm kiếm" class="h-[36px] bg-[#0041E8] text-[#fff] font-[500] p-[0_8px] cursor-pointer rounded-[4px]">
+    </form>
+    
+    <div class="flex items-center justify-between m-[20px_0_16px]">
+        <div class="flex items-center">
+            <a href="" class="leading-[34px] border border-[#79B0E2] rounded-[4px] bg-white p-[0_15px] mr-[15px] font-[500] text-[#79B0E2] hover:bg-[#79B0E2] hover:text-[#fff]">
+                Thêm toàn bộ sản phẩm 
+            </a>
+
+            <a href="" class="leading-[34px] border border-[#79B0E2] rounded-[4px] bg-white p-[0_15px] mr-[15px] font-[500] text-[#79B0E2] hover:bg-[#79B0E2] hover:text-[#fff]">
+                Chọn danh mục Sản phẩm để xem 
+            </a>
+        </div>
+
+        <div class="flex items-center">
+            <select class="min-w-[160px] h-[36px] p-[0_5px] border border-[#D8D8D8] rounded-[4px] mr-[15px] shadow-[0px_2px_4px_0px_rgba(0,0,0,0.12)]">
+                <option value=""> Lọc sản phẩm </option>
+                <option value=""> option </option>
+            </select>
+
+            <select class="min-w-[160px] h-[36px] p-[0_5px] border border-[#D8D8D8] rounded-[4px] shadow-[0px_2px_4px_0px_rgba(0,0,0,0.12)]">
+                <option value=""> Sắp xếp sản phẩm </option>
+                <option value=""> option </option>
+            </select>
+        </div>
+    </div>
+
+    <div class="order-page-table">
+        <table>
+            <thead>
+                <tr>
+                    <td width="50"> STT </td>
+                    <td width="70"> Ảnh </td>
+                    <td> Tên Sản phẩm </td>
+                    <td> Thông tin bán hàng </td>
+                    <td width="160"> Lựa chọn </td>
+                </tr>
+            </thead>
+
+            <tbody>
+
+                <tr>
+                    <td align="center"> 1 </td>
+                    <td> <img src="https://via.placeholder.com/500x350" class="block max-w-[52px] m-auto"/> </td>
+                    <td>
+                        <a href=""> Chuột game Steelseries Prime Mini (62421) (USB/RGB) </a>
+                        <p> Mã kho: <b> MOVI213 </b>  </p>
+                        <p> Lượt xem: 3.360 </p>
+                        <p> Cập nhật: Hôm nay, 8:59 am </p>
+                    </td>
+                    <td>
+                        <p> Giá: <b class="text-[red]">999.000</b> vnđ </p>
+                        <p> Kho hàng: <b>5</b> </p>
+                        <p> Bảo hành: <b>36 Tháng</b> </p>
+                    </td>
+                    <td>
+                        <a href="" class="block text-center leading-[36px] bg-[#0041E8] text-[#fff_!important] font-[500] p-[0_12px] cursor-pointer rounded-[4px]"> Chọn sản phẩm </a>
+                    </td>
+                </tr>
+
+            </tbody>
+        </table>
+    </div>
+
+    <div class="paging">
+        <a href="" class="paging-prev"><i class="fas fa-chevron-left"></i></a>
+        <a href="" class="current">1</a>
+        <a href="">2</a>
+        <a href="">3</a>
+        <a href="">4</a>
+        <a href="" class="paging-next"><i class="fas fa-chevron-right"></i></a>
+    </div>
+</div>
\ No newline at end of file
diff --git a/template/marketing/promotion.html b/template/marketing/promotion.html
index a50999b..f6d416e 100644
--- a/template/marketing/promotion.html
+++ b/template/marketing/promotion.html
@@ -1 +1,78 @@
-template/marketing/promotion.html
\ No newline at end of file
+<div class="marketing-coupon-page bg-white m-[16px_0_16px_16px] p-[20px_16px] rounded-[15px] shadow-[0px_1px_1px_0px_rgba(0,0,0,0.10)] leading-[20px]">
+    <p class="leading-[30px] text-[24px] font-bold m-[0_0_12px]"> Khuyến mại theo sản phẩm </p>
+
+    <form method="get" enctype="multipart/form-data" action="/admin/" class="border border-[#F6F6F6] m-[12px_0_20px] p-[15px] bg-white rounded-[10px] shadow-[0px_1px_1px_0px_rgba(0,0,0,0.10)]">
+        <input type="hidden" name="opt" value="marketing">
+        <input type="hidden" name="view" value="promotion">
+
+        <input type="text" name="q" id="keyword" value="" class="w-[375px] h-[36px] border border-[#D8D8D8] m-[0_10px_0_0] p-[0_10px] bg-white rounded-[4px] shadow-[0px_2px_4px_0px_rgba(0,0,0,0.12)] ">
+        <input type="submit" value="Tìm kiếm" class="h-[36px] bg-[#0041E8] text-[#fff] font-[500] p-[0_8px] cursor-pointer rounded-[4px]">
+    </form>
+
+    <div class="flex items-center justify-between m-[20px_0_25px]">
+        <p> Danh sách các khuyến mại đi kèm khi người dùng mua Sản phẩm. Bạn cần tạo khuyến mại và lựa chọn Sản phẩm phù hợp cho từng khuyến mại </p>
+        
+        <div class="flex items-center">
+            <a href="/admin/marketing/promotion-add" class="flex items-center whitespace-nowrap border border-[#0041E8] mr-[15px] rounded-[4px] bg-[#F5F7FF] text-[#0041E8] font-[500] leading-[35px] p-[0_12px]">
+                <span class="border-[1px] border-[#0041E8] h-[13px] w-[13px]  leading-[10px] text-center rounded-[50%] mr-1">+</span>
+                <span>Thêm khuyến mại mới</span>
+            </a>
+
+            <a href="" class="flex items-center whitespace-nowrap border border-[#0041E8] rounded-[4px] bg-[#F5F7FF] text-[#0041E8] font-[500] leading-[35px] p-[0_12px]">
+                <i class="far fa-bookmark mr-[8px]"></i>
+                <span>Nhóm khuyến mại</span>
+            </a>
+        </div>
+    </div>
+
+    <div class="order-page-table">
+        <table>
+            <thead>
+                <tr class="font-[600]">
+                    <td width="50"> STT </td>
+                    <td> Khuyến mại </td>
+                    <td> Thời gian </td>
+                    <td> Cập nhật cuối </td>
+                    <td> Sản phẩm </td>
+                    <td width="180"> Lựa chọn </td>
+                </tr>
+            </thead>
+
+            <tbody>
+                <td align="center"> 1 </td>
+
+                <td>
+                    <p>
+                        [Quà tặng] <b class="text-[#0041E8] font-bold">Phiếu mua hàng trị giá 100.000 VND</b>
+                    </p>
+                    <p> - Mô tả: Phiếu mua hàng </p>
+                    <p> - Giá trị: 0 VND </p>
+                    <p> - Số lượng: 0 </p>
+                </td>
+
+                <td>
+                    <p>Không giới hạn thời gian</p>
+                </td>
+
+                <td>
+                    <p>Admin</p>
+                    <p>06-06-2020, 10:57 am</p>
+                </td>
+
+                <td>
+                    <a href="/admin/marketing/promotion-product?id=1" class="block text-center font-[500] text-[#fff_!important] bg-[#0041E8] rounded-[4px] p-[0_9px] leading-[30px]">Xem</a>
+                </td>
+
+                <td>
+                    <div class="flex items-center flex-wrap justify-center">                        
+                        <a href="/admin/marketing/promotion-add?id=1" class="icons icon-edit" title="Sửa lại"></a> 
+                        <a href="" title="Cho Hiển thị" class="far fa-eye bg-[#F5F7FF] leading-[30px] rounded-[5px] text-[#0041E8_!important] text-center w-[30px] border border-[#0041E8] mr-[6px]"> </a>
+                        <!-- <a href="" title="Hạ Hiển thị" class="far fa-eye-slash bg-[#F9F9F9] leading-[30px] rounded-[5px] text-[#9E9E9E_!important] text-center w-[30px] border border-[#ECECEC] mr-[6px]"></a> -->
+                        <a href="" title="Dừng khuyến mại" class="fas fa-volume-mute bg-[#F9F9F9] leading-[30px] rounded-[5px] text-[#9E9E9E_!important] text-center w-[30px] border border-[#ECECEC] mr-[6px]"></a>                        
+                        <a href="" class="icons icon-delete" title="Xóa"></a>
+                    </div>
+                </td>
+            </tbody>
+        </table>
+    </div>
+</div>
\ No newline at end of file
diff --git a/template/marketing/promotion_add.html b/template/marketing/promotion_add.html
new file mode 100644
index 0000000..5b20d63
--- /dev/null
+++ b/template/marketing/promotion_add.html
@@ -0,0 +1,153 @@
+<div class="global-breadcrumb-container">
+    <a href="/admin/marketing/promotion"> Khuyến mại theo sản phẩm </a>
+    <a href=""> Form thêm/sửa khuyến mại </a>
+</div>
+
+<div class="max-w-[1141px] m-[0_auto_20px]">
+    <div class="flex flex-wrap items-start justify-center">
+        {% if global.url contains 'id=' %}
+        <div class="w-[100%] p-[11px_16px] bg-white m-[0_0_16px] rounded-[10px] shadow-[0px_1px_1px_0px_rgba(0,0,0,0.10)] leading-[18px] flex flex-wrap items-center justify-between">
+            <p class="font-bold text-[20px]"> Cập nhật </p>
+
+            <a href="/admin/marketing/promotion-add" class="inline-flex items-center whitespace-nowrap border border-[#ECECEC] rounded-[4px] bg-[#fff] text-[#6B7280] leading-[35px] p-[0_12px] m-[0_10px_0_0] group hover:bg-[#0041E8] hover:text-[#fff]">
+                <span class="border-[1px] border-[#6B7280] h-[13px] w-[13px] leading-[10.3px] text-center rounded-[50%] mr-1 group-hover:border-[#fff]">+</span>
+                <span>Thêm khuyến mại mới</span>
+            </a>
+
+            <p class="w-[100%] text-[#6B7280]">
+                Tặng phiếu vệ sinh bảo dưỡng Laptop, PC miễn phí trọn đời trị giá 999.000đ (THEK417)
+            </p>
+        </div>            
+
+        <div class="w-[270px] m-[0_16px_0_0] bg-white rounded-[10px] shadow-[0px_1px_1px_0px_rgba(0,0,0,0.10)] font-[500] leading-[24px] overflow-hidden">
+            <a href="javascript:void(0)" class="block p-[6px_16px] text-[#919699] hover:text-[#fff] hover:bg-[#0041E8] transition" style="color: #Fff;background: #0041E8;"> Chỉnh sửa </a>
+            <a href="" class="block p-[6px_16px] text-[#919699] hover:text-[#fff] hover:bg-[#0041E8] transition"> Danh sách sản phẩm </a>
+        </div>
+        {% endif %}
+        
+        <form method="post" enctype="multipart/form-data" class="order-page-table w-[852px] bg-white p-[16pX_16px_20px] rounded-[15px] shadow-[0px_1px_1px_0px_rgba(0,0,0,0.10)] leading-[18px] block">
+            
+            <p class="mb-[20px] font-bold text-[20px]">Thông tin cơ bản</p>
+
+            <div class="mb-[18px]">
+                <p class="mb-[7px]"> <b>Hình thức</b> </p>
+
+                <select class="w-[400px_!important]">
+                    <option value="" selected> Quà tặng </option>
+                    <option value=""> Dịch vụ </option>
+                    <option value=""> Sản phẩm </option>
+                    <option value=""> Khác </option>
+                </select>
+            </div>
+
+            <div class="mb-[18px]">
+                <p class="inline-block m-[0_17px_7px_0]"> <b>Ảnh đại diện (nếu có)</b> </p>
+                <input type="file" name="file_thumbnail" />
+
+                <div>
+                    <img src="https://via.placeholder.com/400x300" class="block m-[10px_0_0] max-h-[100px]"/>
+                </div>
+            </div>
+
+            <div class="mb-[18px]">
+                <p class="mb-[7px]"> <b>Đặt tiêu đề khuyến mại</b> </p>
+
+                <input type="text" value="" class="w-[100%] h-[34px] p-[0_10px] rounded-[4px] border border-[#D8D8D8] shadow-[0px_2px_4px_0px_rgba(0,0,0,0.10)]"/>
+            </div>
+
+            <div class="flex flex-wrap justify-between">
+                <div class="mb-[18px] w-[49%]">
+                    <p class="mb-[7px]"> <b>Giá trị bằng</b> (VNĐ) </p>
+    
+                    <input type="text" value="0" class="w-[100%] h-[34px] p-[0_10px] rounded-[4px] border border-[#D8D8D8] shadow-[0px_2px_4px_0px_rgba(0,0,0,0.10)]"/>
+                </div>
+    
+                <div class="mb-[18px] w-[49%]">
+                    <p class="mb-[7px]"> <b>Số lượng</b> (Để = -1 nếu không hạn chế số lượng)</p>
+                    <input type="text" value="0" class="w-[100%] h-[34px] p-[0_10px] rounded-[4px] border border-[#D8D8D8] shadow-[0px_2px_4px_0px_rgba(0,0,0,0.10)]"/>
+                </div>
+            </div>
+
+            <div class="mb-[18px]">
+                <p class="mb-[7px]"> <b>Mô tả</b> </p>
+
+                <textarea class="w-[100%] min-h-[122px] max-h-[170px] p-[6px_10px] rounded-[4px] border border-[#D8D8D8] shadow-[0px_2px_4px_0px_rgba(0,0,0,0.10)]"></textarea>
+            </div>
+
+            <div class="mb-[18px] flex flex-wrap">
+                <p class="mr-[45px]"> <b>Thời gian hiệu lực</b> </p>
+
+                <div class="mb-[18px]">
+                    <label class="items-center cursor-pointer relative pl-[30px] mb-[10px]" style="display: inline-flex;">
+                        <input type="radio" name="info[time_valid]" value="1" class="left-0" checked> 
+                        <span> Không giới hạn thời gian </span>
+                    </label>
+                    <br>
+
+                    <label class="items-center cursor-pointer relative pl-[30px] mb-[13px]" style="display: inline-flex;">
+                        <input type="radio" name="info[time_valid]" value="2" class="left-0"> 
+                        <span> Thời gian giới hạn </span>
+                    </label> 
+
+                    <div class="items-center mb-[10px]" style="display: flex;">
+                        <p style="width: 65px;"> Bắt đầu </p>
+                        <div class="relative m-[0_20px_0_10px]">
+                            <i class="far fa-calendar text-[#7E7E7E] m-[0_5px_0_0] absolute left-[10px] leading-[35px]"></i>
+                            <input type="date" name="from_time_date" value="" placeholder="Từ ngày" class="w-[135px] h-[36px] p-[0_10px_0_30px] rounded-[4px] border border-[#D8D8D8] shadow-[0px_2px_4px_0px_rgba(0,0,0,0.10)]"/>
+                        </div>
+
+                        <p class="mr-[10px]"> Giờ </p>
+                        
+                        <select name='info[from_time_minute]' id='from_time_minute' style="width: 85px;">
+                            <option value="00:00">00:00</option><option value="00:30">00:30</option><option value="01:00">01:00</option><option value="01:30">01:30</option><option value="02:00">02:00</option><option value="02:30">02:30</option><option value="03:00">03:00</option><option value="03:30">03:30</option><option value="04:00">04:00</option><option value="04:30">04:30</option><option value="05:00">05:00</option><option value="05:30">05:30</option><option value="06:00">06:00</option><option value="06:30">06:30</option><option value="07:00">07:00</option><option value="07:30">07:30</option><option value="08:00">08:00</option><option value="08:30">08:30</option><option value="09:00">09:00</option><option value="09:30">09:30</option><option value="10:00">10:00</option><option value="10:30">10:30</option><option value="11:00">11:00</option><option value="11:30">11:30</option><option value="12:00">12:00</option><option value="12:30">12:30</option><option value="13:00">13:00</option><option value="13:30">13:30</option><option value="14:00">14:00</option><option value="14:30">14:30</option><option value="15:00">15:00</option><option value="15:30">15:30</option><option value="16:00">16:00</option><option value="16:30">16:30</option><option value="17:00">17:00</option><option value="17:30">17:30</option><option value="18:00">18:00</option><option value="18:30">18:30</option><option value="19:00">19:00</option><option value="19:30">19:30</option><option value="20:00">20:00</option><option value="20:30">20:30</option><option value="21:00">21:00</option><option value="21:30">21:30</option><option value="22:00">22:00</option><option value="22:30">22:30</option><option value="23:00">23:00</option><option value="23:30">23:30</option>
+                        </select>
+                    </div>
+
+                    <div class="items-center" style="display: flex;">
+                        <p style="width: 65px;"> Kết thúc </p>
+                        <div class="relative m-[0_20px_0_10px]">
+                            <i class="far fa-calendar text-[#7E7E7E] m-[0_5px_0_0] absolute left-[10px] leading-[35px]"></i>
+                            <input type="date" name="to_time_date" value="" placeholder="Từ ngày" class="w-[135px] h-[36px] p-[0_10px_0_30px] rounded-[4px] border border-[#D8D8D8] shadow-[0px_2px_4px_0px_rgba(0,0,0,0.10)]"/>
+                        </div>
+
+                        <p class="mr-[10px]"> Giờ </p>
+                        
+                        <select name='info[to_time_minute]' id='from_time_minute' style="width: 85px;">
+                            <option value="00:00">00:00</option><option value="00:30">00:30</option><option value="01:00">01:00</option><option value="01:30">01:30</option><option value="02:00">02:00</option><option value="02:30">02:30</option><option value="03:00">03:00</option><option value="03:30">03:30</option><option value="04:00">04:00</option><option value="04:30">04:30</option><option value="05:00">05:00</option><option value="05:30">05:30</option><option value="06:00">06:00</option><option value="06:30">06:30</option><option value="07:00">07:00</option><option value="07:30">07:30</option><option value="08:00">08:00</option><option value="08:30">08:30</option><option value="09:00">09:00</option><option value="09:30">09:30</option><option value="10:00">10:00</option><option value="10:30">10:30</option><option value="11:00">11:00</option><option value="11:30">11:30</option><option value="12:00">12:00</option><option value="12:30">12:30</option><option value="13:00">13:00</option><option value="13:30">13:30</option><option value="14:00">14:00</option><option value="14:30">14:30</option><option value="15:00">15:00</option><option value="15:30">15:30</option><option value="16:00">16:00</option><option value="16:30">16:30</option><option value="17:00">17:00</option><option value="17:30">17:30</option><option value="18:00">18:00</option><option value="18:30">18:30</option><option value="19:00">19:00</option><option value="19:30">19:30</option><option value="20:00">20:00</option><option value="20:30">20:30</option><option value="21:00">21:00</option><option value="21:30">21:30</option><option value="22:00">22:00</option><option value="22:30">22:30</option><option value="23:00">23:00</option><option value="23:30">23:30</option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+
+            <div class="mb-[18px]">
+                <p class="mb-[7px]"> <b>Link liên quan (nếu có)</b> (Link tới 1 bài viết giới thiệu chi tiết hoặc link sản phẩm) </p>
+
+                <input type="text" value="" class="w-[100%] h-[34px] p-[0_10px] rounded-[4px] border border-[#D8D8D8] shadow-[0px_2px_4px_0px_rgba(0,0,0,0.10)]"/>
+            </div>
+
+            <div class="mb-[18px]">
+                <p class="mb-[7px]"> <b>Ghi chú</b> </p>
+
+                <textarea class="w-[100%] min-h-[70px] max-h-[100px] p-[6px_10px] rounded-[4px] border border-[#D8D8D8] shadow-[0px_2px_4px_0px_rgba(0,0,0,0.10)]"></textarea>
+            </div>
+
+            <div class="flex items-center">
+                <p> <b>Hiển thị</b> </p>
+
+                <label class="flex items-center cursor-pointer relative pl-[30px] m-[0_76px]">
+                    <input type="radio" name="info[status]" value="1" class="left-0" checked> 
+                    <span>Cho hiển thị</span>
+                </label>
+    
+                <label class="flex items-center cursor-pointer relative pl-[30px]">
+                    <input type="radio" name="info[status]" value="0" class="left-0"> 
+                    <span>Ẩn hiển thị</span>
+                </label>
+            </div>
+
+            <p class="bg-[#FAFAFB] h-[6px] m-[20px_-16px]"></p>
+
+            <input name="commit" type="submit" value="Cập nhật" class="inline-block cursor-pointer h-[32px] bg-[#0041E8] text-[#fff] rounded-[4px] font-[500] p-[0_11px]"/>
+        </form>
+    </div>
+</div>
diff --git a/template/order/detail_new.html b/template/order/detail_new.html
new file mode 100644
index 0000000..6bea97f
--- /dev/null
+++ b/template/order/detail_new.html
@@ -0,0 +1 @@
+template/order/detail_new.html
\ No newline at end of file