diff --git a/src/app/api/inventory/index.ts b/src/app/api/inventory/index.ts index cf807a0..b4bf7c9 100644 --- a/src/app/api/inventory/index.ts +++ b/src/app/api/inventory/index.ts @@ -5,10 +5,10 @@ import "server-only"; export interface InventoryResult { id: number; - code: string; - name: string; - type: string; - qty: number; + itemCode: string; + itemName: string; + itemType: string; + availableQty: number; uomCode: string; uomUdfudesc: string; // germPerSmallestUnit: number; diff --git a/src/components/InventorySearch/InventorySearch.tsx b/src/components/InventorySearch/InventorySearch.tsx index 78c7da3..b0440e2 100644 --- a/src/components/InventorySearch/InventorySearch.tsx +++ b/src/components/InventorySearch/InventorySearch.tsx @@ -35,13 +35,13 @@ const InventorySearch: React.FC = ({ inventories }) => { const searchCriteria: Criterion[] = useMemo( () => [ - { label: t("Code"), paramName: "code", type: "text" }, - { label: t("Name"), paramName: "name", type: "text" }, + { label: t("Code"), paramName: "itemCode", type: "text" }, + { label: t("Name"), paramName: "itemName", type: "text" }, { label: t("Type"), - paramName: "type", + paramName: "itemType", type: "select", - options: uniq(inventories.map((i) => i.type)), + options: uniq(inventories.map((i) => i.itemType)), }, { label: t("Status"), @@ -60,22 +60,22 @@ const InventorySearch: React.FC = ({ inventories }) => { const columns = useMemo[]>( () => [ { - name: "code", + name: "itemCode", label: t("Code"), }, { - name: "name", + name: "itemName", label: t("Name"), }, { - name: "type", + name: "itemType", label: t("Type"), renderCell: (params) => { - return t(params.type); + return t(params.itemType); }, }, { - name: "qty", + name: "availableQty", label: t("Qty"), align: "right", headerAlign: "right", @@ -136,10 +136,10 @@ const InventorySearch: React.FC = ({ inventories }) => { setFilteredInventories( inventories.filter( (i) => - i.code.toLowerCase().includes(query.code.toLowerCase()) && - i.name.toLowerCase().includes(query.name.toLowerCase()) && - (query.type == "All" || - i.type.toLowerCase().includes(query.type.toLowerCase())) && + i.itemCode.toLowerCase().includes(query.itemCode.toLowerCase()) && + i.itemName.toLowerCase().includes(query.itemName.toLowerCase()) && + (query.itemType == "All" || + i.itemType.toLowerCase().includes(query.itemType.toLowerCase())) && (query.status == "All" || i.status.toLowerCase().includes(query.status.toLowerCase())), ),