diff --git a/src/components/pages/inventory/product/detail/InventoryProductDetail.tsx b/src/components/pages/inventory/product/detail/InventoryProductDetail.tsx
index 59b1fed0..d650a982 100644
--- a/src/components/pages/inventory/product/detail/InventoryProductDetail.tsx
+++ b/src/components/pages/inventory/product/detail/InventoryProductDetail.tsx
@@ -79,8 +79,8 @@ const InventoryProductDetail = ({
Harga Jual |
: |
- {inventoryProduct?.product_price
- ? formatCurrency(inventoryProduct.product_price)
+ {inventoryProduct?.selling_price
+ ? formatCurrency(inventoryProduct.selling_price)
: '-'}
|
@@ -88,8 +88,8 @@ const InventoryProductDetail = ({
Harga Beli |
: |
- {inventoryProduct?.selling_price
- ? formatCurrency(inventoryProduct?.selling_price)
+ {inventoryProduct?.product_price
+ ? formatCurrency(inventoryProduct?.product_price)
: '-'}
|
diff --git a/src/components/pages/inventory/product/detail/StockLogTable.tsx b/src/components/pages/inventory/product/detail/StockLogTable.tsx
index 8c9e874f..666a8b57 100644
--- a/src/components/pages/inventory/product/detail/StockLogTable.tsx
+++ b/src/components/pages/inventory/product/detail/StockLogTable.tsx
@@ -59,7 +59,7 @@ const StockLogTable = ({ stockLogs }: { stockLogs: StockLog[] }) => {
},
{
header: 'Oleh',
- accessorKey: 'created_by',
+ accessorKey: 'created_by.name',
},
]}
className={{
diff --git a/src/config/constant.ts b/src/config/constant.ts
index e0846283..8af85bc1 100644
--- a/src/config/constant.ts
+++ b/src/config/constant.ts
@@ -64,7 +64,7 @@ export const MAIN_DRAWER_LINKS: MAIN_DRAWER_MENU[] = [
icon: 'mdi:warehouse',
submenu: [
{
- title: 'Product',
+ title: 'Produk',
link: '/inventory/product',
icon: 'mdi:package-variant-closed',
},
diff --git a/src/types/api/inventory/product.d.ts b/src/types/api/inventory/product.d.ts
index 85253e2a..593a2bbc 100644
--- a/src/types/api/inventory/product.d.ts
+++ b/src/types/api/inventory/product.d.ts
@@ -1,4 +1,4 @@
-import { BaseMetadata } from '@/types/api/api-general';
+import { BaseMetadata, CreatedUser } from '@/types/api/api-general';
import { ProductWarehouse } from '@/types/api/inventory/product-warehouse';
import { ProductCategory } from '@/types/api/master-data/product-category';
import { Supplier } from '@/types/api/master-data/supplier';
@@ -25,7 +25,7 @@ export type ProductWarehouseStock = {
product_id: number;
warehouse_id: number;
warehouse_name: string;
- location: Location | string;
+ location: Location | null;
current_stock: number;
stock_logs: StockLog[];
};
@@ -38,7 +38,7 @@ export type StockLog = {
loggable_id: number;
notes: string;
product_warehouse_id: number;
- created_by: number;
+ created_by: CreatedUser;
created_at: string;
};