update marketing

assets/script/pc_style.css

@@ -760,6 +760,7 @@ input[type=radio]:focus:before {
 }
 .order-page .order-page-table td {
   padding: 14px 8px;
+  text-align: center;
 }
 .order-page .order-page-table td:nth-child(4), .order-page .order-page-table td:nth-child(10) {
   text-align: left;
@@ -782,8 +783,9 @@ input[type=radio]:focus:before {
 }
 .order-page-table thead {
   background: #f6f6f6;
-  font-weight: 600;
+  font-weight: 500;
   text-align: center;
+  white-space: nowrap;
 }
 .order-page-table thead td {
   padding: 8px;
@@ -803,6 +805,7 @@ input[type=radio]:focus:before {
   display: block;
   width: 100%;
   padding: 0 0 0 5px;
+  font-weight: 400;
 }
 .order-page-table .icons {
   width: 30px;

assets/script/pc_style.scss

@@ -777,6 +777,7 @@ input[type="radio"] {
         }
         td {
             padding: 14px 8px;
+            text-align: center;
             &:nth-child(4),
             &:nth-child(10) {
                 text-align: left;
@@ -800,8 +801,9 @@ input[type="radio"] {
     }
     thead {
         background: #f6f6f6;
-        font-weight: 600;
+        font-weight: 500;
         text-align: center;
+        white-space: nowrap;
         td {
             padding: 8px;
         }
@@ -823,6 +825,7 @@ input[type="radio"] {
         display: block;
         width: 100%;
         padding: 0 0 0 5px;
+        font-weight: 400;
     }
     .icons {
         width: 30px;

template/marketing/detail8.html

@@ -1 +0,0 @@
-template/marketing/detail8.html

template/order/home.html

@@ -25,12 +25,12 @@
             <input type="text" name="q" value="" placeholder="Tìm người mua (* tên, email, điện thoại)" class="w-[375px] h-[36px] p-[0_10px] m-[0_10px] rounded-[4px] border border-[#D8D8D8] shadow-[0px_2px_4px_0px_rgba(0,0,0,0.10)]">
             
             <div class="relative m-[0_15px]">
-                <i class="far fa-calendar text-[#7E7E7E] m-[0_5px_0_0] absolute left-[10px] leading-[35px]"></i>
+                <i class="far fa-calendar text-[#7E7E7E] m-[0_5px_0_0] absolute top-[10px] left-[10px] leading-[35px]"></i>
                 <input type="text" name="from_date" value="" onfocus="scwShow(this,event);" onclick="scwShow(this,event);" placeholder="Từ ngày" class="w-[125px] h-[36px] p-[0_10px_0_30px] rounded-[4px] border border-[#D8D8D8] shadow-[0px_2px_4px_0px_rgba(0,0,0,0.10)]">
             </div>
             
             <div class="relative m-[0_15px]">
-                <i class="far fa-calendar text-[#7E7E7E] m-[0_5px_0_0] absolute left-[10px] leading-[35px]"></i>
+                <i class="far fa-calendar text-[#7E7E7E] m-[0_5px_0_0] absolute top-[10px] left-[10px] leading-[35px]"></i>
                 <input type="text" name="to_date" value="" onfocus="scwShow(this,event);" onclick="scwShow(this,event);" placeholder="Đến ngày" class="w-[125px] h-[36px] p-[0_10px_0_30px] rounded-[4px] border border-[#D8D8D8] shadow-[0px_2px_4px_0px_rgba(0,0,0,0.10)]">
             </div>
 
@@ -70,52 +70,40 @@
                     <td> Khách hàng </td>
                     <td> Tỉnh/TP </td>
                     <td> Giá trị </td>
-                    <td width="170">
+                    <td width="150">
                         <select onchange="setHiddenValue('js-payment', this.value); runFilter()">
                             <option value="">Thanh toán</option>
-                            <option value="pending">Chờ</option>
+                            {% for _item in page.payment_status_list %}
-                            <option value="authorized">Đã xác nhận</option>
+                            <option value="{{ _item[1].id }}">{{ _item[1].title }}</option>
-                            <option value="overdue">Quá hạn</option>
+                            {% endfor %}
-                            <option value="expiring">Sắp hết hạn</option>
-                            <option value="expired">Hết hạn</option>
-                            <option value="paid">Đã thanh toán</option>
-                            <option value="refunded">Đã hoàn lại</option>
-                            <option value="partially-refunded">Hoàn lại 1 phần</option>
-                            <option value="partially-paid">Thanh toán 1 phần</option>
-                            <option value="voided">Hủy</option>
-                            <option value="unpaid">Chưa thanh toán</option>
                         </select>
                     </td>
 
                     <td width="160">
                         <select onchange="setHiddenValue('js-fullfillment', this.value); runFilter()">
                             <option value="">Vận chuyển</option>
-                            <option value="fulfilled">Đã chuyển hết</option>
+                            {% for _item in page.fullfillment_status_list %}
-                            <option value="unfulfilled">Chưa chuyển</option>
+                            <option value="{{ _item[1].id }}">{{ _item[1].title }}</option>
-                            <option value="partially-fulfilled">Chuyển 1 phần</option>
+                            {% endfor %}
-                            <option value="scheduled">Đã lên kế hoạch</option>
-                            <option value="onhold ">Giữ hàng</option>
                         </select>
                     </td>
 
                     <td width="160">
                         <select onchange="setHiddenValue('js-status', this.value); runFilter()">
                             <option value="">Tình trạng đơn</option>
-                            <option value="new">Mới</option>
+                            {% for _item in page.order_status_list %}
-                            <option value="processing">Đang xử lý</option>
+                            <option value="{{ _item[1].id }}">{{ _item[1].title }}</option>
-                            <option value="success">Thành công</option>
+                            {% endfor %}
-                            <option value="closed">Đóng lại</option>
-                            <option value="canceled">Hủy</option>
                         </select>
                     </td>
 
-                    <td width="170">
+                    <td width="160">
                         <select onchange="setHiddenValue('assign_to', this.value); runFilter()">
                             <option value="">Người được giao</option>
                         </select>
                     </td>
 
-                    <td width="87"> Xem </td>
+                    <td width=""> Xem </td>
                 </tr>
             </thead>
 
@@ -138,8 +126,10 @@
                         <a href=""> Nguyen Duc Quan </a>
                     </td>
                     <td>
-                        <a href="/admin/order/detail?id=369" class="icons icon-edit" title="Chi tiết"></a>
+                        <div style="display: flex">
-                        <a href="" class="icons icon-delete" title="Xóa"></a>
+                            <a href="/admin/order/detail?id=369" class="icons icon-edit" title="Chi tiết"></a>
+                            <a href="" class="icons icon-delete" title="Xóa"></a>
+                        </div>
                     </td>
                 </tr>
 
@@ -161,8 +151,10 @@
                         <a href=""> test hura </a>
                     </td>
                     <td>
-                        <a href="/admin/order/detail?id=369" class="icons icon-edit" title="Chi tiết"></a>
+                        <div style="display: flex">
-                        <a href="" class="icons icon-delete" title="Xóa"></a>
+                            <a href="/admin/order/detail?id=369" class="icons icon-edit" title="Chi tiết"></a>
+                            <a href="" class="icons icon-delete" title="Xóa"></a>
+                        </div>
                     </td>
                 </tr>
             </tbody>