fix: final

Author: touchmegit1

frontend/src/components/product/PriceTable.jsx

@@ -24,7 +24,7 @@ import Button from "./button";
 import { Input } from "./input";
 import { calculateProfit, formatCurrency } from "../../utils/priceCalculation";
 
-const DateInput = ({ dateValue, onChange, disabled = false }) => {
+const DateInput = ({ dateValue, onChange, disabled = false, minDate }) => {
     const [focused, setFocused] = React.useState(false);
     const dateOnly = dateValue ? dateValue.split('T')[0] : '';
 
@@ -41,6 +41,8 @@ const DateInput = ({ dateValue, onChange, disabled = false }) => {
             onFocus={() => setFocused(true)}
             onBlur={() => setFocused(false)}
             disabled={disabled}
+            readOnly={!focused}
+            min={focused ? minDate : undefined}
             className="w-[85px] text-center text-[11px] font-semibold text-gray-700 bg-gray-50 hover:bg-white border rounded-md px-1 py-1 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-blue-500 cursor-pointer shadow-sm transition-all"
         />
     );
@@ -72,6 +74,12 @@ export default function PriceTable({
     onExpiryDateChange,
     focusedVariantId = null
 }) {
+    const today = React.useMemo(() => {
+        const now = new Date();
+        const tzOffset = now.getTimezoneOffset() * 60000;
+        return new Date(now.getTime() - tzOffset).toISOString().split("T")[0];
+    }, []);
+
     const allSelected = variants.length > 0 && selectedIds.length === variants.length;
     const someSelected = selectedIds.length > 0 && !allSelected;
 
@@ -282,6 +290,7 @@ export default function PriceTable({
                                                     dateValue={variant.activeExpiryDate}
                                                     onChange={(val) => onExpiryDateChange?.(variant, val)}
                                                     disabled={readOnly}
+                                                    minDate={today}
                                                 />
                                             ) : (
                                                 <span className="text-[11px] text-gray-400 italic">—</span>

frontend/src/pages/CRM/loyalty.jsx

@@ -591,7 +591,6 @@ const GiftRewardManagement = () => {
             <div className="p-6 space-y-5">
               {/* Tìm SKU hoặc tên sản phẩm */}
               <div className="bg-slate-50 p-4 rounded-xl border border-slate-100">
-                <label className="block text-sm font-medium text-slate-700 mb-2">Tìm sản phẩm theo SKU hoặc tên</label>
                 <label className="block text-sm font-medium text-slate-700 mb-2">Tìm sản phẩm theo SKU hoặc tên</label>
                 <div className="flex gap-2 mb-3">
                   <input

frontend/src/pages/Products/ProductManager/PriceSetting.jsx

@@ -40,6 +40,12 @@ const PRICE_SYNC_HISTORY_KEY = "priceSyncNotifications";
 const PRICE_SYNC_BROADCAST_KEY = "priceSyncNoticeBroadcast";
 const MAX_PRICE_SYNC_NOTIFICATIONS = 30;
 
+const getTodayDateInput = () => {
+    const now = new Date();
+    const tzOffset = now.getTimezoneOffset() * 60000;
+    return new Date(now.getTime() - tzOffset).toISOString().split("T")[0];
+};
+
 const formatSyncedItemLabel = (item) => {
     const name = item?.productName || "Sản phẩm";
     const sku = item?.sku || "-";
@@ -442,6 +448,13 @@ const PriceSetting = () => {
     };
 
     const handleExpiryDateChange = async (variant, newDateStr) => {
+        const today = getTodayDateInput();
+        if (newDateStr && newDateStr < today) {
+            setErrorMsg("Ngày hết hiệu lực không được nhỏ hơn ngày hiện tại.");
+            setTimeout(() => setErrorMsg(""), 4000);
+            return;
+        }
+
         try {
             await api.put(`/products/variants/${variant.id}/prices/active/expiry`, { expiryDate: newDateStr || null });
             setSuccessMsg(`Đã cập nhật ngày hết hiệu lực cho ${variant.name}`);

frontend/src/pages/Products/ProductManager/Suppliers.jsx

@@ -33,7 +33,6 @@ const initialFormData = {
   phone: "",
   email: "",
   address: "",
-  status: "active",
 };
 
 const mapSupplierToFormData = (supplier) => ({
@@ -42,15 +41,13 @@ const mapSupplierToFormData = (supplier) => ({
   phone: supplier?.phone || "",
   email: supplier?.email || "",
   address: supplier?.address || "",
-  status: supplier?.status || "active",
 });
 
 export function SuppliersScreen() {
   // REVIEW FLOW: fetch danh sách nhà cung cấp -> lọc/tìm kiếm -> mở modal add/edit -> gọi API lưu/xoá -> refresh danh sách.
   const { user } = useAuth();
   const canEditProducts = canManageProducts(user);
   const [searchQuery, setSearchQuery] = useState("");
-  const [filterStatus, setFilterStatus] = useState("all");
   const [isModalOpen, setIsModalOpen] = useState(false);
   const [editingSupplier, setEditingSupplier] = useState(null);
   const [formData, setFormData] = useState(initialFormData);
@@ -97,23 +94,17 @@ export function SuppliersScreen() {
     setTimeout(() => setToast(""), 3000);
   };
 
-  // REVIEW FLOW (LIST): chuẩn hoá nguồn suppliers -> filter theo keyword + trạng thái -> render bảng kết quả.
+  // REVIEW FLOW (LIST): chuẩn hoá nguồn suppliers -> filter theo keyword -> render bảng kết quả.
   const filteredSuppliers = useMemo(() => {
     return (suppliers || []).filter((supplier) => {
-      const matchesSearch =
+      return (
         supplier.name?.toLowerCase()?.includes(searchQuery.toLowerCase()) ||
         supplier.contact_person?.toLowerCase()?.includes(searchQuery.toLowerCase()) ||
         supplier.phone?.includes(searchQuery) ||
-        supplier.email?.toLowerCase()?.includes(searchQuery.toLowerCase());
-
-      const matchesStatus =
-        filterStatus === "all" ||
-        (filterStatus === "active" && supplier.status === "active") ||
-        (filterStatus === "inactive" && supplier.status === "inactive");
-
-      return matchesSearch && matchesStatus;
+        supplier.email?.toLowerCase()?.includes(searchQuery.toLowerCase())
+      );
     });
-  }, [suppliers, searchQuery, filterStatus]);
+  }, [suppliers, searchQuery]);
 
   const handleAdd = () => {
     if (!canEditProducts) return;
@@ -136,6 +127,7 @@ export function SuppliersScreen() {
     const payload = {
       ...formData,
       contact_person: formData.contact_person?.trim(),
+      status: editingSupplier?.status || "active",
     };
 
     const result = editingSupplier
@@ -205,7 +197,7 @@ export function SuppliersScreen() {
             <h1 className="text-3xl font-bold text-gray-900">Quản lý nhà cung cấp</h1>
             <p className="text-gray-600 mt-2">
               Tổng số: <span className="font-semibold text-blue-600">{filteredSuppliers.length}</span> nhà cung cấp
-              {searchQuery || filterStatus !== "all" ? <span className="text-gray-400"> (đang lọc)</span> : null}
+              {searchQuery ? <span className="text-gray-400"> (đang lọc)</span> : null}
             </p>
           </div>
 
@@ -245,11 +237,11 @@ export function SuppliersScreen() {
         <Card className="border-0 shadow-xl bg-white/90 backdrop-blur-sm rounded-2xl overflow-hidden">
           <div className="bg-gradient-to-r from-blue-600 via-indigo-600 to-violet-600 px-6 py-3">
             <h3 className="text-white font-bold text-sm">Tìm kiếm & bộ lọc</h3>
-            <p className="text-blue-100 text-xs">Lọc danh sách nhà cung cấp theo từ khóa và trạng thái</p>
+            <p className="text-blue-100 text-xs">Lọc danh sách nhà cung cấp theo từ khóa</p>
           </div>
           <CardContent className="p-5">
-            <div className="grid grid-cols-1 md:grid-cols-3 gap-4">
-              <div className="relative md:col-span-2">
+            <div className="grid grid-cols-1 gap-4">
+              <div className="relative">
                 <Search className="absolute left-4 top-1/2 -translate-y-1/2 w-5 h-5 text-gray-400" />
                 <Input
                   placeholder="Tìm theo tên, người liên hệ, SĐT hoặc email..."
@@ -258,16 +250,6 @@ export function SuppliersScreen() {
                   onChange={(e) => setSearchQuery(e.target.value)}
                 />
               </div>
-
-              <select
-                className="w-full h-11 px-4 text-base bg-gray-50 border border-gray-200 rounded-xl focus:ring-2 focus:ring-blue-500 focus:border-transparent appearance-none"
-                value={filterStatus}
-                onChange={(e) => setFilterStatus(e.target.value)}
-              >
-                <option value="all">Tất cả trạng thái</option>
-                <option value="active">Đang hợp tác</option>
-                <option value="inactive">Ngưng hợp tác</option>
-              </select>
             </div>
           </CardContent>
         </Card>
@@ -292,7 +274,6 @@ export function SuppliersScreen() {
                     <TableHead className="font-bold text-gray-700">Nhà cung cấp</TableHead>
                     <TableHead className="font-bold text-gray-700">Liên hệ</TableHead>
                     <TableHead className="font-bold text-gray-700">Địa chỉ</TableHead>
-                    <TableHead className="font-bold text-gray-700">Trạng thái</TableHead>
                     <TableHead className="text-center font-bold text-gray-700">Thao tác</TableHead>
                   </TableRow>
                 </TableHeader>
@@ -339,14 +320,6 @@ export function SuppliersScreen() {
                         </div>
                       </TableCell>
 
-                      <TableCell>
-                        {supplier.status === "active" ? (
-                          <Badge className="bg-green-50 text-green-700 border border-green-200">Đang hợp tác</Badge>
-                        ) : (
-                          <Badge className="bg-red-50 text-red-700 border border-red-200">Ngưng hợp tác</Badge>
-                        )}
-                      </TableCell>
-
                       <TableCell className="text-center">
                         {canEditProducts && (
                           <div className="flex justify-center gap-2">
@@ -547,21 +520,6 @@ export function SuppliersScreen() {
                           required
                         />
                       </div>
-                      <div>
-                        <Label>
-                          Trạng thái <span className="text-red-600">*</span>
-                        </Label>
-                        <select
-                          name="status"
-                          className="w-full mt-2 h-11 px-4 border border-gray-200 rounded-xl bg-gray-50"
-                          value={formData.status}
-                          onChange={handleChange}
-                          required
-                        >
-                          <option value="active">Đang hợp tác</option>
-                          <option value="inactive">Ngưng hợp tác</option>
-                        </select>
-                      </div>
                     </div>
                   </CardContent>
                 </Card>

frontend/src/pages/Products/ProductManager/UnitConversionSection.jsx

@@ -60,24 +60,32 @@ export default function UnitConversionSection({ variant, units, onSuccess }) {
         setIsDeleting(true);
         setDeleteStatusMsg("");
 
-        deleteTimeoutRef.current = setTimeout(() => {
-            setDeleteStatusMsg("Không thể xoá quy đổi vì thao tác đã quá 2 phút. Vui lòng thử lại.");
-        }, 120000);
-
         try {
-            await api.delete(`/products/conversions/${id}`);
+            const timeoutPromise = new Promise((_, reject) => {
+                deleteTimeoutRef.current = setTimeout(() => {
+                    reject(new Error("Không thể xoá quy đổi vì thao tác đã quá 2 phút. Vui lòng thử lại."));
+                }, 120000);
+            });
+
+            await Promise.race([
+                api.delete(`/products/conversions/${id}`),
+                timeoutPromise,
+            ]);
+
             setConversions(prev => prev.filter(c => c.id !== id));
             if (onSuccess) onSuccess();
+            setDeleteStatusMsg("");
+            setConfirmDeleteId(null);
         } catch (err) {
             console.error("Lỗi xóa quy đổi:", err);
+            const msg = err?.response?.data?.message || err?.response?.data || err?.message || "Không thể xoá quy đổi. Vui lòng thử lại.";
+            setDeleteStatusMsg(typeof msg === "string" ? msg : "Không thể xoá quy đổi. Vui lòng thử lại.");
         } finally {
             if (deleteTimeoutRef.current) {
                 clearTimeout(deleteTimeoutRef.current);
                 deleteTimeoutRef.current = null;
             }
             setIsDeleting(false);
-            setDeleteStatusMsg("");
-            setConfirmDeleteId(null);
         }
     };