diff --git a/assets/script/pc_style.css b/assets/script/pc_style.css
index 6a61274..9e5e3a5 100644
--- a/assets/script/pc_style.css
+++ b/assets/script/pc_style.css
@@ -6,11 +6,7 @@
 }
 
 button,
-input,
 select {
-  outline: none !important;
-  color: #000;
-  border-radius: 0;
   cursor: pointer;
 }
 
@@ -24,10 +20,12 @@ input,
 optgroup,
 select,
 textarea {
+  outline: none;
   margin: 0;
   font-family: inherit;
   font-size: inherit;
   line-height: inherit;
+  color: #000;
   border-radius: 0;
 }
 
@@ -370,6 +368,7 @@ a {
 }
 .admin-menu .item:nth-child(n+10) .sub-menu {
   top: unset;
+  bottom: -45px;
 }
 .admin-menu .sub-menu {
   padding: 10px 22px 10px 15px;
@@ -742,6 +741,15 @@ input[type=radio]:focus:before {
 }
 
 /* Bán hàng */
+.page-input {
+  width: 100%;
+  height: 36px;
+  padding: 0 10px;
+  border-radius: 4px;
+  border: 1px solid #D8D8D8;
+  box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.1);
+}
+
 .order-page .order-page-title a {
   margin: 0 2px 0 0;
   border-radius: 4px 4px 0px 0px;
@@ -778,9 +786,6 @@ input[type=radio]:focus:before {
 .order-page-table a {
   color: #0041e8;
 }
-.order-page-table a:hover {
-  text-decoration: underline;
-}
 .order-page-table table {
   width: 100%;
 }
@@ -793,13 +798,15 @@ input[type=radio]:focus:before {
 .order-page-table thead td {
   padding: 8px;
 }
-.order-page-table tr:hover {
+.order-page-table tbody td {
+  vertical-align: top;
+}
+.order-page-table tbody tr:hover {
   background: #f5f7ff;
 }
 .order-page-table td {
   padding: 10px;
   border: 1px solid #ececec;
-  vertical-align: top;
 }
 .order-page-table select {
   border-radius: 4px;
@@ -958,4 +965,16 @@ input[type=radio]:focus:before {
 .list-info-reply td {
   padding: 7px 6px;
   border: 1px solid #ececec;
+}
+
+.modal .order-page-table td {
+  vertical-align: middle;
+}
+.modal .brand-letters a {
+  width: 11.1111111111%;
+  text-transform: capitalize;
+  color: #0041E8;
+}
+.modal .brand-letters a:hover {
+  text-decoration: underline;
 }/*# 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 a0309cf..1fd0969 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":"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","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 683c697..73b0c04 100644
--- a/assets/script/pc_style.scss
+++ b/assets/script/pc_style.scss
@@ -4,11 +4,7 @@
     box-sizing: border-box;
 }
 button,
-input,
 select {
-    outline: none !important;
-    color: #000;
-    border-radius: 0;
     cursor: pointer;
 }
 button,
@@ -20,10 +16,12 @@ input,
 optgroup,
 select,
 textarea {
+    outline: none;
     margin: 0;
     font-family: inherit;
     font-size: inherit;
     line-height: inherit;
+    color: #000;
     border-radius: 0;
 }
 input::-webkit-outer-spin-button,
@@ -357,6 +355,7 @@ a {
         &:nth-child(n + 10) {
             .sub-menu {
                 top: unset;
+                bottom: -45px;
             }
         }
     }
@@ -753,6 +752,15 @@ input[type="radio"] {
 }
 
 /* Bán hàng */
+.page-input {
+    width: 100%;
+    height: 36px;
+    padding: 0 10px;
+    border-radius: 4px;
+    border: 1px solid #D8D8D8;
+    box-shadow: 0px 2px 4px 0px rgba(0,0,0,0.10);
+}
+
 .order-page {
     .order-page-title {
         a {
@@ -795,9 +803,6 @@ input[type="radio"] {
     line-height: 20px;
     a {
         color: #0041e8;
-        &:hover {
-            text-decoration: underline;
-        }
     }
     table {
         width: 100%;
@@ -811,15 +816,19 @@ input[type="radio"] {
             padding: 8px;
         }
     }
-    tr {
-        &:hover {
-            background: #f5f7ff;
+    tbody {
+        td {
+            vertical-align: top;
         }
-    }
+        tr {
+            &:hover {
+                background: #f5f7ff;
+            }
+        }
+    }    
     td {
         padding: 10px;
         border: 1px solid #ececec;
-        vertical-align: top;
     }
     select {
         border-radius: 4px;
@@ -990,3 +999,21 @@ input[type="radio"] {
         border: 1px solid #ececec;
     }
 }
+
+.modal{
+    .order-page-table {
+        td{
+            vertical-align: middle;
+        }
+    }
+    .brand-letters {
+        a{
+            width: calc(100% / 9);
+            text-transform: capitalize;
+            color: #0041E8;
+            &:hover{
+                text-decoration: underline;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/data/menu_item/marketing.php b/data/menu_item/marketing.php
index 180aef4..1a12c52 100644
--- a/data/menu_item/marketing.php
+++ b/data/menu_item/marketing.php
@@ -38,7 +38,7 @@ return array(
             'view' => 'store-design',
             'id' => 'system/store-design',
             'name' => 'Banner pop-up',
-            'url' => '/admin/system/store-design&section=popup',
+            'url' => '/admin/system/store-design?section=popup',
         ),
 
         array(
@@ -56,11 +56,11 @@ return array(
             'view' => 'store-design',
             'id' => 'system/store-design',
             'name' => 'Hình nền website',
-            'url' => '/admin/system/store-design&section=background',
+            'url' => '/admin/system/store-design?section=background',
         ),*/
 
        /* array(
-            'enable' => false,
+            'enable' => true,
             'module' => 'email',
             'view' => 'home',
             'id' => 'email/home',
@@ -69,7 +69,7 @@ return array(
         ),*/
 
         array(
-            'enable' => false,
+            'enable' => true,
             'module' => 'url',
             'view' => 'meta-list',
             'id' => 'url/meta-list',
@@ -78,7 +78,7 @@ return array(
         ),
 
         array(
-            'enable' => false,
+            'enable' => true,
             'module' => 'url',
             'view' => 'url-seo',
             'id' => 'url/url-seo',
@@ -87,7 +87,7 @@ return array(
         ),
 
         array(
-            'enable' => false ,
+            'enable' => true ,
             'module' => 'marketing',
             'view' => 'feed',
             'id' => 'marketing/feed',
@@ -96,7 +96,7 @@ return array(
         ),
 
         array(
-            'enable' => false ,
+            'enable' => true ,
             'module' => 'marketing',
             'view' => 'product-offer',
             'id' => 'marketing/product-offer',
@@ -114,7 +114,7 @@ return array(
         ),*/
 
         array(
-            'enable' => false ,
+            'enable' => true ,
             'module' => 'marketing',
             'view' => 'program',
             'id' => 'marketing/program',
@@ -132,7 +132,7 @@ return array(
         ),
 
         array(
-            'enable' => false ,
+            'enable' => true ,
             'module' => 'marketing',
             'view' => 'combo-deal',
             'id' => 'marketing/combo-deal',
@@ -141,7 +141,7 @@ return array(
         ),
 
         array(
-            'enable' => false ,
+            'enable' => true ,
             'module' => 'marketing',
             'view' => 'conditional-promotion',
             'id' => 'marketing/conditional-promotion',
@@ -150,7 +150,7 @@ return array(
         ),
 
         array(
-            'enable' => false ,
+            'enable' => true ,
             'module' => 'marketing',
             'view' => 'live-support-per-category',
             'id' => 'marketing/live-support-per-category',
diff --git a/data/menu_item/system.php b/data/menu_item/system.php
index 0721b79..c244f09 100644
--- a/data/menu_item/system.php
+++ b/data/menu_item/system.php
@@ -41,16 +41,16 @@ return  array(
             'url' => '/admin/system/store-address',
         ),
 
-        /*4 => array(
+        4 => array(
             'enable' => true ,
             'module' => 'system',
             'view' => 'domain',
             'id' => 'system/domain',
             'name' => 'Cài đặt tên miền',
             'url' => '/admin/system/domain',
-        ),*/
+        ),
 
-        /*array(
+        array(
             'enable' => true ,
             'module' => 'system',
             'view' => 'ban-ip',
@@ -66,9 +66,9 @@ return  array(
             'id' => '',
             'name' => 'Thông tin website',
             'url' => '/admin/system/change-info',
-        ),*/
+        ),
 
-        /*
+        
 
         array(
             'enable' => true ,
@@ -77,52 +77,52 @@ return  array(
             'id' => '',
             'name' => 'Cài đặt tỉnh thành',
             'url' => '/admin/system/province-list',
-        ),*/
+        ),
 
-        /*9 => array(
+        9 => array(
             'enable' => true ,
             'module' => 'system',
             'view' => 'home',
             'id' => '',
             'name' => 'Tình trạng đơn hàng',
             'url' => '/admin/system/order-status',
-        ),*/
+        ),
 
-        /*array(
+        array(
             'enable' => true ,
             'module' => 'online_support',
             'view' => 'home',
             'id' => '',
             'name' => 'Hỗ trợ bán hàng',
             'url' => '/admin/online_support',
-        ),*/
+        ),
 
-        /*array(
+        array(
             'enable' => true ,
             'module' => 'system',
             'view' => 'country',
             'id' => '',
             'name' => 'Quốc gia',
             'url' => '/admin/system/country',
-        ),*/
+        ),
 
-        /*12 => array(
+        12 => array(
             'enable' => true ,
             'module' => 'report_out',
             'view' => 'home',
             'id' => '',
             'name' => 'Cài đặt thông báo ngoài',
             'url' => '/admin/report_out',
-        ),*/
+        ),
 
-        /*array(
+        array(
             'enable' => true ,
             'module' => 'shipping2',
             'view' => 'home',
             'id' => '',
             'name' => 'Cài đặt phí vận chuyển',
             'url' => '/admin/shipping2',
-        ),*/
+        ),
 
         array(
             'enable' => true ,
@@ -142,7 +142,7 @@ return  array(
             'url' => '/admin/tool',
         ),
 
-        /*array(
+        array(
             'enable' => true ,
             'module' => 'civi',
             'view' => 'home',
@@ -167,7 +167,7 @@ return  array(
             'id' => 'system/keyword-suggest',
             'name' => 'Từ khóa gợi ý',
             'url' => '/admin/system/keyword-suggest',
-        ),*/
+        ),
 
         array(
             'enable' => true ,
diff --git a/template/javascript/index.html b/template/javascript/index.html
index 292de13..a641a0d 100644
--- a/template/javascript/index.html
+++ b/template/javascript/index.html
@@ -1,14 +1,19 @@
 {% include javascript/global %}
 
 {% if global.module == 'home' %}
-{% include javascript/homepage %}
+
+    {% include javascript/homepage %}
 
 {% elsif global.module == 'product' %}
 
-{% if global.view == 'home' %}
-{% include javascript/product_list %}
-{% endif %}
+    {% if global.view == 'home' %}
+        {% include javascript/product_list %}
+    {% endif %}
 
-{% include javascript/product_form %}
+    {% include javascript/product_form %}
+
+{% elsif global.module == 'deal' %}
+
+    {% include javascript/product_form %}
 
 {% endif %}
\ No newline at end of file
diff --git a/template/marketing/conditional_promotion.html b/template/marketing/conditional_promotion.html
new file mode 100644
index 0000000..d268466
--- /dev/null
+++ b/template/marketing/conditional_promotion.html
@@ -0,0 +1,70 @@
+<div class="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] mb-[13px] font-bold text-[24px]"> Khuyến mại cấu hình máy tính </p>
+
+    <div class="text-right font-[500] leading-[35px] m-[0_0_20px_0] ">
+        <a href="/admin/marketing/conditional-promotion-add" class="inline-flex items-center whitespace-nowrap border border-[#0041E8] rounded-[4px] bg-[#F5F7FF] text-[#0041E8] 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 khuyến mại mới</span>
+        </a>
+    </div>
+
+    <div class="order-page-table">
+        <table>
+            <thead>
+                <tr>
+                    <td> STT </td>
+                    <td> Khuyến mại </td>
+                    <td> Điều kiện áp dụng </td>
+                    <td> Thông tin khác </td>
+                    <td> Lựa chọn </td>
+                </tr>
+            </thead>
+
+            <tbody>
+
+                <tr>
+                    <td align="center"> 1 </td>
+
+                    <td>
+                        <p class="font-bold"> 20.000.000 </p>
+                        <p> - Tặng tiền mặt: 500.000 </p>
+                        <p> - Tùy chọn gói sản phẩm: 500.000 </p>
+                        <p> - Nội dung:Tặng ngay tiền mặt 500.000 VNĐ </p>
+                    </td>
+
+                    <td>
+                        <p>1. Bắt buộc phải có sản phẩm thuộc các danh mục: 30,31,32,164,35,36 </p>
+                        <p>2. Giá trị đơn hàng trong khoảng: 20.000.000 VND - 30.000.000 VND </p>
+                    </td>
+
+                    <td>
+                        <p> Tạo bởi: Nguyễn Tiến Dinh (10-11-2023, 10:06 am) </p>
+                        <p> Cập nhật: Nguyễn Tiến Dinh (18-12-2023, 2:59 pm) </p>
+                    </td>
+
+                    <td>
+                        <div class="items-center flex">
+                            <a href="/admin/marketing/conditional-promotion-add?id=1" title="Sửa lại" class="icons icon-edit"></a>
+                            
+                            <a href="" 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="" 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="" 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>
\ No newline at end of file
diff --git a/template/marketing/conditional_promotion_add.html b/template/marketing/conditional_promotion_add.html
new file mode 100644
index 0000000..d3166c6
--- /dev/null
+++ b/template/marketing/conditional_promotion_add.html
@@ -0,0 +1,124 @@
+<div class="global-breadcrumb-container">
+    <a href="/admin/marketing/conditional-promotion"> Khuyến mại BuildPC </a>
+    <a href=""> Form thêm / sửa khuyến mại </a>
+</div>
+
+<div class="max-w-[1141px] flex flex-wrap items-start m-[0_auto_16px_auto]">
+    <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 khuyến mại </p>
+
+        <a href="/admin/marketing/conditional-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</span>
+        </a>
+
+        <p class="w-[100%] text-[#6B7280]">
+            100 triệu
+        </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;"> Thông tin </a>        
+    </div>
+    
+    <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">
+        <table>
+            <tr>
+                <td width="215"> <b>Tên gọi</b> </td>
+                <td>
+                    <input type="text" value="" placeholder="Tên gọi" class="w-[100%] h-[36px] p-[0_10px] rounded-[4px] border border-[#D8D8D8] shadow-[0px_2px_4px_0px_rgba(0,0,0,0.10)]"/>
+                    <i class="block text-[#6B7280] mt-[8px]"> * Phần này chỉ dùng cho quản trị viên phân biệt. </i>
+                </td>
+            </tr>
+            
+            <tr>
+                <td> <b>Nội dung khuyến mại</b> </td>
+                <td>
+                    
+                    <div class="mb-[15px]">
+                        <p class="mb-[8px]">1. Tặng tiền mặt: <i class="text-[#6B7280] font-[300]">VND</i></p>
+                        <input type="text" value="" class="w-[100%] h-[36px] p-[0_10px] rounded-[4px] border border-[#D8D8D8] shadow-[0px_2px_4px_0px_rgba(0,0,0,0.10)]"/>
+                    </div>
+
+                    <div class="mb-[15px]">
+                        <p class="mb-[8px]">2. Tùy chọn gói sản phẩm: <i class="text-[#6B7280] font-[300]">VND</i></p>
+                        <input type="text" value="" class="w-[100%] h-[36px] p-[0_10px] rounded-[4px] border border-[#D8D8D8] shadow-[0px_2px_4px_0px_rgba(0,0,0,0.10)]"/>
+                    </div>
+
+                    <div class="mb-[15px]">
+                        <p class="mb-[8px]">3. Nội dung: </p>
+                        <textarea id="product-desc"> </textarea>
+                    </div>
+
+                </td>
+            </tr>
+            
+            <tr>
+                <td> <b> Điều kiện áp dụng * </b> </td>
+                <td>
+                    
+                    <div class="mb-[15px]">
+                        <p class="mb-[8px]"> 1. Bắt buộc phải có sản phẩm thuộc các danh mục: </p>
+                        <input type="text" value="" class="w-[100%] h-[36px] p-[0_10px] rounded-[4px] border border-[#D8D8D8] shadow-[0px_2px_4px_0px_rgba(0,0,0,0.10)]"/>
+                    </div>
+
+                    <p class="mb-[8px]">2. Giá trị đơn hàng trong khoảng: <i class="text-[#6B7280] font-[300]">VND</i></p>
+
+                    <div class="flex items-center justify-between">
+                        <div>
+                            <p class="inline-block mr-[13px]"> Giá từ </p>
+                            <input type="text" value="" class="w-[220px] h-[36px] p-[0_10px] rounded-[4px] border border-[#D8D8D8] shadow-[0px_2px_4px_0px_rgba(0,0,0,0.10)]"/>
+                        </div>
+
+                        <div>
+                            <p class="inline-block mr-[13px]"> Đến </p>
+                            <input type="text" value="" class="w-[220px] h-[36px] p-[0_10px] rounded-[4px] border border-[#D8D8D8] shadow-[0px_2px_4px_0px_rgba(0,0,0,0.10)]"/>
+                        </div>
+                    </div>
+
+                </td>
+            </tr>
+            
+            <tr>
+                <td> <b> Hiển thị </b> </td>
+                <td style="padding: 14px">
+                    <label class="items-center cursor-pointer relative pl-[30px] mr-[15px]" style="display: inline-flex;">
+                        <input type="radio" name="info[status]" value="1" class="left-0"> 
+                        <span>Cho hiển thị</span>
+                    </label>
+
+                    <label class="items-center cursor-pointer relative pl-[30px]" style="display: inline-flex;">
+                        <input type="radio" name="info[status]" value="0" checked class="left-0"> 
+                        <span>Ẩn hiển thị</span>
+                    </label>
+
+                </td>
+            </tr>
+        </table>
+
+        <input type="submit" value="Cập nhật" class="inline-block mt-[12px] cursor-pointer h-[32px] bg-[#0041E8] text-[#fff] rounded-[4px] font-[500] p-[0_11px]"/>
+    </form>
+</div>
+
+
+
+
+<script src="https://cdn.tiny.cloud/1/no-api-key/tinymce/5/tinymce.min.js" referrerpolicy="origin"></script>
+
+<script>
+    tinymce.init({
+        selector: 'textarea#product-desc',
+        height: 350,
+        menubar: true,
+        plugins: [
+            'advlist autolink lists link image charmap print preview anchor',
+            'searchreplace visualblocks code fullscreen',
+            'insertdatetime media table paste code help wordcount'
+        ],
+        toolbar: 'undo redo | formatselect | ' +
+            'bold italic backcolor | alignleft aligncenter ' +
+            'alignright alignjustify | bullist numlist outdent indent | ' +
+            'removeformat | help',
+        content_style: 'body { font-family:Helvetica,Arial,sans-serif; font-size:14px }'
+    });
+</script>
\ No newline at end of file
diff --git a/template/marketing/coupon.html b/template/marketing/coupon.html
index 93d42a6..7d69269 100644
--- a/template/marketing/coupon.html
+++ b/template/marketing/coupon.html
@@ -72,7 +72,7 @@
                     </td>
 
                     <td>
-                        <div class="items-center" style="display: flex;">
+                        <div class="items-center 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> -->
diff --git a/template/marketing/product_offer.html b/template/marketing/product_offer.html
new file mode 100644
index 0000000..d27532a
--- /dev/null
+++ b/template/marketing/product_offer.html
@@ -0,0 +1,49 @@
+<div class="max-w-[1141px] m-[17px_auto_20px]">
+    <div class="flex flex-wrap items-start justify-center">
+
+        <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-[20px] flex flex-wrap items-center justify-between">
+            <p class="font-bold text-[20px]"> Sản phẩm phiếu khuyến mại </p>
+
+            <a href="/admin/deal/deal-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]">
+                <i class="far fa-file-excel mr-2"></i>
+                <span>Tải danh sách hiện tại</span>
+            </a>
+
+            <p class="w-[100%] text-[#6B7280] mt-[10px]"> Hướng dẫn: Để cập nhật/xoá Sản phẩm có mã khuyến mại, tải file excel mới nhất về và sửa từ đó. Để xoá sp thì chỉ cần xoá sp khỏi file excel. Sau khi chỉnh xong file excel thì Upload lại để hệ thống nhận mới. </p>
+        </div>            
+
+        <!-- col left -->
+        <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;"> Thông tin </a>
+        </div>
+
+        <!-- col right -->
+        <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-[20px] block text-[#6B7280]">
+            
+            <table>
+                <tr>
+                    <td width="215"> File cập nhật </td>
+
+                    <td>
+                        <input type="file">
+                    </td>
+                </tr>
+
+                <tr>
+                    <td> Lựa chọn </td>
+
+                    <td>
+                        <label class="inline-flex items-center mb-[5px] cursor-pointer">
+                            <input type="checkbox" class="mr-[10px] scale-[1.5]"/>
+                            <span> Xóa dữ liệu cũ trước khi cập nhật </span>
+                        </label>
+                        
+                        <i class="block font-[300]">(* Nếu lựa chọn, hệ thống sẽ xóa bỏ hết dữ liệu đang có trước khi cập nhật dữ liệu nhận được từ file excel)</i>
+                    </td>
+                </tr>
+            </table>
+
+            <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] mt-[17px]"/>
+        </form>
+    </div>
+</div>
\ No newline at end of file