@lodashventure/medusa-parcel-shipping 0.4.26 → 0.4.29

package/.medusa/server/src/admin/index.js

@@ -236,6 +236,445 @@ const OrderShippingQuoteWidget = ({ data }) => {
 adminSdk.defineWidgetConfig({
   zone: "order.details.after"
 });
+const TH_PROVINCES = [
+  "กรุงเทพมหานคร",
+  "กระบี่",
+  "กาญจนบุรี",
+  "กาฬสินธุ์",
+  "กำแพงเพชร",
+  "ขอนแก่น",
+  "จันทบุรี",
+  "ฉะเชิงเทรา",
+  "ชลบุรี",
+  "ชัยนาท",
+  "ชัยภูมิ",
+  "ชุมพร",
+  "เชียงราย",
+  "เชียงใหม่",
+  "ตรัง",
+  "ตราด",
+  "ตาก",
+  "นครนายก",
+  "นครปฐม",
+  "นครพนม",
+  "นครราชสีมา",
+  "นครศรีธรรมราช",
+  "นครสวรรค์",
+  "นนทบุรี",
+  "นราธิวาส",
+  "น่าน",
+  "บึงกาฬ",
+  "บุรีรัมย์",
+  "ปทุมธานี",
+  "ประจวบคีรีขันธ์",
+  "ปราจีนบุรี",
+  "ปัตตานี",
+  "พระนครศรีอยุธยา",
+  "พะเยา",
+  "พังงา",
+  "พัทลุง",
+  "พิจิตร",
+  "พิษณุโลก",
+  "เพชรบุรี",
+  "เพชรบูรณ์",
+  "แพร่",
+  "ภูเก็ต",
+  "มหาสารคาม",
+  "มุกดาหาร",
+  "แม่ฮ่องสอน",
+  "ยโสธร",
+  "ยะลา",
+  "ร้อยเอ็ด",
+  "ระนอง",
+  "ระยอง",
+  "ราชบุรี",
+  "ลพบุรี",
+  "ลำปาง",
+  "ลำพูน",
+  "เลย",
+  "ศรีสะเกษ",
+  "สกลนคร",
+  "สงขลา",
+  "สตูล",
+  "สมุทรปราการ",
+  "สมุทรสงคราม",
+  "สมุทรสาคร",
+  "สระแก้ว",
+  "สระบุรี",
+  "สิงห์บุรี",
+  "สุโขทัย",
+  "สุพรรณบุรี",
+  "สุราษฎร์ธานี",
+  "สุรินทร์",
+  "หนองคาย",
+  "หนองบัวลำภู",
+  "อ่างทอง",
+  "อำนาจเจริญ",
+  "อุดรธานี",
+  "อุตรดิตถ์",
+  "อุทัยธานี",
+  "อุบลราชธานี"
+];
+const ServiceAreaModal = ({ area, onClose }) => {
+  const [formData, setFormData] = react.useState({
+    kind: "PROVINCE",
+    value: "",
+    active: true
+  });
+  const [isSaving, setIsSaving] = react.useState(false);
+  react.useEffect(() => {
+    if (area) {
+      setFormData({
+        kind: area.kind,
+        value: area.value,
+        active: area.active
+      });
+    }
+  }, [area]);
+  const handleSubmit = async (e) => {
+    e.preventDefault();
+    const errors = [];
+    const trimmedValue = formData.value.trim();
+    if (!trimmedValue) {
+      errors.push("กรุณากรอกค่า");
+    }
+    if (formData.kind === "PROVINCE") {
+      if (!TH_PROVINCES.includes(trimmedValue)) {
+        errors.push("จังหวัดไม่ถูกต้อง กรุณาตรวจสอบการสะกดชื่อจังหวัด");
+      }
+    } else if (formData.kind === "POSTCODE_PREFIX") {
+      if (!/^\d{1,5}$/.test(trimmedValue)) {
+        errors.push("รหัสไปรษณีย์ต้องเป็นตัวเลข 1-5 หลัก");
+      }
+    }
+    if (errors.length > 0) {
+      ui.toast.error("ข้อมูลไม่ถูกต้อง", {
+        description: errors.join(", ")
+      });
+      return;
+    }
+    setIsSaving(true);
+    try {
+      const payload = {
+        kind: formData.kind,
+        value: trimmedValue,
+        active: formData.active
+      };
+      const url = area ? `/admin/service-areas/${area.id}` : "/admin/service-areas";
+      const method = area ? "PUT" : "POST";
+      const response = await fetch(url, {
+        method,
+        headers: { "Content-Type": "application/json" },
+        credentials: "include",
+        body: JSON.stringify(payload)
+      });
+      if (response.ok) {
+        ui.toast.success("สำเร็จ", {
+          description: area ? "แก้ไขพื้นที่บริการแล้ว" : "สร้างพื้นที่บริการใหม่แล้ว"
+        });
+        onClose();
+      } else {
+        const error = await response.json();
+        throw new Error(error.message || "Failed to save");
+      }
+    } catch (error) {
+      ui.toast.error("ข้อผิดพลาด", {
+        description: error instanceof Error ? error.message : "ไม่สามารถบันทึกข้อมูลได้"
+      });
+    } finally {
+      setIsSaving(false);
+    }
+  };
+  return /* @__PURE__ */ jsxRuntime.jsx(ui.Drawer, { open: true, onOpenChange: (open) => !open && onClose(), children: /* @__PURE__ */ jsxRuntime.jsxs(ui.Drawer.Content, { children: [
+    /* @__PURE__ */ jsxRuntime.jsx(ui.Drawer.Header, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Drawer.Title, { children: area ? "แก้ไขพื้นที่บริการ" : "สร้างพื้นที่บริการใหม่" }) }),
+    /* @__PURE__ */ jsxRuntime.jsx(ui.Drawer.Body, { children: /* @__PURE__ */ jsxRuntime.jsxs("form", { onSubmit: handleSubmit, className: "flex flex-col gap-y-4", children: [
+      /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
+        /* @__PURE__ */ jsxRuntime.jsx(ui.Label, { htmlFor: "kind", children: "ประเภท *" }),
+        /* @__PURE__ */ jsxRuntime.jsxs(
+          ui.Select,
+          {
+            value: formData.kind,
+            onValueChange: (value) => setFormData({ ...formData, kind: value, value: "" }),
+            required: true,
+            children: [
+              /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Trigger, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Value, { placeholder: "เลือกประเภท" }) }),
+              /* @__PURE__ */ jsxRuntime.jsxs(ui.Select.Content, { children: [
+                /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Item, { value: "PROVINCE", children: "จังหวัด" }),
+                /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Item, { value: "POSTCODE_PREFIX", children: "รหัสไปรษณีย์" })
+              ] })
+            ]
+          }
+        )
+      ] }),
+      /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
+        /* @__PURE__ */ jsxRuntime.jsx(ui.Label, { htmlFor: "value", children: formData.kind === "PROVINCE" ? "ชื่อจังหวัด *" : "รหัสไปรษณีย์ (1-5 หลัก) *" }),
+        formData.kind === "PROVINCE" ? /* @__PURE__ */ jsxRuntime.jsxs(
+          ui.Select,
+          {
+            value: formData.value,
+            onValueChange: (value) => setFormData({ ...formData, value }),
+            required: true,
+            children: [
+              /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Trigger, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Value, { placeholder: "เลือกจังหวัด" }) }),
+              /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Content, { children: TH_PROVINCES.map((province) => /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Item, { value: province, children: province }, province)) })
+            ]
+          }
+        ) : /* @__PURE__ */ jsxRuntime.jsx(
+          ui.Input,
+          {
+            id: "value",
+            type: "text",
+            value: formData.value,
+            onChange: (e) => setFormData({ ...formData, value: e.target.value }),
+            placeholder: "เช่น 10, 102, 10200",
+            maxLength: 5,
+            pattern: "\\d{1,5}",
+            required: true
+          }
+        ),
+        formData.kind === "POSTCODE_PREFIX" && /* @__PURE__ */ jsxRuntime.jsx("p", { className: "text-xs text-ui-fg-subtle mt-1", children: 'ใส่รหัส 1-5 หลักเพื่อครอบคลุมหลายพื้นที่ เช่น "10" = กรุงเทพฯ ทั้งหมด' })
+      ] }),
+      /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-x-2", children: [
+        /* @__PURE__ */ jsxRuntime.jsx(
+          ui.Switch,
+          {
+            id: "active",
+            checked: formData.active,
+            onCheckedChange: (checked) => setFormData({ ...formData, active: checked })
+          }
+        ),
+        /* @__PURE__ */ jsxRuntime.jsx(ui.Label, { htmlFor: "active", children: "เปิดใช้งาน" })
+      ] }),
+      /* @__PURE__ */ jsxRuntime.jsxs(ui.Drawer.Footer, { children: [
+        /* @__PURE__ */ jsxRuntime.jsx(
+          ui.Button,
+          {
+            type: "button",
+            variant: "secondary",
+            onClick: onClose,
+            disabled: isSaving,
+            children: "ยกเลิก"
+          }
+        ),
+        /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { type: "submit", disabled: isSaving, children: isSaving ? "กำลังบันทึก..." : "บันทึก" })
+      ] })
+    ] }) })
+  ] }) });
+};
+const AREA_KINDS = [
+  { value: "ALL", label: "ทั้งหมด" },
+  { value: "PROVINCE", label: "จังหวัด" },
+  { value: "POSTCODE_PREFIX", label: "รหัสไปรษณีย์" }
+];
+const ServiceAreasTable = () => {
+  const [areas, setAreas] = react.useState([]);
+  const [filteredAreas, setFilteredAreas] = react.useState([]);
+  const [searchTerm, setSearchTerm] = react.useState("");
+  const [kindFilter, setKindFilter] = react.useState("ALL");
+  const [isModalOpen, setIsModalOpen] = react.useState(false);
+  const [editingArea, setEditingArea] = react.useState(null);
+  const [isLoading, setIsLoading] = react.useState(false);
+  const [deleteAreaId, setDeleteAreaId] = react.useState(null);
+  const [deleteAreaValue, setDeleteAreaValue] = react.useState("");
+  react.useEffect(() => {
+    fetchAreas();
+  }, []);
+  react.useEffect(() => {
+    let filtered = areas;
+    if (kindFilter !== "ALL") {
+      filtered = filtered.filter((area) => area.kind === kindFilter);
+    }
+    if (searchTerm) {
+      filtered = filtered.filter(
+        (area) => area.value.toLowerCase().includes(searchTerm.toLowerCase())
+      );
+    }
+    setFilteredAreas(filtered);
+  }, [searchTerm, kindFilter, areas]);
+  const fetchAreas = async () => {
+    setIsLoading(true);
+    try {
+      const response = await fetch("/admin/service-areas", {
+        credentials: "include"
+      });
+      const data = await response.json();
+      console.log("Fetched service areas:", data);
+      setAreas(data.service_areas || []);
+    } catch (error) {
+      ui.toast.error("ข้อผิดพลาด", {
+        description: "ไม่สามารถโหลดข้อมูลพื้นที่บริการได้"
+      });
+    } finally {
+      setIsLoading(false);
+    }
+  };
+  const handleToggleActive = async (area) => {
+    try {
+      const response = await fetch(`/admin/service-areas/${area.id}`, {
+        method: "PUT",
+        headers: { "Content-Type": "application/json" },
+        credentials: "include",
+        body: JSON.stringify({ ...area, active: !area.active })
+      });
+      if (response.ok) {
+        ui.toast.success("สำเร็จ", {
+          description: `${area.active ? "ปิดใช้งาน" : "เปิดใช้งาน"}พื้นที่ ${area.value} แล้ว`
+        });
+        fetchAreas();
+      } else {
+        throw new Error("Failed to update");
+      }
+    } catch (error) {
+      ui.toast.error("ข้อผิดพลาด", {
+        description: "ไม่สามารถอัพเดทสถานะได้"
+      });
+    }
+  };
+  const handleDelete = async () => {
+    if (!deleteAreaId) return;
+    try {
+      const response = await fetch(`/admin/service-areas/${deleteAreaId}`, {
+        method: "DELETE",
+        credentials: "include"
+      });
+      if (response.ok) {
+        ui.toast.success("สำเร็จ", {
+          description: `ลบพื้นที่ ${deleteAreaValue} แล้ว`
+        });
+        fetchAreas();
+      } else {
+        throw new Error("Failed to delete");
+      }
+    } catch (error) {
+      ui.toast.error("ข้อผิดพลาด", {
+        description: "ไม่สามารถลบพื้นที่ได้"
+      });
+    } finally {
+      setDeleteAreaId(null);
+      setDeleteAreaValue("");
+    }
+  };
+  const handleEdit = (area) => {
+    setEditingArea(area);
+    setIsModalOpen(true);
+  };
+  const handleCreateNew = () => {
+    setEditingArea(null);
+    setIsModalOpen(true);
+  };
+  const handleModalClose = () => {
+    setIsModalOpen(false);
+    setEditingArea(null);
+    fetchAreas();
+  };
+  const openDeletePrompt = (id, value) => {
+    setDeleteAreaId(id);
+    setDeleteAreaValue(value);
+  };
+  return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
+    /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-y-4", children: [
+      /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center justify-between gap-x-4", children: [
+        /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex gap-x-4 flex-1", children: [
+          /* @__PURE__ */ jsxRuntime.jsx(
+            ui.Input,
+            {
+              type: "search",
+              placeholder: "ค้นหาจังหวัดหรือรหัสไปรษณีย์...",
+              value: searchTerm,
+              onChange: (e) => setSearchTerm(e.target.value),
+              className: "max-w-md"
+            }
+          ),
+          /* @__PURE__ */ jsxRuntime.jsxs(ui.Select, { value: kindFilter, onValueChange: setKindFilter, children: [
+            /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Trigger, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Value, { placeholder: "ประเภท" }) }),
+            /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Content, { children: AREA_KINDS.map((kind) => /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Item, { value: kind.value, children: kind.label }, kind.value)) })
+          ] })
+        ] }),
+        /* @__PURE__ */ jsxRuntime.jsxs(ui.Button, { onClick: handleCreateNew, children: [
+          /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Plus, {}),
+          "สร้างพื้นที่ใหม่"
+        ] })
+      ] }),
+      /* @__PURE__ */ jsxRuntime.jsxs(ui.Table, { children: [
+        /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Header, { children: /* @__PURE__ */ jsxRuntime.jsxs(ui.Table.Row, { children: [
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Table.HeaderCell, { children: "ประเภท" }),
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Table.HeaderCell, { children: "ค่า" }),
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Table.HeaderCell, { children: "สถานะ" }),
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Table.HeaderCell, { className: "text-right", children: "การจัดการ" })
+        ] }) }),
+        /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Body, { children: isLoading ? /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Row, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Cell, { className: "text-center", children: "กำลังโหลด..." }) }) : filteredAreas.length === 0 ? /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Row, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Cell, { className: "text-center", children: "ไม่พบข้อมูลพื้นที่บริการ" }) }) : filteredAreas.map((area) => /* @__PURE__ */ jsxRuntime.jsxs(ui.Table.Row, { children: [
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Cell, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Badge, { color: area.kind === "PROVINCE" ? "blue" : "purple", children: area.kind === "PROVINCE" ? "จังหวัด" : "รหัสไปรษณีย์" }) }),
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Cell, { children: area.value }),
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Cell, { children: /* @__PURE__ */ jsxRuntime.jsx(
+            ui.Badge,
+            {
+              color: area.active ? "green" : "grey",
+              className: "cursor-pointer",
+              onClick: () => handleToggleActive(area),
+              children: area.active ? "เปิดใช้งาน" : "ปิดใช้งาน"
+            }
+          ) }),
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Cell, { className: "text-right", children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center justify-end gap-x-2", children: [
+            /* @__PURE__ */ jsxRuntime.jsx(
+              ui.Button,
+              {
+                variant: "transparent",
+                size: "small",
+                onClick: () => handleEdit(area),
+                children: /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Edit, {})
+              }
+            ),
+            /* @__PURE__ */ jsxRuntime.jsx(
+              ui.Button,
+              {
+                variant: "transparent",
+                size: "small",
+                onClick: () => openDeletePrompt(area.id, area.value),
+                children: /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Trash, {})
+              }
+            )
+          ] }) })
+        ] }, area.id)) })
+      ] })
+    ] }),
+    isModalOpen && /* @__PURE__ */ jsxRuntime.jsx(ServiceAreaModal, { area: editingArea, onClose: handleModalClose }),
+    /* @__PURE__ */ jsxRuntime.jsx(
+      ui.Prompt,
+      {
+        variant: "confirmation",
+        open: !!deleteAreaId,
+        onOpenChange: () => {
+          setDeleteAreaId(null);
+          setDeleteAreaValue("");
+        },
+        children: /* @__PURE__ */ jsxRuntime.jsxs(ui.Prompt.Content, { children: [
+          /* @__PURE__ */ jsxRuntime.jsxs(ui.Prompt.Header, { children: [
+            /* @__PURE__ */ jsxRuntime.jsx(ui.Prompt.Title, { children: "ลบพื้นที่บริการ" }),
+            /* @__PURE__ */ jsxRuntime.jsxs(ui.Prompt.Description, { children: [
+              'คุณต้องการลบพื้นที่ "',
+              deleteAreaValue,
+              '" ใช่หรือไม่? การดำเนินการนี้ไม่สามารถย้อนกลับได้'
+            ] })
+          ] }),
+          /* @__PURE__ */ jsxRuntime.jsxs(ui.Prompt.Footer, { children: [
+            /* @__PURE__ */ jsxRuntime.jsx(ui.Prompt.Cancel, { children: "ยกเลิก" }),
+            /* @__PURE__ */ jsxRuntime.jsx(ui.Prompt.Action, { onClick: handleDelete, children: "ลบ" })
+          ] })
+        ] })
+      }
+    )
+  ] });
+};
+const AreasPage = () => {
+  return /* @__PURE__ */ jsxRuntime.jsx(ui.Container, { children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-y-4", children: [
+    /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex items-center justify-between", children: /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { level: "h1", children: "พื้นที่บริการ" }) }),
+    /* @__PURE__ */ jsxRuntime.jsx(ServiceAreasTable, {})
+  ] }) });
+};
+const config$4 = adminSdk.defineRouteConfig({
+  icon: icons.MapPin,
+  label: "พื้นที่บริการ"
+});
 const MessengerBaseRateModal = ({
   rate,
   onClose
@@ -576,7 +1015,7 @@ const BasePricingPage = () => {
     /* @__PURE__ */ jsxRuntime.jsx(MessengerBasePricingTable, {})
   ] }) });
 };
-const config$4 = adminSdk.defineRouteConfig({
+const config$3 = adminSdk.defineRouteConfig({
   icon: icons.Directions,
   label: "ฐานราคาตามระยะทาง"
 });
@@ -984,120 +1423,57 @@ const BoxesPage = () => {
     /* @__PURE__ */ jsxRuntime.jsx(ParcelBoxesTable, {})
   ] }) });
 };
-const config$3 = adminSdk.defineRouteConfig({
+const config$2 = adminSdk.defineRouteConfig({
   icon: icons.ArchiveBox,
   label: "กล่องพัสดุ"
 });
-const TH_PROVINCES = [
-  "กรุงเทพมหานคร",
-  "กระบี่",
-  "กาญจนบุรี",
-  "กาฬสินธุ์",
-  "กำแพงเพชร",
-  "ขอนแก่น",
-  "จันทบุรี",
-  "ฉะเชิงเทรา",
-  "ชลบุรี",
-  "ชัยนาท",
-  "ชัยภูมิ",
-  "ชุมพร",
-  "เชียงราย",
-  "เชียงใหม่",
-  "ตรัง",
-  "ตราด",
-  "ตาก",
-  "นครนายก",
-  "นครปฐม",
-  "นครพนม",
-  "นครราชสีมา",
-  "นครศรีธรรมราช",
-  "นครสวรรค์",
-  "นนทบุรี",
-  "นราธิวาส",
-  "น่าน",
-  "บึงกาฬ",
-  "บุรีรัมย์",
-  "ปทุมธานี",
-  "ประจวบคีรีขันธ์",
-  "ปราจีนบุรี",
-  "ปัตตานี",
-  "พระนครศรีอยุธยา",
-  "พะเยา",
-  "พังงา",
-  "พัทลุง",
-  "พิจิตร",
-  "พิษณุโลก",
-  "เพชรบุรี",
-  "เพชรบูรณ์",
-  "แพร่",
-  "ภูเก็ต",
-  "มหาสารคาม",
-  "มุกดาหาร",
-  "แม่ฮ่องสอน",
-  "ยโสธร",
-  "ยะลา",
-  "ร้อยเอ็ด",
-  "ระนอง",
-  "ระยอง",
-  "ราชบุรี",
-  "ลพบุรี",
-  "ลำปาง",
-  "ลำพูน",
-  "เลย",
-  "ศรีสะเกษ",
-  "สกลนคร",
-  "สงขลา",
-  "สตูล",
-  "สมุทรปราการ",
-  "สมุทรสงคราม",
-  "สมุทรสาคร",
-  "สระแก้ว",
-  "สระบุรี",
-  "สิงห์บุรี",
-  "สุโขทัย",
-  "สุพรรณบุรี",
-  "สุราษฎร์ธานี",
-  "สุรินทร์",
-  "หนองคาย",
-  "หนองบัวลำภู",
-  "อ่างทอง",
-  "อำนาจเจริญ",
-  "อุดรธานี",
-  "อุตรดิตถ์",
-  "อุทัยธานี",
-  "อุบลราชธานี"
+const CATEGORIES$1 = [
+  { value: "PACKAGING", label: "วัสดุหีบห่อ" },
+  { value: "PROTECTION", label: "วัสดุป้องกัน" },
+  { value: "FILLING", label: "วัสดุเติมช่องว่าง" },
+  { value: "TAPE", label: "เทป/กาว" },
+  { value: "LABEL", label: "ฉลาก/สติกเกอร์" },
+  { value: "OTHER", label: "อื่นๆ" }
 ];
-const ServiceAreaModal = ({ area, onClose }) => {
+const MaterialCostModal = ({
+  materialCost,
+  onClose
+}) => {
   const [formData, setFormData] = react.useState({
-    kind: "PROVINCE",
-    value: "",
+    name: "",
+    unit: "",
+    cost_per_unit: "",
+    currency: "THB",
+    category: "",
+    description: "",
     active: true
   });
   const [isSaving, setIsSaving] = react.useState(false);
   react.useEffect(() => {
-    if (area) {
+    if (materialCost) {
       setFormData({
-        kind: area.kind,
-        value: area.value,
-        active: area.active
+        name: materialCost.name,
+        unit: materialCost.unit,
+        cost_per_unit: materialCost.cost_per_unit.toString(),
+        currency: materialCost.currency,
+        category: materialCost.category || "",
+        description: materialCost.description || "",
+        active: materialCost.active
       });
     }
-  }, [area]);
+  }, [materialCost]);
   const handleSubmit = async (e) => {
     e.preventDefault();
     const errors = [];
-    const trimmedValue = formData.value.trim();
-    if (!trimmedValue) {
-      errors.push("กรุณากรอกค่า");
+    if (!formData.name.trim()) {
+      errors.push("กรุณากรอกชื่อวัสดุ");
     }
-    if (formData.kind === "PROVINCE") {
-      if (!TH_PROVINCES.includes(trimmedValue)) {
-        errors.push("จังหวัดไม่ถูกต้อง กรุณาตรวจสอบการสะกดชื่อจังหวัด");
-      }
-    } else if (formData.kind === "POSTCODE_PREFIX") {
-      if (!/^\d{1,5}$/.test(trimmedValue)) {
-        errors.push("รหัสไปรษณีย์ต้องเป็นตัวเลข 1-5 หลัก");
-      }
+    if (!formData.unit.trim()) {
+      errors.push("กรุณากรอกหน่วย");
+    }
+    const costPerUnit = parseFloat(formData.cost_per_unit);
+    if (isNaN(costPerUnit) || costPerUnit < 0) {
+      errors.push("ต้นทุนต่อหน่วยต้องเป็นตัวเลขไม่ติดลบ");
     }
     if (errors.length > 0) {
       ui.toast.error("ข้อมูลไม่ถูกต้อง", {
@@ -1108,12 +1484,16 @@ const ServiceAreaModal = ({ area, onClose }) => {
     setIsSaving(true);
     try {
       const payload = {
-        kind: formData.kind,
-        value: trimmedValue,
+        name: formData.name.trim(),
+        unit: formData.unit.trim(),
+        cost_per_unit: costPerUnit,
+        currency: formData.currency,
+        category: formData.category || void 0,
+        description: formData.description.trim() || void 0,
         active: formData.active
       };
-      const url = area ? `/admin/service-areas/${area.id}` : "/admin/service-areas";
-      const method = area ? "PUT" : "POST";
+      const url = materialCost ? `/admin/material-costs/${materialCost.id}` : "/admin/material-costs";
+      const method = materialCost ? "PUT" : "POST";
       const response = await fetch(url, {
         method,
         headers: { "Content-Type": "application/json" },
@@ -1122,7 +1502,7 @@ const ServiceAreaModal = ({ area, onClose }) => {
       });
       if (response.ok) {
         ui.toast.success("สำเร็จ", {
-          description: area ? "แก้ไขพื้นที่บริการแล้ว" : "สร้างพื้นที่บริการใหม่แล้ว"
+          description: materialCost ? "แก้ไขรายการต้นทุนวัสดุแล้ว" : "สร้างรายการต้นทุนวัสดุใหม่แล้ว"
         });
         onClose();
       } else {
@@ -1138,53 +1518,89 @@ const ServiceAreaModal = ({ area, onClose }) => {
     }
   };
   return /* @__PURE__ */ jsxRuntime.jsx(ui.Drawer, { open: true, onOpenChange: (open) => !open && onClose(), children: /* @__PURE__ */ jsxRuntime.jsxs(ui.Drawer.Content, { children: [
-    /* @__PURE__ */ jsxRuntime.jsx(ui.Drawer.Header, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Drawer.Title, { children: area ? "แก้ไขพื้นที่บริการ" : "สร้างพื้นที่บริการใหม่" }) }),
+    /* @__PURE__ */ jsxRuntime.jsx(ui.Drawer.Header, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Drawer.Title, { children: materialCost ? "แก้ไขรายการต้นทุนวัสดุ" : "สร้างรายการต้นทุนวัสดุใหม่" }) }),
     /* @__PURE__ */ jsxRuntime.jsx(ui.Drawer.Body, { children: /* @__PURE__ */ jsxRuntime.jsxs("form", { onSubmit: handleSubmit, className: "flex flex-col gap-y-4", children: [
       /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
-        /* @__PURE__ */ jsxRuntime.jsx(ui.Label, { htmlFor: "kind", children: "ประเภท *" }),
-        /* @__PURE__ */ jsxRuntime.jsxs(
-          ui.Select,
+        /* @__PURE__ */ jsxRuntime.jsx(ui.Label, { htmlFor: "name", children: "ชื่อวัสดุ *" }),
+        /* @__PURE__ */ jsxRuntime.jsx(
+          ui.Input,
           {
-            value: formData.kind,
-            onValueChange: (value) => setFormData({ ...formData, kind: value, value: "" }),
-            required: true,
-            children: [
-              /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Trigger, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Value, { placeholder: "เลือกประเภท" }) }),
-              /* @__PURE__ */ jsxRuntime.jsxs(ui.Select.Content, { children: [
-                /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Item, { value: "PROVINCE", children: "จังหวัด" }),
-                /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Item, { value: "POSTCODE_PREFIX", children: "รหัสไปรษณีย์" })
-              ] })
-            ]
+            id: "name",
+            value: formData.name,
+            onChange: (e) => setFormData({ ...formData, name: e.target.value }),
+            placeholder: "เช่น พลาสติกกันกระแทก, กล่องกระดาษ",
+            required: true
           }
         )
       ] }),
       /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
-        /* @__PURE__ */ jsxRuntime.jsx(ui.Label, { htmlFor: "value", children: formData.kind === "PROVINCE" ? "ชื่อจังหวัด *" : "รหัสไปรษณีย์ (1-5 หลัก) *" }),
-        formData.kind === "PROVINCE" ? /* @__PURE__ */ jsxRuntime.jsxs(
+        /* @__PURE__ */ jsxRuntime.jsx(ui.Label, { htmlFor: "category", children: "หมวดหมู่ (ไม่บังคับ)" }),
+        /* @__PURE__ */ jsxRuntime.jsxs(
           ui.Select,
           {
-            value: formData.value,
-            onValueChange: (value) => setFormData({ ...formData, value }),
-            required: true,
+            value: formData.category || void 0,
+            onValueChange: (value) => setFormData({ ...formData, category: value }),
             children: [
-              /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Trigger, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Value, { placeholder: "เลือกจังหวัด" }) }),
-              /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Content, { children: TH_PROVINCES.map((province) => /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Item, { value: province, children: province }, province)) })
+              /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Trigger, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Value, { placeholder: "เลือกหมวดหมู่ (ไม่บังคับ)" }) }),
+              /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Content, { children: CATEGORIES$1.map((category) => /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Item, { value: category.value, children: category.label }, category.value)) })
             ]
           }
-        ) : /* @__PURE__ */ jsxRuntime.jsx(
+        )
+      ] }),
+      /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "grid grid-cols-2 gap-x-4", children: [
+        /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Label, { htmlFor: "unit", children: "หน่วย *" }),
+          /* @__PURE__ */ jsxRuntime.jsx(
+            ui.Input,
+            {
+              id: "unit",
+              value: formData.unit,
+              onChange: (e) => setFormData({ ...formData, unit: e.target.value }),
+              placeholder: "เช่น ชิ้น, เมตร, กิโลกรัม",
+              required: true
+            }
+          )
+        ] }),
+        /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Label, { htmlFor: "costPerUnit", children: "ต้นทุนต่อหน่วย *" }),
+          /* @__PURE__ */ jsxRuntime.jsx(
+            ui.Input,
+            {
+              id: "costPerUnit",
+              type: "number",
+              step: "0.01",
+              value: formData.cost_per_unit,
+              onChange: (e) => setFormData({ ...formData, cost_per_unit: e.target.value }),
+              placeholder: "0.00",
+              required: true
+            }
+          )
+        ] })
+      ] }),
+      /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
+        /* @__PURE__ */ jsxRuntime.jsx(ui.Label, { htmlFor: "currency", children: "สกุลเงิน" }),
+        /* @__PURE__ */ jsxRuntime.jsx(
           ui.Input,
           {
-            id: "value",
-            type: "text",
-            value: formData.value,
-            onChange: (e) => setFormData({ ...formData, value: e.target.value }),
-            placeholder: "เช่น 10, 102, 10200",
-            maxLength: 5,
-            pattern: "\\d{1,5}",
-            required: true
+            id: "currency",
+            value: formData.currency,
+            onChange: (e) => setFormData({ ...formData, currency: e.target.value }),
+            placeholder: "THB"
           }
-        ),
-        formData.kind === "POSTCODE_PREFIX" && /* @__PURE__ */ jsxRuntime.jsx("p", { className: "text-xs text-ui-fg-subtle mt-1", children: 'ใส่รหัส 1-5 หลักเพื่อครอบคลุมหลายพื้นที่ เช่น "10" = กรุงเทพฯ ทั้งหมด' })
+        )
+      ] }),
+      /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
+        /* @__PURE__ */ jsxRuntime.jsx(ui.Label, { htmlFor: "description", children: "คำอธิบาย" }),
+        /* @__PURE__ */ jsxRuntime.jsx(
+          ui.Textarea,
+          {
+            id: "description",
+            value: formData.description,
+            onChange: (e) => setFormData({ ...formData, description: e.target.value }),
+            placeholder: "คำอธิบายเพิ่มเติมเกี่ยวกับวัสดุนี้...",
+            rows: 3
+          }
+        )
       ] }),
       /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-x-2", children: [
         /* @__PURE__ */ jsxRuntime.jsx(
@@ -1213,66 +1629,69 @@ const ServiceAreaModal = ({ area, onClose }) => {
     ] }) })
   ] }) });
 };
-const AREA_KINDS = [
+const CATEGORIES = [
   { value: "ALL", label: "ทั้งหมด" },
-  { value: "PROVINCE", label: "จังหวัด" },
-  { value: "POSTCODE_PREFIX", label: "รหัสไปรษณีย์" }
+  { value: "PACKAGING", label: "วัสดุหีบห่อ" },
+  { value: "PROTECTION", label: "วัสดุป้องกัน" },
+  { value: "FILLING", label: "วัสดุเติมช่องว่าง" },
+  { value: "TAPE", label: "เทป/กาว" },
+  { value: "LABEL", label: "ฉลาก/สติกเกอร์" },
+  { value: "OTHER", label: "อื่นๆ" }
 ];
-const ServiceAreasTable = () => {
-  const [areas, setAreas] = react.useState([]);
-  const [filteredAreas, setFilteredAreas] = react.useState([]);
+const MaterialCostsTable = () => {
+  const [materialCosts, setMaterialCosts] = react.useState([]);
+  const [filteredMaterialCosts, setFilteredMaterialCosts] = react.useState([]);
   const [searchTerm, setSearchTerm] = react.useState("");
-  const [kindFilter, setKindFilter] = react.useState("ALL");
+  const [categoryFilter, setCategoryFilter] = react.useState("ALL");
   const [isModalOpen, setIsModalOpen] = react.useState(false);
-  const [editingArea, setEditingArea] = react.useState(null);
+  const [editingMaterialCost, setEditingMaterialCost] = react.useState(null);
   const [isLoading, setIsLoading] = react.useState(false);
-  const [deleteAreaId, setDeleteAreaId] = react.useState(null);
-  const [deleteAreaValue, setDeleteAreaValue] = react.useState("");
+  const [deleteMaterialCostId, setDeleteMaterialCostId] = react.useState(null);
+  const [deleteMaterialCostName, setDeleteMaterialCostName] = react.useState("");
   react.useEffect(() => {
-    fetchAreas();
+    fetchMaterialCosts();
   }, []);
   react.useEffect(() => {
-    let filtered = areas;
-    if (kindFilter !== "ALL") {
-      filtered = filtered.filter((area) => area.kind === kindFilter);
+    let filtered = materialCosts;
+    if (categoryFilter !== "ALL") {
+      filtered = filtered.filter((mc) => mc.category === categoryFilter);
     }
     if (searchTerm) {
       filtered = filtered.filter(
-        (area) => area.value.toLowerCase().includes(searchTerm.toLowerCase())
+        (mc) => mc.name.toLowerCase().includes(searchTerm.toLowerCase())
       );
     }
-    setFilteredAreas(filtered);
-  }, [searchTerm, kindFilter, areas]);
-  const fetchAreas = async () => {
+    setFilteredMaterialCosts(filtered);
+  }, [searchTerm, categoryFilter, materialCosts]);
+  const fetchMaterialCosts = async () => {
     setIsLoading(true);
     try {
-      const response = await fetch("/admin/service-areas", {
+      const response = await fetch("/admin/material-costs", {
         credentials: "include"
       });
       const data = await response.json();
-      console.log("Fetched service areas:", data);
-      setAreas(data.service_areas || []);
+      setMaterialCosts(data.material_costs || []);
     } catch (error) {
       ui.toast.error("ข้อผิดพลาด", {
-        description: "ไม่สามารถโหลดข้อมูลพื้นที่บริการได้"
+        description: "ไม่สามารถโหลดข้อมูลต้นทุนวัสดุได้"
       });
     } finally {
       setIsLoading(false);
     }
   };
-  const handleToggleActive = async (area) => {
+  const handleToggleActive = async (materialCost) => {
     try {
-      const response = await fetch(`/admin/service-areas/${area.id}`, {
+      const response = await fetch(`/admin/material-costs/${materialCost.id}`, {
         method: "PUT",
         headers: { "Content-Type": "application/json" },
         credentials: "include",
-        body: JSON.stringify({ ...area, active: !area.active })
+        body: JSON.stringify({ ...materialCost, active: !materialCost.active })
       });
       if (response.ok) {
         ui.toast.success("สำเร็จ", {
-          description: `${area.active ? "ปิดใช้งาน" : "เปิดใช้งาน"}พื้นที่ ${area.value} แล้ว`
+          description: `${materialCost.active ? "ปิดใช้งาน" : "เปิดใช้งาน"}วัสดุ ${materialCost.name} แล้ว`
         });
-        fetchAreas();
+        fetchMaterialCosts();
       } else {
         throw new Error("Failed to update");
       }
@@ -1283,45 +1702,53 @@ const ServiceAreasTable = () => {
     }
   };
   const handleDelete = async () => {
-    if (!deleteAreaId) return;
+    if (!deleteMaterialCostId) return;
     try {
-      const response = await fetch(`/admin/service-areas/${deleteAreaId}`, {
-        method: "DELETE",
-        credentials: "include"
-      });
+      const response = await fetch(
+        `/admin/material-costs/${deleteMaterialCostId}`,
+        {
+          method: "DELETE",
+          credentials: "include"
+        }
+      );
       if (response.ok) {
         ui.toast.success("สำเร็จ", {
-          description: `ลบพื้นที่ ${deleteAreaValue} แล้ว`
+          description: `ลบวัสดุ ${deleteMaterialCostName} แล้ว`
         });
-        fetchAreas();
+        fetchMaterialCosts();
       } else {
         throw new Error("Failed to delete");
       }
     } catch (error) {
       ui.toast.error("ข้อผิดพลาด", {
-        description: "ไม่สามารถลบพื้นที่ได้"
+        description: "ไม่สามารถลบวัสดุได้"
       });
     } finally {
-      setDeleteAreaId(null);
-      setDeleteAreaValue("");
+      setDeleteMaterialCostId(null);
+      setDeleteMaterialCostName("");
     }
   };
-  const handleEdit = (area) => {
-    setEditingArea(area);
+  const handleEdit = (materialCost) => {
+    setEditingMaterialCost(materialCost);
     setIsModalOpen(true);
   };
   const handleCreateNew = () => {
-    setEditingArea(null);
+    setEditingMaterialCost(null);
     setIsModalOpen(true);
   };
   const handleModalClose = () => {
     setIsModalOpen(false);
-    setEditingArea(null);
-    fetchAreas();
+    setEditingMaterialCost(null);
+    fetchMaterialCosts();
   };
-  const openDeletePrompt = (id, value) => {
-    setDeleteAreaId(id);
-    setDeleteAreaValue(value);
+  const openDeletePrompt = (id, name) => {
+    setDeleteMaterialCostId(id);
+    setDeleteMaterialCostName(name);
+  };
+  const getCategoryLabel = (category) => {
+    var _a;
+    if (!category) return "-";
+    return ((_a = CATEGORIES.find((c) => c.value === category)) == null ? void 0 : _a.label) || category;
   };
   return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
     /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-y-4", children: [
@@ -1331,39 +1758,49 @@ const ServiceAreasTable = () => {
             ui.Input,
             {
               type: "search",
-              placeholder: "ค้นหาจังหวัดหรือรหัสไปรษณีย์...",
+              placeholder: "ค้นหาชื่อวัสดุ...",
               value: searchTerm,
               onChange: (e) => setSearchTerm(e.target.value),
               className: "max-w-md"
             }
           ),
-          /* @__PURE__ */ jsxRuntime.jsxs(ui.Select, { value: kindFilter, onValueChange: setKindFilter, children: [
-            /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Trigger, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Value, { placeholder: "ประเภท" }) }),
-            /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Content, { children: AREA_KINDS.map((kind) => /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Item, { value: kind.value, children: kind.label }, kind.value)) })
+          /* @__PURE__ */ jsxRuntime.jsxs(ui.Select, { value: categoryFilter, onValueChange: setCategoryFilter, children: [
+            /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Trigger, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Value, { placeholder: "หมวดหมู่" }) }),
+            /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Content, { children: CATEGORIES.map((category) => /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Item, { value: category.value, children: category.label }, category.value)) })
           ] })
         ] }),
         /* @__PURE__ */ jsxRuntime.jsxs(ui.Button, { onClick: handleCreateNew, children: [
           /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Plus, {}),
-          "สร้างพื้นที่ใหม่"
+          "สร้างรายการใหม่"
         ] })
       ] }),
       /* @__PURE__ */ jsxRuntime.jsxs(ui.Table, { children: [
         /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Header, { children: /* @__PURE__ */ jsxRuntime.jsxs(ui.Table.Row, { children: [
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Table.HeaderCell, { children: "ประเภท" }),
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Table.HeaderCell, { children: "ค่า" }),
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Table.HeaderCell, { children: "ชื่อ" }),
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Table.HeaderCell, { children: "หมวดหมู่" }),
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Table.HeaderCell, { children: "หน่วย" }),
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Table.HeaderCell, { children: "ต้นทุนต่อหน่วย" }),
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Table.HeaderCell, { children: "คำอธิบาย" }),
           /* @__PURE__ */ jsxRuntime.jsx(ui.Table.HeaderCell, { children: "สถานะ" }),
           /* @__PURE__ */ jsxRuntime.jsx(ui.Table.HeaderCell, { className: "text-right", children: "การจัดการ" })
         ] }) }),
-        /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Body, { children: isLoading ? /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Row, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Cell, { className: "text-center", children: "กำลังโหลด..." }) }) : filteredAreas.length === 0 ? /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Row, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Cell, { className: "text-center", children: "ไม่พบข้อมูลพื้นที่บริการ" }) }) : filteredAreas.map((area) => /* @__PURE__ */ jsxRuntime.jsxs(ui.Table.Row, { children: [
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Cell, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Badge, { color: area.kind === "PROVINCE" ? "blue" : "purple", children: area.kind === "PROVINCE" ? "จังหวัด" : "รหัสไปรษณีย์" }) }),
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Cell, { children: area.value }),
+        /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Body, { children: isLoading ? /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Row, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Cell, { className: "text-center", children: "กำลังโหลด..." }) }) : filteredMaterialCosts.length === 0 ? /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Row, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Cell, { className: "text-center", children: "ไม่พบข้อมูลต้นทุนวัสดุ" }) }) : filteredMaterialCosts.map((materialCost) => /* @__PURE__ */ jsxRuntime.jsxs(ui.Table.Row, { children: [
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Cell, { children: materialCost.name }),
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Cell, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Badge, { color: "blue", children: getCategoryLabel(materialCost.category) }) }),
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Cell, { children: materialCost.unit }),
+          /* @__PURE__ */ jsxRuntime.jsxs(ui.Table.Cell, { children: [
+            materialCost.cost_per_unit.toFixed(2),
+            " ",
+            materialCost.currency
+          ] }),
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Cell, { className: "max-w-xs truncate", children: materialCost.description || "-" }),
           /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Cell, { children: /* @__PURE__ */ jsxRuntime.jsx(
             ui.Badge,
             {
-              color: area.active ? "green" : "grey",
+              color: materialCost.active ? "green" : "grey",
               className: "cursor-pointer",
-              onClick: () => handleToggleActive(area),
-              children: area.active ? "เปิดใช้งาน" : "ปิดใช้งาน"
+              onClick: () => handleToggleActive(materialCost),
+              children: materialCost.active ? "เปิดใช้งาน" : "ปิดใช้งาน"
             }
           ) }),
           /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Cell, { className: "text-right", children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center justify-end gap-x-2", children: [
@@ -1372,7 +1809,7 @@ const ServiceAreasTable = () => {
               {
                 variant: "transparent",
                 size: "small",
-                onClick: () => handleEdit(area),
+                onClick: () => handleEdit(materialCost),
                 children: /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Edit, {})
               }
             ),
@@ -1381,30 +1818,36 @@ const ServiceAreasTable = () => {
               {
                 variant: "transparent",
                 size: "small",
-                onClick: () => openDeletePrompt(area.id, area.value),
+                onClick: () => openDeletePrompt(materialCost.id, materialCost.name),
                 children: /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Trash, {})
               }
             )
           ] }) })
-        ] }, area.id)) })
+        ] }, materialCost.id)) })
       ] })
     ] }),
-    isModalOpen && /* @__PURE__ */ jsxRuntime.jsx(ServiceAreaModal, { area: editingArea, onClose: handleModalClose }),
+    isModalOpen && /* @__PURE__ */ jsxRuntime.jsx(
+      MaterialCostModal,
+      {
+        materialCost: editingMaterialCost,
+        onClose: handleModalClose
+      }
+    ),
     /* @__PURE__ */ jsxRuntime.jsx(
       ui.Prompt,
       {
         variant: "confirmation",
-        open: !!deleteAreaId,
+        open: !!deleteMaterialCostId,
         onOpenChange: () => {
-          setDeleteAreaId(null);
-          setDeleteAreaValue("");
+          setDeleteMaterialCostId(null);
+          setDeleteMaterialCostName("");
         },
         children: /* @__PURE__ */ jsxRuntime.jsxs(ui.Prompt.Content, { children: [
           /* @__PURE__ */ jsxRuntime.jsxs(ui.Prompt.Header, { children: [
-            /* @__PURE__ */ jsxRuntime.jsx(ui.Prompt.Title, { children: "ลบพื้นที่บริการ" }),
+            /* @__PURE__ */ jsxRuntime.jsx(ui.Prompt.Title, { children: "ลบรายการต้นทุนวัสดุ" }),
             /* @__PURE__ */ jsxRuntime.jsxs(ui.Prompt.Description, { children: [
-              'คุณต้องการลบพื้นที่ "',
-              deleteAreaValue,
+              'คุณต้องการลบวัสดุ "',
+              deleteMaterialCostName,
               '" ใช่หรือไม่? การดำเนินการนี้ไม่สามารถย้อนกลับได้'
             ] })
           ] }),
@@ -1417,63 +1860,98 @@ const ServiceAreasTable = () => {
     )
   ] });
 };
-const AreasPage = () => {
+const MaterialCostsPage = () => {
   return /* @__PURE__ */ jsxRuntime.jsx(ui.Container, { children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-y-4", children: [
-    /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex items-center justify-between", children: /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { level: "h1", children: "พื้นที่บริการ" }) }),
-    /* @__PURE__ */ jsxRuntime.jsx(ServiceAreasTable, {})
-  ] }) });
-};
-const config$2 = adminSdk.defineRouteConfig({
-  icon: icons.MapPin,
-  label: "พื้นที่บริการ"
+    /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex items-center justify-between", children: /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { level: "h1", children: "ต้นทุนวัสดุ" }) }),
+    /* @__PURE__ */ jsxRuntime.jsx(MaterialCostsTable, {})
+  ] }) });
+};
+const config$1 = adminSdk.defineRouteConfig({
+  icon: icons.CurrencyDollarSolid,
+  label: "ต้นทุนวัสดุ"
 });
-const CATEGORIES$1 = [
-  { value: "PACKAGING", label: "วัสดุหีบห่อ" },
-  { value: "PROTECTION", label: "วัสดุป้องกัน" },
-  { value: "FILLING", label: "วัสดุเติมช่องว่าง" },
-  { value: "TAPE", label: "เทป/กาว" },
-  { value: "LABEL", label: "ฉลาก/สติกเกอร์" },
-  { value: "OTHER", label: "อื่นๆ" }
+const CARRIER_TYPES$1 = [
+  { value: "COMPANY_FLEET", label: "บริษัทรถส่งของ (Messenger)" },
+  { value: "COMPANY_TRUCK", label: "รถบริษัท (Same Day)" },
+  { value: "PRIVATE_CARRIER", label: "ขนส่งเอกชน (EMS/Express)" }
 ];
-const MaterialCostModal = ({
-  materialCost,
-  onClose
-}) => {
+const SERVICE_CODES$1 = [
+  { value: "MESSENGER_3H", label: "ส่งด่วน 3 ชม.", usesHours: true },
+  { value: "SAME_DAY", label: "ส่งด่วนภายในวัน", usesHours: true },
+  { value: "STANDARD_3_5D", label: "EMS 3-5 วัน", usesHours: false },
+  { value: "EXPRESS_1_2D", label: "Express 1-2 วัน", usesHours: false }
+];
+const ShippingRateModal = ({ rate, onClose }) => {
   const [formData, setFormData] = react.useState({
-    name: "",
-    unit: "",
-    cost_per_unit: "",
+    carrier_type: "COMPANY_FLEET",
+    service_code: "MESSENGER_3H",
+    max_weight_kg: "",
+    price: "",
     currency: "THB",
-    category: "",
-    description: "",
+    priority: "0",
+    eta_hours_min: "",
+    eta_hours_max: "",
+    eta_days_min: "",
+    eta_days_max: "",
     active: true
   });
   const [isSaving, setIsSaving] = react.useState(false);
+  const selectedService = SERVICE_CODES$1.find((s) => s.value === formData.service_code);
+  const usesHours = (selectedService == null ? void 0 : selectedService.usesHours) ?? false;
+  const isMessenger = formData.carrier_type === "COMPANY_FLEET" && formData.service_code === "MESSENGER_3H";
   react.useEffect(() => {
-    if (materialCost) {
+    var _a, _b, _c, _d;
+    if (rate) {
       setFormData({
-        name: materialCost.name,
-        unit: materialCost.unit,
-        cost_per_unit: materialCost.cost_per_unit.toString(),
-        currency: materialCost.currency,
-        category: materialCost.category || "",
-        description: materialCost.description || "",
-        active: materialCost.active
+        carrier_type: rate.carrier_type,
+        service_code: rate.service_code,
+        max_weight_kg: rate.max_weight_kg.toString(),
+        price: rate.price.toString(),
+        currency: rate.currency,
+        priority: (rate.priority ?? 0).toString(),
+        eta_hours_min: ((_a = rate.eta_hours_min) == null ? void 0 : _a.toString()) || "",
+        eta_hours_max: ((_b = rate.eta_hours_max) == null ? void 0 : _b.toString()) || "",
+        eta_days_min: ((_c = rate.eta_days_min) == null ? void 0 : _c.toString()) || "",
+        eta_days_max: ((_d = rate.eta_days_max) == null ? void 0 : _d.toString()) || "",
+        active: rate.active
       });
     }
-  }, [materialCost]);
+  }, [rate]);
   const handleSubmit = async (e) => {
     e.preventDefault();
     const errors = [];
-    if (!formData.name.trim()) {
-      errors.push("กรุณากรอกชื่อวัสดุ");
+    const maxWeight = parseFloat(formData.max_weight_kg);
+    const price = parseFloat(formData.price);
+    const priority = parseInt(formData.priority);
+    if (isNaN(maxWeight) || maxWeight <= 0) {
+      errors.push("น้ำหนักสูงสุดต้องเป็นตัวเลขมากกว่า 0");
     }
-    if (!formData.unit.trim()) {
-      errors.push("กรุณากรอกหน่วย");
+    if (isNaN(price) || price < 0) {
+      errors.push("ราคาต้องเป็นตัวเลขไม่ติดลบ");
     }
-    const costPerUnit = parseFloat(formData.cost_per_unit);
-    if (isNaN(costPerUnit) || costPerUnit < 0) {
-      errors.push("ต้นทุนต่อหน่วยต้องเป็นตัวเลขไม่ติดลบ");
+    if (isNaN(priority)) {
+      errors.push("ลำดับความสำคัญต้องเป็นตัวเลข");
+    }
+    let etaHoursMin;
+    let etaHoursMax;
+    let etaDaysMin;
+    let etaDaysMax;
+    if (usesHours) {
+      etaHoursMin = formData.eta_hours_min ? parseFloat(formData.eta_hours_min) : void 0;
+      etaHoursMax = formData.eta_hours_max ? parseFloat(formData.eta_hours_max) : void 0;
+      if (etaHoursMin === void 0 || etaHoursMax === void 0) {
+        errors.push("กรุณากรอก ETA เป็นชั่วโมงให้ครบ");
+      } else if (etaHoursMin > etaHoursMax) {
+        errors.push("ETA ชั่วโมงต่ำสุดต้องน้อยกว่าหรือเท่ากับสูงสุด");
+      }
+    } else {
+      etaDaysMin = formData.eta_days_min ? parseFloat(formData.eta_days_min) : void 0;
+      etaDaysMax = formData.eta_days_max ? parseFloat(formData.eta_days_max) : void 0;
+      if (etaDaysMin === void 0 || etaDaysMax === void 0) {
+        errors.push("กรุณากรอก ETA เป็นวันให้ครบ");
+      } else if (etaDaysMin > etaDaysMax) {
+        errors.push("ETA วันต่ำสุดต้องน้อยกว่าหรือเท่ากับสูงสุด");
+      }
     }
     if (errors.length > 0) {
       ui.toast.error("ข้อมูลไม่ถูกต้อง", {
@@ -1484,16 +1962,23 @@ const MaterialCostModal = ({
     setIsSaving(true);
     try {
       const payload = {
-        name: formData.name.trim(),
-        unit: formData.unit.trim(),
-        cost_per_unit: costPerUnit,
+        carrier_type: formData.carrier_type,
+        service_code: formData.service_code,
+        max_weight_kg: maxWeight,
+        price,
         currency: formData.currency,
-        category: formData.category || void 0,
-        description: formData.description.trim() || void 0,
+        priority,
         active: formData.active
       };
-      const url = materialCost ? `/admin/material-costs/${materialCost.id}` : "/admin/material-costs";
-      const method = materialCost ? "PUT" : "POST";
+      if (usesHours) {
+        payload.eta_hours_min = etaHoursMin;
+        payload.eta_hours_max = etaHoursMax;
+      } else {
+        payload.eta_days_min = etaDaysMin;
+        payload.eta_days_max = etaDaysMax;
+      }
+      const url = rate ? `/admin/shipping-rates/${rate.id}` : "/admin/shipping-rates";
+      const method = rate ? "PUT" : "POST";
       const response = await fetch(url, {
         method,
         headers: { "Content-Type": "application/json" },
@@ -1502,7 +1987,7 @@ const MaterialCostModal = ({
       });
       if (response.ok) {
         ui.toast.success("สำเร็จ", {
-          description: materialCost ? "แก้ไขรายการต้นทุนวัสดุแล้ว" : "สร้างรายการต้นทุนวัสดุใหม่แล้ว"
+          description: rate ? "แก้ไขอัตราค่าขนส่งแล้ว" : "สร้างอัตราค่าขนส่งใหม่แล้ว"
         });
         onClose();
       } else {
@@ -1518,89 +2003,147 @@ const MaterialCostModal = ({
     }
   };
   return /* @__PURE__ */ jsxRuntime.jsx(ui.Drawer, { open: true, onOpenChange: (open) => !open && onClose(), children: /* @__PURE__ */ jsxRuntime.jsxs(ui.Drawer.Content, { children: [
-    /* @__PURE__ */ jsxRuntime.jsx(ui.Drawer.Header, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Drawer.Title, { children: materialCost ? "แก้ไขรายการต้นทุนวัสดุ" : "สร้างรายการต้นทุนวัสดุใหม่" }) }),
+    /* @__PURE__ */ jsxRuntime.jsx(ui.Drawer.Header, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Drawer.Title, { children: rate ? "แก้ไขอัตราค่าขนส่ง" : "สร้างอัตราค่าขนส่งใหม่" }) }),
     /* @__PURE__ */ jsxRuntime.jsx(ui.Drawer.Body, { children: /* @__PURE__ */ jsxRuntime.jsxs("form", { onSubmit: handleSubmit, className: "flex flex-col gap-y-4", children: [
       /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
-        /* @__PURE__ */ jsxRuntime.jsx(ui.Label, { htmlFor: "name", children: "ชื่อวัสดุ *" }),
-        /* @__PURE__ */ jsxRuntime.jsx(
-          ui.Input,
+        /* @__PURE__ */ jsxRuntime.jsx(ui.Label, { htmlFor: "carrier", children: "ประเภทขนส่ง *" }),
+        /* @__PURE__ */ jsxRuntime.jsxs(
+          ui.Select,
           {
-            id: "name",
-            value: formData.name,
-            onChange: (e) => setFormData({ ...formData, name: e.target.value }),
-            placeholder: "เช่น พลาสติกกันกระแทก, กล่องกระดาษ",
-            required: true
+            value: formData.carrier_type,
+            onValueChange: (value) => setFormData({ ...formData, carrier_type: value }),
+            children: [
+              /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Trigger, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Value, { placeholder: "เลือกประเภทขนส่ง" }) }),
+              /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Content, { children: CARRIER_TYPES$1.map((carrier) => /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Item, { value: carrier.value, children: carrier.label }, carrier.value)) })
+            ]
           }
         )
       ] }),
       /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
-        /* @__PURE__ */ jsxRuntime.jsx(ui.Label, { htmlFor: "category", children: "หมวดหมู่ (ไม่บังคับ)" }),
+        /* @__PURE__ */ jsxRuntime.jsx(ui.Label, { htmlFor: "service", children: "บริการจัดส่ง *" }),
         /* @__PURE__ */ jsxRuntime.jsxs(
           ui.Select,
           {
-            value: formData.category || void 0,
-            onValueChange: (value) => setFormData({ ...formData, category: value }),
+            value: formData.service_code,
+            onValueChange: (value) => setFormData({
+              ...formData,
+              service_code: value,
+              eta_hours_min: "",
+              eta_hours_max: "",
+              eta_days_min: "",
+              eta_days_max: ""
+            }),
             children: [
-              /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Trigger, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Value, { placeholder: "เลือกหมวดหมู่ (ไม่บังคับ)" }) }),
-              /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Content, { children: CATEGORIES$1.map((category) => /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Item, { value: category.value, children: category.label }, category.value)) })
+              /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Trigger, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Value, { placeholder: "เลือกบริการ" }) }),
+              /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Content, { children: SERVICE_CODES$1.map((service) => /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Item, { value: service.value, children: service.label }, service.value)) })
             ]
           }
         )
       ] }),
+      isMessenger && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "rounded-lg border border-ui-border-base bg-ui-bg-subtle p-3 text-sm space-y-1", children: [
+        /* @__PURE__ */ jsxRuntime.jsx("div", { className: "font-semibold text-ui-fg-base", children: "ฐานราคาตามระยะทาง (Messenger)" }),
+        /* @__PURE__ */ jsxRuntime.jsx("div", { className: "text-ui-fg-subtle", children: "ตั้งช่วงราคาตามระยะทาง เช่น 0-5, 5-20, 20-30, 30+ กม. สำหรับบริการส่งด่วน 3 ชม." }),
+        /* @__PURE__ */ jsxRuntime.jsx("div", { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { asChild: true, size: "small", variant: "secondary", children: /* @__PURE__ */ jsxRuntime.jsxs("a", { href: "/base-pricing", target: "_blank", rel: "noreferrer", children: [
+          "จัดการฐานราคา",
+          /* @__PURE__ */ jsxRuntime.jsx(lucideReact.ExternalLink, { className: "ml-1 h-4 w-4" })
+        ] }) }) })
+      ] }),
       /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "grid grid-cols-2 gap-x-4", children: [
         /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Label, { htmlFor: "unit", children: "หน่วย *" }),
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Label, { htmlFor: "maxWeight", children: "น้ำหนักสูงสุด (kg) *" }),
           /* @__PURE__ */ jsxRuntime.jsx(
             ui.Input,
             {
-              id: "unit",
-              value: formData.unit,
-              onChange: (e) => setFormData({ ...formData, unit: e.target.value }),
-              placeholder: "เช่น ชิ้น, เมตร, กิโลกรัม",
+              id: "maxWeight",
+              type: "number",
+              step: "0.1",
+              min: "0",
+              value: formData.max_weight_kg,
+              onChange: (e) => setFormData({ ...formData, max_weight_kg: e.target.value }),
+              placeholder: "เช่น 3",
               required: true
             }
           )
         ] }),
         /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Label, { htmlFor: "costPerUnit", children: "ต้นทุนต่อหน่วย *" }),
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Label, { htmlFor: "price", children: "ราคา (THB) *" }),
           /* @__PURE__ */ jsxRuntime.jsx(
             ui.Input,
             {
-              id: "costPerUnit",
+              id: "price",
               type: "number",
               step: "0.01",
-              value: formData.cost_per_unit,
-              onChange: (e) => setFormData({ ...formData, cost_per_unit: e.target.value }),
-              placeholder: "0.00",
+              min: "0",
+              value: formData.price,
+              onChange: (e) => setFormData({ ...formData, price: e.target.value }),
+              placeholder: "เช่น 80",
               required: true
             }
           )
         ] })
       ] }),
       /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
-        /* @__PURE__ */ jsxRuntime.jsx(ui.Label, { htmlFor: "currency", children: "สกุลเงิน" }),
+        /* @__PURE__ */ jsxRuntime.jsx(ui.Label, { htmlFor: "priority", children: "ลำดับความสำคัญ" }),
         /* @__PURE__ */ jsxRuntime.jsx(
           ui.Input,
           {
-            id: "currency",
-            value: formData.currency,
-            onChange: (e) => setFormData({ ...formData, currency: e.target.value }),
-            placeholder: "THB"
+            id: "priority",
+            type: "number",
+            value: formData.priority,
+            onChange: (e) => setFormData({ ...formData, priority: e.target.value }),
+            placeholder: "0"
           }
-        )
+        ),
+        /* @__PURE__ */ jsxRuntime.jsx("p", { className: "text-xs text-ui-fg-subtle mt-1", children: "ตัวเลขสูงกว่าจะถูกเสนอให้เลือกก่อน (ค่าเริ่มต้น 0)" })
       ] }),
       /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
-        /* @__PURE__ */ jsxRuntime.jsx(ui.Label, { htmlFor: "description", children: "คำอธิบาย" }),
-        /* @__PURE__ */ jsxRuntime.jsx(
-          ui.Textarea,
-          {
-            id: "description",
-            value: formData.description,
-            onChange: (e) => setFormData({ ...formData, description: e.target.value }),
-            placeholder: "คำอธิบายเพิ่มเติมเกี่ยวกับวัสดุนี้...",
-            rows: 3
-          }
-        )
+        /* @__PURE__ */ jsxRuntime.jsxs(ui.Label, { children: [
+          usesHours ? "ETA (ชั่วโมง)" : "ETA (วัน)",
+          " *"
+        ] }),
+        /* @__PURE__ */ jsxRuntime.jsx("div", { className: "grid grid-cols-2 gap-x-4 mt-2", children: usesHours ? /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
+          /* @__PURE__ */ jsxRuntime.jsx(
+            ui.Input,
+            {
+              type: "number",
+              placeholder: "ต่ำสุด",
+              value: formData.eta_hours_min,
+              onChange: (e) => setFormData({ ...formData, eta_hours_min: e.target.value }),
+              required: true
+            }
+          ),
+          /* @__PURE__ */ jsxRuntime.jsx(
+            ui.Input,
+            {
+              type: "number",
+              placeholder: "สูงสุด",
+              value: formData.eta_hours_max,
+              onChange: (e) => setFormData({ ...formData, eta_hours_max: e.target.value }),
+              required: true
+            }
+          )
+        ] }) : /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
+          /* @__PURE__ */ jsxRuntime.jsx(
+            ui.Input,
+            {
+              type: "number",
+              placeholder: "ต่ำสุด",
+              value: formData.eta_days_min,
+              onChange: (e) => setFormData({ ...formData, eta_days_min: e.target.value }),
+              required: true
+            }
+          ),
+          /* @__PURE__ */ jsxRuntime.jsx(
+            ui.Input,
+            {
+              type: "number",
+              placeholder: "สูงสุด",
+              value: formData.eta_days_max,
+              onChange: (e) => setFormData({ ...formData, eta_days_max: e.target.value }),
+              required: true
+            }
+          )
+        ] }) })
       ] }),
       /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-x-2", children: [
         /* @__PURE__ */ jsxRuntime.jsx(
@@ -1614,202 +2157,168 @@ const MaterialCostModal = ({
         /* @__PURE__ */ jsxRuntime.jsx(ui.Label, { htmlFor: "active", children: "เปิดใช้งาน" })
       ] }),
       /* @__PURE__ */ jsxRuntime.jsxs(ui.Drawer.Footer, { children: [
-        /* @__PURE__ */ jsxRuntime.jsx(
-          ui.Button,
-          {
-            type: "button",
-            variant: "secondary",
-            onClick: onClose,
-            disabled: isSaving,
-            children: "ยกเลิก"
-          }
-        ),
+        /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { type: "button", variant: "secondary", onClick: onClose, disabled: isSaving, children: "ยกเลิก" }),
         /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { type: "submit", disabled: isSaving, children: isSaving ? "กำลังบันทึก..." : "บันทึก" })
       ] })
     ] }) })
   ] }) });
 };
-const CATEGORIES = [
+const CARRIER_TYPES = [
   { value: "ALL", label: "ทั้งหมด" },
-  { value: "PACKAGING", label: "วัสดุหีบห่อ" },
-  { value: "PROTECTION", label: "วัสดุป้องกัน" },
-  { value: "FILLING", label: "วัสดุเติมช่องว่าง" },
-  { value: "TAPE", label: "เทป/กาว" },
-  { value: "LABEL", label: "ฉลาก/สติกเกอร์" },
-  { value: "OTHER", label: "อื่นๆ" }
+  { value: "COMPANY_FLEET", label: "บริษัทรถส่งของ (Messenger)" },
+  { value: "COMPANY_TRUCK", label: "รถบริษัท (Same Day)" },
+  { value: "PRIVATE_CARRIER", label: "ขนส่งเอกชน (EMS/Express)" }
 ];
-const MaterialCostsTable = () => {
-  const [materialCosts, setMaterialCosts] = react.useState([]);
-  const [filteredMaterialCosts, setFilteredMaterialCosts] = react.useState([]);
-  const [searchTerm, setSearchTerm] = react.useState("");
-  const [categoryFilter, setCategoryFilter] = react.useState("ALL");
+const SERVICE_CODES = [
+  { value: "ALL", label: "ทั้งหมด" },
+  { value: "MESSENGER_3H", label: "ส่งด่วน 3 ชม." },
+  { value: "SAME_DAY", label: "ส่งด่วนภายในวัน" },
+  { value: "STANDARD_3_5D", label: "EMS 3-5 วัน" },
+  { value: "EXPRESS_1_2D", label: "Express 1-2 วัน" }
+];
+const ShippingRatesTable = () => {
+  const [rates, setRates] = react.useState([]);
+  const [filteredRates, setFilteredRates] = react.useState([]);
+  const [carrierFilter, setCarrierFilter] = react.useState("ALL");
+  const [serviceFilter, setServiceFilter] = react.useState("ALL");
   const [isModalOpen, setIsModalOpen] = react.useState(false);
-  const [editingMaterialCost, setEditingMaterialCost] = react.useState(null);
+  const [editingRate, setEditingRate] = react.useState(null);
   const [isLoading, setIsLoading] = react.useState(false);
-  const [deleteMaterialCostId, setDeleteMaterialCostId] = react.useState(null);
-  const [deleteMaterialCostName, setDeleteMaterialCostName] = react.useState("");
+  const [deleteRateId, setDeleteRateId] = react.useState(null);
   react.useEffect(() => {
-    fetchMaterialCosts();
+    fetchRates();
   }, []);
   react.useEffect(() => {
-    let filtered = materialCosts;
-    if (categoryFilter !== "ALL") {
-      filtered = filtered.filter((mc) => mc.category === categoryFilter);
+    let filtered = rates;
+    if (carrierFilter !== "ALL") {
+      filtered = filtered.filter((rate) => rate.carrier_type === carrierFilter);
     }
-    if (searchTerm) {
-      filtered = filtered.filter(
-        (mc) => mc.name.toLowerCase().includes(searchTerm.toLowerCase())
-      );
+    if (serviceFilter !== "ALL") {
+      filtered = filtered.filter((rate) => rate.service_code === serviceFilter);
     }
-    setFilteredMaterialCosts(filtered);
-  }, [searchTerm, categoryFilter, materialCosts]);
-  const fetchMaterialCosts = async () => {
+    setFilteredRates(filtered);
+  }, [carrierFilter, serviceFilter, rates]);
+  const fetchRates = async () => {
     setIsLoading(true);
     try {
-      const response = await fetch("/admin/material-costs", {
+      const response = await fetch("/admin/shipping-rates", {
         credentials: "include"
       });
       const data = await response.json();
-      setMaterialCosts(data.material_costs || []);
+      setRates(data.rates || []);
     } catch (error) {
       ui.toast.error("ข้อผิดพลาด", {
-        description: "ไม่สามารถโหลดข้อมูลต้นทุนวัสดุได้"
+        description: "ไม่สามารถโหลดข้อมูลอัตราค่าขนส่งได้"
       });
     } finally {
       setIsLoading(false);
     }
   };
-  const handleToggleActive = async (materialCost) => {
-    try {
-      const response = await fetch(`/admin/material-costs/${materialCost.id}`, {
-        method: "PUT",
-        headers: { "Content-Type": "application/json" },
-        credentials: "include",
-        body: JSON.stringify({ ...materialCost, active: !materialCost.active })
-      });
-      if (response.ok) {
-        ui.toast.success("สำเร็จ", {
-          description: `${materialCost.active ? "ปิดใช้งาน" : "เปิดใช้งาน"}วัสดุ ${materialCost.name} แล้ว`
-        });
-        fetchMaterialCosts();
-      } else {
-        throw new Error("Failed to update");
-      }
-    } catch (error) {
-      ui.toast.error("ข้อผิดพลาด", {
-        description: "ไม่สามารถอัพเดทสถานะได้"
-      });
-    }
-  };
   const handleDelete = async () => {
-    if (!deleteMaterialCostId) return;
+    if (!deleteRateId) return;
     try {
-      const response = await fetch(
-        `/admin/material-costs/${deleteMaterialCostId}`,
-        {
-          method: "DELETE",
-          credentials: "include"
-        }
-      );
+      const response = await fetch(`/admin/shipping-rates/${deleteRateId}`, {
+        method: "DELETE",
+        credentials: "include"
+      });
       if (response.ok) {
         ui.toast.success("สำเร็จ", {
-          description: `ลบวัสดุ ${deleteMaterialCostName} แล้ว`
+          description: "ลบอัตราค่าขนส่งแล้ว"
         });
-        fetchMaterialCosts();
+        fetchRates();
       } else {
         throw new Error("Failed to delete");
       }
     } catch (error) {
       ui.toast.error("ข้อผิดพลาด", {
-        description: "ไม่สามารถลบวัสดุได้"
+        description: "ไม่สามารถลบอัตราค่าขนส่งได้"
       });
     } finally {
-      setDeleteMaterialCostId(null);
-      setDeleteMaterialCostName("");
+      setDeleteRateId(null);
     }
   };
-  const handleEdit = (materialCost) => {
-    setEditingMaterialCost(materialCost);
+  const handleEdit = (rate) => {
+    setEditingRate(rate);
     setIsModalOpen(true);
   };
   const handleCreateNew = () => {
-    setEditingMaterialCost(null);
+    setEditingRate(null);
     setIsModalOpen(true);
   };
   const handleModalClose = () => {
     setIsModalOpen(false);
-    setEditingMaterialCost(null);
-    fetchMaterialCosts();
+    setEditingRate(null);
+    fetchRates();
   };
-  const openDeletePrompt = (id, name) => {
-    setDeleteMaterialCostId(id);
-    setDeleteMaterialCostName(name);
+  const getCarrierLabel = (type) => {
+    var _a;
+    return ((_a = CARRIER_TYPES.find((c) => c.value === type)) == null ? void 0 : _a.label) || type;
   };
-  const getCategoryLabel = (category) => {
+  const getServiceLabel = (code) => {
     var _a;
-    if (!category) return "-";
-    return ((_a = CATEGORIES.find((c) => c.value === category)) == null ? void 0 : _a.label) || category;
+    return ((_a = SERVICE_CODES.find((s) => s.value === code)) == null ? void 0 : _a.label) || code;
+  };
+  const formatETA = (rate) => {
+    if (rate.eta_hours_min !== null && rate.eta_hours_min !== void 0 && rate.eta_hours_max !== null && rate.eta_hours_max !== void 0) {
+      return `${rate.eta_hours_min}-${rate.eta_hours_max} ชม.`;
+    }
+    if (rate.eta_days_min !== null && rate.eta_days_min !== void 0 && rate.eta_days_max !== null && rate.eta_days_max !== void 0) {
+      return `${rate.eta_days_min}-${rate.eta_days_max} วัน`;
+    }
+    return "-";
   };
   return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
     /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-y-4", children: [
       /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center justify-between gap-x-4", children: [
-        /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex gap-x-4 flex-1", children: [
-          /* @__PURE__ */ jsxRuntime.jsx(
-            ui.Input,
-            {
-              type: "search",
-              placeholder: "ค้นหาชื่อวัสดุ...",
-              value: searchTerm,
-              onChange: (e) => setSearchTerm(e.target.value),
-              className: "max-w-md"
-            }
-          ),
-          /* @__PURE__ */ jsxRuntime.jsxs(ui.Select, { value: categoryFilter, onValueChange: setCategoryFilter, children: [
-            /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Trigger, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Value, { placeholder: "หมวดหมู่" }) }),
-            /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Content, { children: CATEGORIES.map((category) => /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Item, { value: category.value, children: category.label }, category.value)) })
+        /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex gap-x-4 items-end", children: [
+          /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-y-1", children: [
+            /* @__PURE__ */ jsxRuntime.jsx("label", { className: "text-sm font-medium text-ui-fg-subtle", children: "ประเภทขนส่ง" }),
+            /* @__PURE__ */ jsxRuntime.jsxs(ui.Select, { value: carrierFilter, onValueChange: setCarrierFilter, children: [
+              /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Trigger, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Value, { placeholder: "ทั้งหมด" }) }),
+              /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Content, { children: CARRIER_TYPES.map((type) => /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Item, { value: type.value, children: type.label }, type.value)) })
+            ] })
+          ] }),
+          /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-y-1", children: [
+            /* @__PURE__ */ jsxRuntime.jsx("label", { className: "text-sm font-medium text-ui-fg-subtle", children: "บริการจัดส่ง" }),
+            /* @__PURE__ */ jsxRuntime.jsxs(ui.Select, { value: serviceFilter, onValueChange: setServiceFilter, children: [
+              /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Trigger, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Value, { placeholder: "ทั้งหมด" }) }),
+              /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Content, { children: SERVICE_CODES.map((service) => /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Item, { value: service.value, children: service.label }, service.value)) })
+            ] })
           ] })
         ] }),
         /* @__PURE__ */ jsxRuntime.jsxs(ui.Button, { onClick: handleCreateNew, children: [
           /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Plus, {}),
-          "สร้างรายการใหม่"
+          "สร้างอัตราใหม่"
         ] })
       ] }),
       /* @__PURE__ */ jsxRuntime.jsxs(ui.Table, { children: [
         /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Header, { children: /* @__PURE__ */ jsxRuntime.jsxs(ui.Table.Row, { children: [
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Table.HeaderCell, { children: "ชื่อ" }),
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Table.HeaderCell, { children: "หมวดหมู่" }),
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Table.HeaderCell, { children: "หน่วย" }),
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Table.HeaderCell, { children: "ต้นทุนต่อหน่วย" }),
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Table.HeaderCell, { children: "คำอธิบาย" }),
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Table.HeaderCell, { children: "ประเภทขนส่ง" }),
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Table.HeaderCell, { children: "บริการ" }),
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Table.HeaderCell, { children: "น้ำหนัก ≤ (kg)" }),
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Table.HeaderCell, { children: "ราคา (THB)" }),
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Table.HeaderCell, { children: "ETA" }),
           /* @__PURE__ */ jsxRuntime.jsx(ui.Table.HeaderCell, { children: "สถานะ" }),
           /* @__PURE__ */ jsxRuntime.jsx(ui.Table.HeaderCell, { className: "text-right", children: "การจัดการ" })
         ] }) }),
-        /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Body, { children: isLoading ? /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Row, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Cell, { className: "text-center", children: "กำลังโหลด..." }) }) : filteredMaterialCosts.length === 0 ? /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Row, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Cell, { className: "text-center", children: "ไม่พบข้อมูลต้นทุนวัสดุ" }) }) : filteredMaterialCosts.map((materialCost) => /* @__PURE__ */ jsxRuntime.jsxs(ui.Table.Row, { children: [
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Cell, { children: materialCost.name }),
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Cell, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Badge, { color: "blue", children: getCategoryLabel(materialCost.category) }) }),
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Cell, { children: materialCost.unit }),
+        /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Body, { children: isLoading ? /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Row, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Cell, { className: "text-center", children: "กำลังโหลด..." }) }) : filteredRates.length === 0 ? /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Row, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Cell, { className: "text-center", children: "ไม่พบข้อมูลอัตราค่าขนส่ง" }) }) : filteredRates.map((rate) => /* @__PURE__ */ jsxRuntime.jsxs(ui.Table.Row, { children: [
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Cell, { children: getCarrierLabel(rate.carrier_type) }),
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Cell, { children: getServiceLabel(rate.service_code) }),
           /* @__PURE__ */ jsxRuntime.jsxs(ui.Table.Cell, { children: [
-            materialCost.cost_per_unit.toFixed(2),
-            " ",
-            materialCost.currency
+            "≤ ",
+            rate.max_weight_kg,
+            " kg"
           ] }),
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Cell, { className: "max-w-xs truncate", children: materialCost.description || "-" }),
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Cell, { children: /* @__PURE__ */ jsxRuntime.jsx(
-            ui.Badge,
-            {
-              color: materialCost.active ? "green" : "grey",
-              className: "cursor-pointer",
-              onClick: () => handleToggleActive(materialCost),
-              children: materialCost.active ? "เปิดใช้งาน" : "ปิดใช้งาน"
-            }
-          ) }),
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Cell, { children: rate.price.toFixed(2) }),
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Cell, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Badge, { color: "blue", children: formatETA(rate) }) }),
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Cell, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Badge, { color: rate.active ? "green" : "grey", children: rate.active ? "เปิดใช้งาน" : "ปิดใช้งาน" }) }),
           /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Cell, { className: "text-right", children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center justify-end gap-x-2", children: [
             /* @__PURE__ */ jsxRuntime.jsx(
               ui.Button,
               {
                 variant: "transparent",
                 size: "small",
-                onClick: () => handleEdit(materialCost),
+                onClick: () => handleEdit(rate),
                 children: /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Edit, {})
               }
             ),
@@ -1818,38 +2327,25 @@ const MaterialCostsTable = () => {
               {
                 variant: "transparent",
                 size: "small",
-                onClick: () => openDeletePrompt(materialCost.id, materialCost.name),
+                onClick: () => setDeleteRateId(rate.id),
                 children: /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Trash, {})
               }
             )
           ] }) })
-        ] }, materialCost.id)) })
+        ] }, rate.id)) })
       ] })
     ] }),
-    isModalOpen && /* @__PURE__ */ jsxRuntime.jsx(
-      MaterialCostModal,
-      {
-        materialCost: editingMaterialCost,
-        onClose: handleModalClose
-      }
-    ),
+    isModalOpen && /* @__PURE__ */ jsxRuntime.jsx(ShippingRateModal, { rate: editingRate, onClose: handleModalClose }),
     /* @__PURE__ */ jsxRuntime.jsx(
       ui.Prompt,
       {
         variant: "confirmation",
-        open: !!deleteMaterialCostId,
-        onOpenChange: () => {
-          setDeleteMaterialCostId(null);
-          setDeleteMaterialCostName("");
-        },
+        open: !!deleteRateId,
+        onOpenChange: () => setDeleteRateId(null),
         children: /* @__PURE__ */ jsxRuntime.jsxs(ui.Prompt.Content, { children: [
           /* @__PURE__ */ jsxRuntime.jsxs(ui.Prompt.Header, { children: [
-            /* @__PURE__ */ jsxRuntime.jsx(ui.Prompt.Title, { children: "ลบรายการต้นทุนวัสดุ" }),
-            /* @__PURE__ */ jsxRuntime.jsxs(ui.Prompt.Description, { children: [
-              'คุณต้องการลบวัสดุ "',
-              deleteMaterialCostName,
-              '" ใช่หรือไม่? การดำเนินการนี้ไม่สามารถย้อนกลับได้'
-            ] })
+            /* @__PURE__ */ jsxRuntime.jsx(ui.Prompt.Title, { children: "ลบอัตราค่าขนส่ง" }),
+            /* @__PURE__ */ jsxRuntime.jsx(ui.Prompt.Description, { children: "คุณต้องการลบอัตราค่าขนส่งนี้ใช่หรือไม่? การดำเนินการนี้ไม่สามารถย้อนกลับได้" })
           ] }),
           /* @__PURE__ */ jsxRuntime.jsxs(ui.Prompt.Footer, { children: [
             /* @__PURE__ */ jsxRuntime.jsx(ui.Prompt.Cancel, { children: "ยกเลิก" }),
@@ -1860,59 +2356,26 @@ const MaterialCostsTable = () => {
     )
   ] });
 };
-const MaterialCostsPage = () => {
-  return /* @__PURE__ */ jsxRuntime.jsx(ui.Container, { children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-y-4", children: [
-    /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex items-center justify-between", children: /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { level: "h1", children: "ต้นทุนวัสดุ" }) }),
-    /* @__PURE__ */ jsxRuntime.jsx(MaterialCostsTable, {})
-  ] }) });
-};
-const config$1 = adminSdk.defineRouteConfig({
-  icon: icons.CurrencyDollarSolid,
-  label: "ต้นทุนวัสดุ"
-});
-const CARRIER_TYPES$1 = [
-  { value: "COMPANY_FLEET", label: "บริษัทรถส่งของ (Messenger)" },
-  { value: "COMPANY_TRUCK", label: "รถบริษัท (Same Day)" },
-  { value: "PRIVATE_CARRIER", label: "ขนส่งเอกชน (EMS/Express)" }
-];
-const SERVICE_CODES$1 = [
-  { value: "MESSENGER_3H", label: "ส่งด่วน 3 ชม.", usesHours: true },
-  { value: "SAME_DAY", label: "ส่งด่วนภายในวัน", usesHours: true },
-  { value: "STANDARD_3_5D", label: "EMS 3-5 วัน", usesHours: false },
-  { value: "EXPRESS_1_2D", label: "Express 1-2 วัน", usesHours: false }
-];
-const ShippingRateModal = ({ rate, onClose }) => {
+const CompanyTruckBaseRateModal = ({
+  rate,
+  onClose
+}) => {
   const [formData, setFormData] = react.useState({
-    carrier_type: "COMPANY_FLEET",
-    service_code: "MESSENGER_3H",
-    max_weight_kg: "",
+    min_distance_km: "0",
+    max_distance_km: "",
     price: "",
-    currency: "THB",
     priority: "0",
-    eta_hours_min: "",
-    eta_hours_max: "",
-    eta_days_min: "",
-    eta_days_max: "",
     active: true
   });
   const [isSaving, setIsSaving] = react.useState(false);
-  const selectedService = SERVICE_CODES$1.find((s) => s.value === formData.service_code);
-  const usesHours = (selectedService == null ? void 0 : selectedService.usesHours) ?? false;
-  const isMessenger = formData.carrier_type === "COMPANY_FLEET" && formData.service_code === "MESSENGER_3H";
   react.useEffect(() => {
-    var _a, _b, _c, _d;
+    var _a, _b;
     if (rate) {
       setFormData({
-        carrier_type: rate.carrier_type,
-        service_code: rate.service_code,
-        max_weight_kg: rate.max_weight_kg.toString(),
+        min_distance_km: ((_a = rate.min_distance_km) == null ? void 0 : _a.toString()) ?? "0",
+        max_distance_km: ((_b = rate.max_distance_km) == null ? void 0 : _b.toString()) || "",
         price: rate.price.toString(),
-        currency: rate.currency,
         priority: (rate.priority ?? 0).toString(),
-        eta_hours_min: ((_a = rate.eta_hours_min) == null ? void 0 : _a.toString()) || "",
-        eta_hours_max: ((_b = rate.eta_hours_max) == null ? void 0 : _b.toString()) || "",
-        eta_days_min: ((_c = rate.eta_days_min) == null ? void 0 : _c.toString()) || "",
-        eta_days_max: ((_d = rate.eta_days_max) == null ? void 0 : _d.toString()) || "",
         active: rate.active
       });
     }
@@ -1920,11 +2383,16 @@ const ShippingRateModal = ({ rate, onClose }) => {
   const handleSubmit = async (e) => {
     e.preventDefault();
     const errors = [];
-    const maxWeight = parseFloat(formData.max_weight_kg);
+    const minDistance = parseFloat(formData.min_distance_km || "0");
+    const hasMaxDistance = formData.max_distance_km !== "";
+    const maxDistance = hasMaxDistance ? parseFloat(formData.max_distance_km) : void 0;
     const price = parseFloat(formData.price);
-    const priority = parseInt(formData.priority);
-    if (isNaN(maxWeight) || maxWeight <= 0) {
-      errors.push("น้ำหนักสูงสุดต้องเป็นตัวเลขมากกว่า 0");
+    const priority = parseInt(formData.priority || "0", 10);
+    if (isNaN(minDistance) || minDistance < 0) {
+      errors.push("ระยะทางเริ่มต้นต้องไม่ติดลบ");
+    }
+    if (hasMaxDistance && (maxDistance === void 0 || isNaN(maxDistance) || (maxDistance ?? 0) < minDistance)) {
+      errors.push("ระยะทางสูงสุดต้องมากกว่าหรือเท่ากับระยะทางเริ่มต้น");
     }
     if (isNaN(price) || price < 0) {
       errors.push("ราคาต้องเป็นตัวเลขไม่ติดลบ");
@@ -1932,27 +2400,6 @@ const ShippingRateModal = ({ rate, onClose }) => {
     if (isNaN(priority)) {
       errors.push("ลำดับความสำคัญต้องเป็นตัวเลข");
     }
-    let etaHoursMin;
-    let etaHoursMax;
-    let etaDaysMin;
-    let etaDaysMax;
-    if (usesHours) {
-      etaHoursMin = formData.eta_hours_min ? parseFloat(formData.eta_hours_min) : void 0;
-      etaHoursMax = formData.eta_hours_max ? parseFloat(formData.eta_hours_max) : void 0;
-      if (etaHoursMin === void 0 || etaHoursMax === void 0) {
-        errors.push("กรุณากรอก ETA เป็นชั่วโมงให้ครบ");
-      } else if (etaHoursMin > etaHoursMax) {
-        errors.push("ETA ชั่วโมงต่ำสุดต้องน้อยกว่าหรือเท่ากับสูงสุด");
-      }
-    } else {
-      etaDaysMin = formData.eta_days_min ? parseFloat(formData.eta_days_min) : void 0;
-      etaDaysMax = formData.eta_days_max ? parseFloat(formData.eta_days_max) : void 0;
-      if (etaDaysMin === void 0 || etaDaysMax === void 0) {
-        errors.push("กรุณากรอก ETA เป็นวันให้ครบ");
-      } else if (etaDaysMin > etaDaysMax) {
-        errors.push("ETA วันต่ำสุดต้องน้อยกว่าหรือเท่ากับสูงสุด");
-      }
-    }
     if (errors.length > 0) {
       ui.toast.error("ข้อมูลไม่ถูกต้อง", {
         description: errors.join(", ")
@@ -1962,22 +2409,17 @@ const ShippingRateModal = ({ rate, onClose }) => {
     setIsSaving(true);
     try {
       const payload = {
-        carrier_type: formData.carrier_type,
-        service_code: formData.service_code,
-        max_weight_kg: maxWeight,
+        carrier_type: "COMPANY_TRUCK",
+        carrier: "COMPANY_TRUCK",
+        service_code: "SAME_DAY",
+        min_distance_km: minDistance,
+        max_distance_km: maxDistance === void 0 || isNaN(maxDistance) ? null : maxDistance,
         price,
-        currency: formData.currency,
+        currency: "THB",
         priority,
         active: formData.active
       };
-      if (usesHours) {
-        payload.eta_hours_min = etaHoursMin;
-        payload.eta_hours_max = etaHoursMax;
-      } else {
-        payload.eta_days_min = etaDaysMin;
-        payload.eta_days_max = etaDaysMax;
-      }
-      const url = rate ? `/admin/shipping-rates/${rate.id}` : "/admin/shipping-rates";
+      const url = rate ? `/admin/base-shipping-prices/${rate.id}` : "/admin/base-shipping-prices";
       const method = rate ? "PUT" : "POST";
       const response = await fetch(url, {
         method,
@@ -1985,15 +2427,14 @@ const ShippingRateModal = ({ rate, onClose }) => {
         credentials: "include",
         body: JSON.stringify(payload)
       });
-      if (response.ok) {
-        ui.toast.success("สำเร็จ", {
-          description: rate ? "แก้ไขอัตราค่าขนส่งแล้ว" : "สร้างอัตราค่าขนส่งใหม่แล้ว"
-        });
-        onClose();
-      } else {
-        const error = await response.json();
-        throw new Error(error.message || "Failed to save");
+      if (!response.ok) {
+        const error = await response.json().catch(() => ({}));
+        throw new Error(error.message || "ไม่สามารถบันทึกข้อมูลได้");
       }
+      ui.toast.success("สำเร็จ", {
+        description: rate ? "แก้ไขฐานราคาตามระยะทางแล้ว" : "สร้างฐานราคาตามระยะทางใหม่แล้ว"
+      });
+      onClose();
     } catch (error) {
       ui.toast.error("ข้อผิดพลาด", {
         description: error instanceof Error ? error.message : "ไม่สามารถบันทึกข้อมูลได้"
@@ -2003,85 +2444,56 @@ const ShippingRateModal = ({ rate, onClose }) => {
     }
   };
   return /* @__PURE__ */ jsxRuntime.jsx(ui.Drawer, { open: true, onOpenChange: (open) => !open && onClose(), children: /* @__PURE__ */ jsxRuntime.jsxs(ui.Drawer.Content, { children: [
-    /* @__PURE__ */ jsxRuntime.jsx(ui.Drawer.Header, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Drawer.Title, { children: rate ? "แก้ไขอัตราค่าขนส่ง" : "สร้างอัตราค่าขนส่งใหม่" }) }),
+    /* @__PURE__ */ jsxRuntime.jsx(ui.Drawer.Header, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Drawer.Title, { children: rate ? "แก้ไขฐานราคาตามระยะทาง (รถบริษัท)" : "สร้างฐานราคาตามระยะทาง (รถบริษัท)" }) }),
     /* @__PURE__ */ jsxRuntime.jsx(ui.Drawer.Body, { children: /* @__PURE__ */ jsxRuntime.jsxs("form", { onSubmit: handleSubmit, className: "flex flex-col gap-y-4", children: [
-      /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
-        /* @__PURE__ */ jsxRuntime.jsx(ui.Label, { htmlFor: "carrier", children: "ประเภทขนส่ง *" }),
-        /* @__PURE__ */ jsxRuntime.jsxs(
-          ui.Select,
-          {
-            value: formData.carrier_type,
-            onValueChange: (value) => setFormData({ ...formData, carrier_type: value }),
-            children: [
-              /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Trigger, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Value, { placeholder: "เลือกประเภทขนส่ง" }) }),
-              /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Content, { children: CARRIER_TYPES$1.map((carrier) => /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Item, { value: carrier.value, children: carrier.label }, carrier.value)) })
-            ]
-          }
-        )
-      ] }),
-      /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
-        /* @__PURE__ */ jsxRuntime.jsx(ui.Label, { htmlFor: "service", children: "บริการจัดส่ง *" }),
-        /* @__PURE__ */ jsxRuntime.jsxs(
-          ui.Select,
-          {
-            value: formData.service_code,
-            onValueChange: (value) => setFormData({
-              ...formData,
-              service_code: value,
-              eta_hours_min: "",
-              eta_hours_max: "",
-              eta_days_min: "",
-              eta_days_max: ""
-            }),
-            children: [
-              /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Trigger, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Value, { placeholder: "เลือกบริการ" }) }),
-              /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Content, { children: SERVICE_CODES$1.map((service) => /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Item, { value: service.value, children: service.label }, service.value)) })
-            ]
-          }
-        )
-      ] }),
-      isMessenger && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "rounded-lg border border-ui-border-base bg-ui-bg-subtle p-3 text-sm space-y-1", children: [
-        /* @__PURE__ */ jsxRuntime.jsx("div", { className: "font-semibold text-ui-fg-base", children: "ฐานราคาตามระยะทาง (Messenger)" }),
-        /* @__PURE__ */ jsxRuntime.jsx("div", { className: "text-ui-fg-subtle", children: "ตั้งช่วงราคาตามระยะทาง เช่น 0-5, 5-20, 20-30, 30+ กม. สำหรับบริการส่งด่วน 3 ชม." }),
-        /* @__PURE__ */ jsxRuntime.jsx("div", { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { asChild: true, size: "small", variant: "secondary", children: /* @__PURE__ */ jsxRuntime.jsxs("a", { href: "/base-pricing", target: "_blank", rel: "noreferrer", children: [
-          "จัดการฐานราคา",
-          /* @__PURE__ */ jsxRuntime.jsx(lucideReact.ExternalLink, { className: "ml-1 h-4 w-4" })
-        ] }) }) })
-      ] }),
       /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "grid grid-cols-2 gap-x-4", children: [
         /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Label, { htmlFor: "maxWeight", children: "น้ำหนักสูงสุด (kg) *" }),
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Label, { htmlFor: "min_distance_km", children: "ระยะทางเริ่มต้น (กม.) *" }),
           /* @__PURE__ */ jsxRuntime.jsx(
             ui.Input,
             {
-              id: "maxWeight",
+              id: "min_distance_km",
               type: "number",
-              step: "0.1",
               min: "0",
-              value: formData.max_weight_kg,
-              onChange: (e) => setFormData({ ...formData, max_weight_kg: e.target.value }),
-              placeholder: "เช่น 3",
+              step: "0.1",
+              value: formData.min_distance_km,
+              onChange: (e) => setFormData({ ...formData, min_distance_km: e.target.value }),
               required: true
             }
           )
         ] }),
         /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Label, { htmlFor: "price", children: "ราคา (THB) *" }),
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Label, { htmlFor: "max_distance_km", children: "ระยะทางสูงสุด (กม.)" }),
           /* @__PURE__ */ jsxRuntime.jsx(
             ui.Input,
             {
-              id: "price",
+              id: "max_distance_km",
               type: "number",
-              step: "0.01",
               min: "0",
-              value: formData.price,
-              onChange: (e) => setFormData({ ...formData, price: e.target.value }),
-              placeholder: "เช่น 80",
-              required: true
+              step: "0.1",
+              placeholder: "ปล่อยว่างหากไม่มีที่สิ้นสุด",
+              value: formData.max_distance_km,
+              onChange: (e) => setFormData({ ...formData, max_distance_km: e.target.value })
             }
-          )
+          ),
+          /* @__PURE__ */ jsxRuntime.jsx("p", { className: "text-xs text-ui-fg-subtle mt-1", children: "เว้นว่างเพื่อกำหนดช่วงราคาแบบ 30+ กม." })
         ] })
       ] }),
+      /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
+        /* @__PURE__ */ jsxRuntime.jsx(ui.Label, { htmlFor: "price", children: "ราคา (THB) *" }),
+        /* @__PURE__ */ jsxRuntime.jsx(
+          ui.Input,
+          {
+            id: "price",
+            type: "number",
+            min: "0",
+            step: "0.01",
+            value: formData.price,
+            onChange: (e) => setFormData({ ...formData, price: e.target.value }),
+            required: true
+          }
+        )
+      ] }),
       /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
         /* @__PURE__ */ jsxRuntime.jsx(ui.Label, { htmlFor: "priority", children: "ลำดับความสำคัญ" }),
         /* @__PURE__ */ jsxRuntime.jsx(
@@ -2094,56 +2506,7 @@ const ShippingRateModal = ({ rate, onClose }) => {
             placeholder: "0"
           }
         ),
-        /* @__PURE__ */ jsxRuntime.jsx("p", { className: "text-xs text-ui-fg-subtle mt-1", children: "ตัวเลขสูงกว่าจะถูกเสนอให้เลือกก่อน (ค่าเริ่มต้น 0)" })
-      ] }),
-      /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
-        /* @__PURE__ */ jsxRuntime.jsxs(ui.Label, { children: [
-          usesHours ? "ETA (ชั่วโมง)" : "ETA (วัน)",
-          " *"
-        ] }),
-        /* @__PURE__ */ jsxRuntime.jsx("div", { className: "grid grid-cols-2 gap-x-4 mt-2", children: usesHours ? /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
-          /* @__PURE__ */ jsxRuntime.jsx(
-            ui.Input,
-            {
-              type: "number",
-              placeholder: "ต่ำสุด",
-              value: formData.eta_hours_min,
-              onChange: (e) => setFormData({ ...formData, eta_hours_min: e.target.value }),
-              required: true
-            }
-          ),
-          /* @__PURE__ */ jsxRuntime.jsx(
-            ui.Input,
-            {
-              type: "number",
-              placeholder: "สูงสุด",
-              value: formData.eta_hours_max,
-              onChange: (e) => setFormData({ ...formData, eta_hours_max: e.target.value }),
-              required: true
-            }
-          )
-        ] }) : /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
-          /* @__PURE__ */ jsxRuntime.jsx(
-            ui.Input,
-            {
-              type: "number",
-              placeholder: "ต่ำสุด",
-              value: formData.eta_days_min,
-              onChange: (e) => setFormData({ ...formData, eta_days_min: e.target.value }),
-              required: true
-            }
-          ),
-          /* @__PURE__ */ jsxRuntime.jsx(
-            ui.Input,
-            {
-              type: "number",
-              placeholder: "สูงสุด",
-              value: formData.eta_days_max,
-              onChange: (e) => setFormData({ ...formData, eta_days_max: e.target.value }),
-              required: true
-            }
-          )
-        ] }) })
+        /* @__PURE__ */ jsxRuntime.jsx("p", { className: "text-xs text-ui-fg-subtle mt-1", children: "ใช้สำหรับจัดลำดับเมื่อมีช่วงราคาทับกัน (ค่าเริ่มต้น 0)" })
       ] }),
       /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-x-2", children: [
         /* @__PURE__ */ jsxRuntime.jsx(
@@ -2157,195 +2520,163 @@ const ShippingRateModal = ({ rate, onClose }) => {
         /* @__PURE__ */ jsxRuntime.jsx(ui.Label, { htmlFor: "active", children: "เปิดใช้งาน" })
       ] }),
       /* @__PURE__ */ jsxRuntime.jsxs(ui.Drawer.Footer, { children: [
-        /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { type: "button", variant: "secondary", onClick: onClose, disabled: isSaving, children: "ยกเลิก" }),
+        /* @__PURE__ */ jsxRuntime.jsx(
+          ui.Button,
+          {
+            type: "button",
+            variant: "secondary",
+            onClick: onClose,
+            disabled: isSaving,
+            children: "ยกเลิก"
+          }
+        ),
         /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { type: "submit", disabled: isSaving, children: isSaving ? "กำลังบันทึก..." : "บันทึก" })
       ] })
     ] }) })
   ] }) });
 };
-const CARRIER_TYPES = [
-  { value: "ALL", label: "ทั้งหมด" },
-  { value: "COMPANY_FLEET", label: "บริษัทรถส่งของ (Messenger)" },
-  { value: "COMPANY_TRUCK", label: "รถบริษัท (Same Day)" },
-  { value: "PRIVATE_CARRIER", label: "ขนส่งเอกชน (EMS/Express)" }
-];
-const SERVICE_CODES = [
-  { value: "ALL", label: "ทั้งหมด" },
-  { value: "MESSENGER_3H", label: "ส่งด่วน 3 ชม." },
-  { value: "SAME_DAY", label: "ส่งด่วนภายในวัน" },
-  { value: "STANDARD_3_5D", label: "EMS 3-5 วัน" },
-  { value: "EXPRESS_1_2D", label: "Express 1-2 วัน" }
-];
-const ShippingRatesTable = () => {
+const CompanyTruckBasePricingTable = () => {
   const [rates, setRates] = react.useState([]);
-  const [filteredRates, setFilteredRates] = react.useState([]);
-  const [carrierFilter, setCarrierFilter] = react.useState("ALL");
-  const [serviceFilter, setServiceFilter] = react.useState("ALL");
+  const [isLoading, setIsLoading] = react.useState(false);
   const [isModalOpen, setIsModalOpen] = react.useState(false);
   const [editingRate, setEditingRate] = react.useState(null);
-  const [isLoading, setIsLoading] = react.useState(false);
-  const [deleteRateId, setDeleteRateId] = react.useState(null);
+  const [deleteId, setDeleteId] = react.useState(null);
   react.useEffect(() => {
     fetchRates();
   }, []);
-  react.useEffect(() => {
-    let filtered = rates;
-    if (carrierFilter !== "ALL") {
-      filtered = filtered.filter((rate) => rate.carrier_type === carrierFilter);
-    }
-    if (serviceFilter !== "ALL") {
-      filtered = filtered.filter((rate) => rate.service_code === serviceFilter);
-    }
-    setFilteredRates(filtered);
-  }, [carrierFilter, serviceFilter, rates]);
+  const orderedRates = react.useMemo(() => {
+    return [...rates].sort((a, b) => {
+      if (a.min_distance_km !== b.min_distance_km) {
+        return a.min_distance_km - b.min_distance_km;
+      }
+      const aMax = a.max_distance_km ?? Number.POSITIVE_INFINITY;
+      const bMax = b.max_distance_km ?? Number.POSITIVE_INFINITY;
+      return aMax - bMax;
+    });
+  }, [rates]);
   const fetchRates = async () => {
     setIsLoading(true);
     try {
-      const response = await fetch("/admin/shipping-rates", {
-        credentials: "include"
-      });
+      const response = await fetch(
+        "/admin/base-shipping-prices?carrier_type=COMPANY_TRUCK&service_code=SAME_DAY",
+        {
+          credentials: "include"
+        }
+      );
+      if (!response.ok) {
+        throw new Error("failed_to_load_base_rates");
+      }
       const data = await response.json();
-      setRates(data.rates || []);
+      setRates(data.base_rates || []);
     } catch (error) {
       ui.toast.error("ข้อผิดพลาด", {
-        description: "ไม่สามารถโหลดข้อมูลอัตราค่าขนส่งได้"
+        description: "ไม่สามารถโหลดฐานราคาตามระยะทางได้"
       });
     } finally {
       setIsLoading(false);
     }
   };
   const handleDelete = async () => {
-    if (!deleteRateId) return;
+    if (!deleteId) return;
     try {
-      const response = await fetch(`/admin/shipping-rates/${deleteRateId}`, {
-        method: "DELETE",
-        credentials: "include"
-      });
-      if (response.ok) {
-        ui.toast.success("สำเร็จ", {
-          description: "ลบอัตราค่าขนส่งแล้ว"
-        });
-        fetchRates();
-      } else {
-        throw new Error("Failed to delete");
+      const response = await fetch(
+        `/admin/base-shipping-prices/${deleteId}`,
+        {
+          method: "DELETE",
+          credentials: "include"
+        }
+      );
+      if (!response.ok) {
+        throw new Error("failed_to_delete");
       }
+      ui.toast.success("สำเร็จ", {
+        description: "ลบฐานราคาสำเร็จ"
+      });
+      fetchRates();
     } catch (error) {
       ui.toast.error("ข้อผิดพลาด", {
-        description: "ไม่สามารถลบอัตราค่าขนส่งได้"
+        description: "ไม่สามารถลบฐานราคาได้"
       });
     } finally {
-      setDeleteRateId(null);
+      setDeleteId(null);
     }
   };
-  const handleEdit = (rate) => {
-    setEditingRate(rate);
-    setIsModalOpen(true);
-  };
-  const handleCreateNew = () => {
-    setEditingRate(null);
-    setIsModalOpen(true);
-  };
   const handleModalClose = () => {
     setIsModalOpen(false);
     setEditingRate(null);
     fetchRates();
   };
-  const getCarrierLabel = (type) => {
-    var _a;
-    return ((_a = CARRIER_TYPES.find((c) => c.value === type)) == null ? void 0 : _a.label) || type;
-  };
-  const getServiceLabel = (code) => {
-    var _a;
-    return ((_a = SERVICE_CODES.find((s) => s.value === code)) == null ? void 0 : _a.label) || code;
-  };
-  const formatETA = (rate) => {
-    if (rate.eta_hours_min !== null && rate.eta_hours_min !== void 0 && rate.eta_hours_max !== null && rate.eta_hours_max !== void 0) {
-      return `${rate.eta_hours_min}-${rate.eta_hours_max} ชม.`;
-    }
-    if (rate.eta_days_min !== null && rate.eta_days_min !== void 0 && rate.eta_days_max !== null && rate.eta_days_max !== void 0) {
-      return `${rate.eta_days_min}-${rate.eta_days_max} วัน`;
+  const formatDistanceRange = (rate) => {
+    const min = rate.min_distance_km ?? 0;
+    const max = rate.max_distance_km;
+    if (max === void 0 || max === null) {
+      return `${min}+ กม.`;
     }
-    return "-";
+    return `${min}-${max} กม.`;
   };
   return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
-    /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-y-4", children: [
-      /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center justify-between gap-x-4", children: [
-        /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex gap-x-4 items-end", children: [
-          /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-y-1", children: [
-            /* @__PURE__ */ jsxRuntime.jsx("label", { className: "text-sm font-medium text-ui-fg-subtle", children: "ประเภทขนส่ง" }),
-            /* @__PURE__ */ jsxRuntime.jsxs(ui.Select, { value: carrierFilter, onValueChange: setCarrierFilter, children: [
-              /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Trigger, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Value, { placeholder: "ทั้งหมด" }) }),
-              /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Content, { children: CARRIER_TYPES.map((type) => /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Item, { value: type.value, children: type.label }, type.value)) })
-            ] })
-          ] }),
-          /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-y-1", children: [
-            /* @__PURE__ */ jsxRuntime.jsx("label", { className: "text-sm font-medium text-ui-fg-subtle", children: "บริการจัดส่ง" }),
-            /* @__PURE__ */ jsxRuntime.jsxs(ui.Select, { value: serviceFilter, onValueChange: setServiceFilter, children: [
-              /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Trigger, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Value, { placeholder: "ทั้งหมด" }) }),
-              /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Content, { children: SERVICE_CODES.map((service) => /* @__PURE__ */ jsxRuntime.jsx(ui.Select.Item, { value: service.value, children: service.label }, service.value)) })
-            ] })
-          ] })
-        ] }),
-        /* @__PURE__ */ jsxRuntime.jsxs(ui.Button, { onClick: handleCreateNew, children: [
-          /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Plus, {}),
-          "สร้างอัตราใหม่"
-        ] })
+    /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center justify-between gap-x-4", children: [
+      /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
+        /* @__PURE__ */ jsxRuntime.jsx("p", { className: "text-sm font-semibold", children: "ฐานราคาตามระยะทาง (รถบริษัท - Same Day)" }),
+        /* @__PURE__ */ jsxRuntime.jsx("p", { className: "text-ui-fg-subtle text-sm", children: "กำหนดราคาเริ่มต้นตามระยะทาง เช่น 0-10, 10-30, 30-50, 50+ กม." })
       ] }),
-      /* @__PURE__ */ jsxRuntime.jsxs(ui.Table, { children: [
-        /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Header, { children: /* @__PURE__ */ jsxRuntime.jsxs(ui.Table.Row, { children: [
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Table.HeaderCell, { children: "ประเภทขนส่ง" }),
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Table.HeaderCell, { children: "บริการ" }),
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Table.HeaderCell, { children: "น้ำหนัก ≤ (kg)" }),
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Table.HeaderCell, { children: "ราคา (THB)" }),
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Table.HeaderCell, { children: "ETA" }),
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Table.HeaderCell, { children: "สถานะ" }),
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Table.HeaderCell, { className: "text-right", children: "การจัดการ" })
-        ] }) }),
-        /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Body, { children: isLoading ? /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Row, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Cell, { className: "text-center", children: "กำลังโหลด..." }) }) : filteredRates.length === 0 ? /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Row, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Cell, { className: "text-center", children: "ไม่พบข้อมูลอัตราค่าขนส่ง" }) }) : filteredRates.map((rate) => /* @__PURE__ */ jsxRuntime.jsxs(ui.Table.Row, { children: [
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Cell, { children: getCarrierLabel(rate.carrier_type) }),
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Cell, { children: getServiceLabel(rate.service_code) }),
-          /* @__PURE__ */ jsxRuntime.jsxs(ui.Table.Cell, { children: [
-            "≤ ",
-            rate.max_weight_kg,
-            " kg"
-          ] }),
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Cell, { children: rate.price.toFixed(2) }),
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Cell, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Badge, { color: "blue", children: formatETA(rate) }) }),
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Cell, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Badge, { color: rate.active ? "green" : "grey", children: rate.active ? "เปิดใช้งาน" : "ปิดใช้งาน" }) }),
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Cell, { className: "text-right", children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center justify-end gap-x-2", children: [
-            /* @__PURE__ */ jsxRuntime.jsx(
-              ui.Button,
-              {
-                variant: "transparent",
-                size: "small",
-                onClick: () => handleEdit(rate),
-                children: /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Edit, {})
-              }
-            ),
-            /* @__PURE__ */ jsxRuntime.jsx(
-              ui.Button,
-              {
-                variant: "transparent",
-                size: "small",
-                onClick: () => setDeleteRateId(rate.id),
-                children: /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Trash, {})
-              }
-            )
-          ] }) })
-        ] }, rate.id)) })
+      /* @__PURE__ */ jsxRuntime.jsxs(ui.Button, { onClick: () => setIsModalOpen(true), children: [
+        /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Plus, {}),
+        "เพิ่มช่วงราคา"
       ] })
     ] }),
-    isModalOpen && /* @__PURE__ */ jsxRuntime.jsx(ShippingRateModal, { rate: editingRate, onClose: handleModalClose }),
+    /* @__PURE__ */ jsxRuntime.jsxs(ui.Table, { className: "mt-4", children: [
+      /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Header, { children: /* @__PURE__ */ jsxRuntime.jsxs(ui.Table.Row, { children: [
+        /* @__PURE__ */ jsxRuntime.jsx(ui.Table.HeaderCell, { children: "ช่วงระยะทาง" }),
+        /* @__PURE__ */ jsxRuntime.jsx(ui.Table.HeaderCell, { children: "ราคา (THB)" }),
+        /* @__PURE__ */ jsxRuntime.jsx(ui.Table.HeaderCell, { children: "ลำดับ" }),
+        /* @__PURE__ */ jsxRuntime.jsx(ui.Table.HeaderCell, { children: "สถานะ" }),
+        /* @__PURE__ */ jsxRuntime.jsx(ui.Table.HeaderCell, { className: "text-right", children: "การจัดการ" })
+      ] }) }),
+      /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Body, { children: isLoading ? /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Row, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Cell, { colSpan: 5, className: "text-center", children: "กำลังโหลด..." }) }) : orderedRates.length === 0 ? /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Row, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Cell, { colSpan: 5, className: "text-center", children: "ยังไม่ได้ตั้งค่าฐานราคาตามระยะทาง (รถบริษัทจะใช้ราคาตามน้ำหนัก)" }) }) : orderedRates.map((rate) => /* @__PURE__ */ jsxRuntime.jsxs(ui.Table.Row, { children: [
+        /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Cell, { children: formatDistanceRange(rate) }),
+        /* @__PURE__ */ jsxRuntime.jsxs(ui.Table.Cell, { children: [
+          "฿",
+          rate.price.toFixed(2)
+        ] }),
+        /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Cell, { children: rate.priority ?? 0 }),
+        /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Cell, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Badge, { color: rate.active ? "green" : "grey", children: rate.active ? "เปิดใช้งาน" : "ปิดใช้งาน" }) }),
+        /* @__PURE__ */ jsxRuntime.jsx(ui.Table.Cell, { className: "text-right", children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center justify-end gap-x-2", children: [
+          /* @__PURE__ */ jsxRuntime.jsx(
+            ui.Button,
+            {
+              variant: "transparent",
+              size: "small",
+              onClick: () => {
+                setEditingRate(rate);
+                setIsModalOpen(true);
+              },
+              children: /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Edit, {})
+            }
+          ),
+          /* @__PURE__ */ jsxRuntime.jsx(
+            ui.Button,
+            {
+              variant: "transparent",
+              size: "small",
+              onClick: () => setDeleteId(rate.id),
+              children: /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Trash, {})
+            }
+          )
+        ] }) })
+      ] }, rate.id)) })
+    ] }),
+    isModalOpen && /* @__PURE__ */ jsxRuntime.jsx(CompanyTruckBaseRateModal, { rate: editingRate, onClose: handleModalClose }),
     /* @__PURE__ */ jsxRuntime.jsx(
       ui.Prompt,
       {
         variant: "confirmation",
-        open: !!deleteRateId,
-        onOpenChange: () => setDeleteRateId(null),
+        open: !!deleteId,
+        onOpenChange: () => setDeleteId(null),
         children: /* @__PURE__ */ jsxRuntime.jsxs(ui.Prompt.Content, { children: [
           /* @__PURE__ */ jsxRuntime.jsxs(ui.Prompt.Header, { children: [
-            /* @__PURE__ */ jsxRuntime.jsx(ui.Prompt.Title, { children: "ลบอัตราค่าขนส่ง" }),
-            /* @__PURE__ */ jsxRuntime.jsx(ui.Prompt.Description, { children: "คุณต้องการลบอัตราค่าขนส่งนี้ใช่หรือไม่? การดำเนินการนี้ไม่สามารถย้อนกลับได้" })
+            /* @__PURE__ */ jsxRuntime.jsx(ui.Prompt.Title, { children: "ลบฐานราคา" }),
+            /* @__PURE__ */ jsxRuntime.jsx(ui.Prompt.Description, { children: "คุณต้องการลบช่วงราคานี้ใช่หรือไม่? การดำเนินการนี้ไม่สามารถย้อนกลับได้" })
           ] }),
           /* @__PURE__ */ jsxRuntime.jsxs(ui.Prompt.Footer, { children: [
             /* @__PURE__ */ jsxRuntime.jsx(ui.Prompt.Cancel, { children: "ยกเลิก" }),
@@ -2361,8 +2692,12 @@ const RatesPage = () => {
     /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex items-center justify-between", children: /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { level: "h1", children: "อัตราค่าขนส่ง" }) }),
     /* @__PURE__ */ jsxRuntime.jsx(ShippingRatesTable, {}),
     /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "border-t pt-4", children: [
-      /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { level: "h2", className: "mb-2 text-lg", children: "ฐานราคาตามระยะทาง (Messenger)" }),
+      /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { level: "h2", className: "mb-2 text-lg", children: "ฐานราคาตามระยะทาง (Messenger 3H)" }),
       /* @__PURE__ */ jsxRuntime.jsx(MessengerBasePricingTable, {})
+    ] }),
+    /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "border-t pt-4", children: [
+      /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { level: "h2", className: "mb-2 text-lg", children: "ฐานราคาตามระยะทาง (รถบริษัท - Same Day)" }),
+      /* @__PURE__ */ jsxRuntime.jsx(CompanyTruckBasePricingTable, {})
     ] })
   ] }) });
 };
@@ -2378,6 +2713,10 @@ const widgetModule = { widgets: [
 ] };
 const routeModule = {
   routes: [
+    {
+      Component: AreasPage,
+      path: "/areas"
+    },
     {
       Component: BasePricingPage,
       path: "/base-pricing"
@@ -2386,10 +2725,6 @@ const routeModule = {
       Component: BoxesPage,
       path: "/boxes"
     },
-    {
-      Component: AreasPage,
-      path: "/areas"
-    },
     {
       Component: MaterialCostsPage,
       path: "/material-costs"
@@ -2402,35 +2737,45 @@ const routeModule = {
 };
 const menuItemModule = {
   menuItems: [
-    {
-      label: config$2.label,
-      icon: config$2.icon,
-      path: "/areas",
-      nested: void 0
-    },
     {
       label: config$4.label,
       icon: config$4.icon,
-      path: "/base-pricing",
-      nested: void 0
+      path: "/areas",
+      nested: void 0,
+      rank: void 0,
+      translationNs: void 0
     },
     {
       label: config$3.label,
       icon: config$3.icon,
+      path: "/base-pricing",
+      nested: void 0,
+      rank: void 0,
+      translationNs: void 0
+    },
+    {
+      label: config$2.label,
+      icon: config$2.icon,
       path: "/boxes",
-      nested: void 0
+      nested: void 0,
+      rank: void 0,
+      translationNs: void 0
     },
     {
       label: config$1.label,
       icon: config$1.icon,
       path: "/material-costs",
-      nested: void 0
+      nested: void 0,
+      rank: void 0,
+      translationNs: void 0
     },
     {
       label: config.label,
       icon: config.icon,
       path: "/rates",
-      nested: void 0
+      nested: void 0,
+      rank: void 0,
+      translationNs: void 0
     }
   ]
 };