From e0a851481421f00a2e8e669872952c4d9deacc9d Mon Sep 17 00:00:00 2001 From: randy-ar Date: Thu, 4 Dec 2025 16:13:47 +0700 Subject: [PATCH] fix(FE): adjust data types for project flock and product stock inventory --- .../inventory/product/InventoryProductTable.tsx | 9 +++++++++ .../product/detail/InventoryProductDetail.tsx | 17 +++++------------ .../project-flock/detail/ProjectFlockDetail.tsx | 4 ++-- src/types/api/inventory/product.d.ts | 1 + src/types/api/production/project-flock.d.ts | 2 +- 5 files changed, 18 insertions(+), 15 deletions(-) diff --git a/src/components/pages/inventory/product/InventoryProductTable.tsx b/src/components/pages/inventory/product/InventoryProductTable.tsx index da660568..20c7859c 100644 --- a/src/components/pages/inventory/product/InventoryProductTable.tsx +++ b/src/components/pages/inventory/product/InventoryProductTable.tsx @@ -112,6 +112,15 @@ const InventoryProductTable = () => { accessorFn: (row) => row.product_category.name, header: 'Kategori', }, + { + accessorFn: (row) => row.total_stock, + header: 'Stok', + cell: (props) => { + return props.row.original.total_stock + ? formatCurrency(props.row.original.total_stock) + : '-'; + }, + }, { accessorFn: (row) => row.uom.name, header: 'Satuan', diff --git a/src/components/pages/inventory/product/detail/InventoryProductDetail.tsx b/src/components/pages/inventory/product/detail/InventoryProductDetail.tsx index d650a982..8f209c83 100644 --- a/src/components/pages/inventory/product/detail/InventoryProductDetail.tsx +++ b/src/components/pages/inventory/product/detail/InventoryProductDetail.tsx @@ -8,20 +8,9 @@ import { useMemo } from 'react'; const InventoryProductDetail = ({ inventoryProduct, - refresh, }: { inventoryProduct?: InventoryProduct; - refresh?: () => void; }) => { - const totalStok = useMemo(() => { - return ( - inventoryProduct?.product_warehouses?.reduce( - (total, warehouse) => total + (warehouse.current_stock || 0), - 0 - ) || 0 - ); - }, [inventoryProduct]); - const stockLogs = useMemo(() => { return ( inventoryProduct?.product_warehouses?.flatMap( @@ -105,7 +94,11 @@ const InventoryProductDetail = ({ Total Stok : - {formatNumber(totalStok)} + + {inventoryProduct?.total_stock + ? formatNumber(inventoryProduct?.total_stock) + : '-'} + diff --git a/src/components/pages/production/project-flock/detail/ProjectFlockDetail.tsx b/src/components/pages/production/project-flock/detail/ProjectFlockDetail.tsx index 28ab757c..fc1a87d3 100644 --- a/src/components/pages/production/project-flock/detail/ProjectFlockDetail.tsx +++ b/src/components/pages/production/project-flock/detail/ProjectFlockDetail.tsx @@ -221,7 +221,7 @@ const ProjectFlockDetail = ({ }} > {` ${formatCurrency( - projectFlock.project_budgets.reduce( + (projectFlock.project_budgets ?? []).reduce( (acc, curr) => acc + curr.price * curr.qty, 0 ) @@ -236,7 +236,7 @@ const ProjectFlockDetail = ({ {/* Card List Project Budgets */} {openBudgets && - projectFlock.project_budgets.map((budget) => ( + (projectFlock.project_budgets ?? []).map((budget) => (