+ Please try refreshing the page or contact support if the problem + persists. +
+ +{bottomLabel}
+ )} + + {/* Pesan error */} + {isError && errorMessage && ( +{errorMessage}
+ )}{bottomLabel}
- )} - - {/* Pesan error */} - {isError && errorMessage && ( -{errorMessage}
- )} -| {pengajuanItem.nonstock.name} | {pengajuanItem.qty} | -{formatCurrency(pengajuanItem.total_price)} | +{formatCurrency(pengajuanItem.price)} | {pengajuanItem.note ?? '-'} | |||||||||||||||||||||||||||||||||||||
| {realisasiItem.nonstock.name} | {realisasiItem.qty} | -{formatCurrency(realisasiItem.total_price)} | +{formatCurrency(realisasiItem.price)} | {realisasiItem.note ?? '-'} | Tanggal Transaksi | : | - {formatDate(initialValues?.expense_date, 'DD MMMM YYYY')} + {formatDate( + initialValues?.transaction_date, + 'DD MMMM YYYY' + )} | ||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Nonstock | Total Kuantitas | -Total Biaya | +Harga Satuan | Catatan | |||||||||||||||||||||||||||||||||||||
| {pengajuanItem.nonstock.name} | {pengajuanItem.qty} | -- {formatCurrency(pengajuanItem.total_price)} - | +{formatCurrency(pengajuanItem.price)} | {pengajuanItem.note ?? '-'} | diff --git a/src/components/pages/expense/ExpensesTable.tsx b/src/components/pages/expense/ExpensesTable.tsx index 3a50f233..bbcb6c4e 100644 --- a/src/components/pages/expense/ExpensesTable.tsx +++ b/src/components/pages/expense/ExpensesTable.tsx @@ -263,11 +263,11 @@ const ExpensesTable = () => { }, }, { - accessorKey: 'expense_date', + accessorKey: 'transaction_date', header: 'Tanggal Pengajuan', cell: (props) => - props.row.original.expense_date - ? formatDate(props.row.original.expense_date, 'DD MMM YYYY') + props.row.original.transaction_date + ? formatDate(props.row.original.transaction_date, 'DD MMM YYYY') : '-', }, { diff --git a/src/components/pages/expense/form/ExpenseRealizationForm.schema.ts b/src/components/pages/expense/form/ExpenseRealizationForm.schema.ts index 863238b9..77db761c 100644 --- a/src/components/pages/expense/form/ExpenseRealizationForm.schema.ts +++ b/src/components/pages/expense/form/ExpenseRealizationForm.schema.ts @@ -27,7 +27,7 @@ type ExpenseRealizationFormSchemaType = { label: string; }; quantity?: number; - total_cost?: number; + price?: number; notes?: string; }[]; }[]; @@ -82,7 +82,7 @@ export const ExpenseRealizationFormSchema: Yup.ObjectSchema|||||||||||||||||||||||||||||||||||||
| Nonstock | Total Kuantitas | -Total Biaya | +Harga Satuan | Catatan |
- {(formik.values.cost_per_kandangs.length === 0 ||
+ {(formik.values.expense_nonstocks.length === 0 ||
!formik.values.supplier?.value) && (
@@ -122,9 +122,9 @@ const ExpenseRequestKandangDetailExpense: React.FC< Nonstock |
Total Kuantitas |
- Total Biaya |
+ Harga Satuan |
Catatan |
{type !== 'detail' && Aksi | }
|
+
+
+ );
+};
+
+export default InventoryProductTable;
diff --git a/src/components/pages/inventory/product/detail/InventoryProductDetail.tsx b/src/components/pages/inventory/product/detail/InventoryProductDetail.tsx
new file mode 100644
index 00000000..ad523929
--- /dev/null
+++ b/src/components/pages/inventory/product/detail/InventoryProductDetail.tsx
@@ -0,0 +1,118 @@
+import Card from '@/components/Card';
+import { FormHeader } from '@/components/helper/form/FormHeader';
+import StockLogTable from '@/components/pages/inventory/product/detail/StockLogTable';
+import StockProductWarehouseTable from '@/components/pages/inventory/product/detail/StockProductWarehouseTable';
+import { formatCurrency, formatNumber } from '@/lib/helper';
+import { InventoryProduct } from '@/types/api/inventory/product';
+import { useMemo } from 'react';
+
+const InventoryProductDetail = ({
+ inventoryProduct,
+}: {
+ inventoryProduct?: InventoryProduct;
+}) => {
+ const stockLogs = useMemo(() => {
+ return (
+ inventoryProduct?.product_warehouses?.flatMap(
+ (warehouse) => warehouse.stock_logs || []
+ ) || []
+ );
+ }, [inventoryProduct]);
+
+ return (
+
+
+
+
+
+
+
+
+
+
+
+ );
+};
+
+export default InventoryProductDetail;
diff --git a/src/components/pages/inventory/product/detail/StockLogTable.tsx b/src/components/pages/inventory/product/detail/StockLogTable.tsx
new file mode 100644
index 00000000..42f7bc29
--- /dev/null
+++ b/src/components/pages/inventory/product/detail/StockLogTable.tsx
@@ -0,0 +1,81 @@
+import Card from '@/components/Card';
+import Table from '@/components/Table';
+import { formatDate, formatNumber, formatTitleCase } from '@/lib/helper';
+import { StockLog } from '@/types/api/inventory/product';
+
+const StockLogTable = ({ stockLogs }: { stockLogs: StockLog[] }) => {
+ return (
+
+
+
+
+
+
+
+
-
+
);
};
diff --git a/src/components/pages/production/chickin/form/tabs/ChickLogsView.tsx b/src/components/pages/production/chickin/form/tabs/ChickLogsView.tsx
index 8accf9ae..99eb1cb3 100644
--- a/src/components/pages/production/chickin/form/tabs/ChickLogsView.tsx
+++ b/src/components/pages/production/chickin/form/tabs/ChickLogsView.tsx
@@ -2,17 +2,12 @@ import Alert from '@/components/Alert';
import Button from '@/components/Button';
import Card from '@/components/Card';
import { useModal } from '@/components/Modal';
-import ConfirmationModal from '@/components/modal/ConfirmationModal';
import ConfirmationModalWithNotes from '@/components/modal/ConfirmationModalWithNotes';
import PillBadge from '@/components/PillBadge';
-import Table from '@/components/Table';
import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
-import { cn, formatDate, formatNumber } from '@/lib/helper';
+import { formatDate, formatNumber } from '@/lib/helper';
import { ChickinApi } from '@/services/api/production/chickin';
-import {
- Chickin,
- ProjectFlockKandang,
-} from '@/types/api/production/project-flock-kandang';
+import { ProjectFlockKandang } from '@/types/api/production/project-flock-kandang';
import { Icon } from '@iconify/react';
import { useState } from 'react';
import toast from 'react-hot-toast';
@@ -54,105 +49,120 @@ const ChickinLogsView = ({
return (
<>
-
+
+
+
+ Informasi Kandang-
-
- Informasi Kandang belum tersedia...
-
-
- }
- data={[initialValues?.kandang]}
- columns={[
- {
- header: 'Area',
- accessorFn: () => initialValues?.project_flock?.area.name || '-',
- },
- {
- header: 'Lokasi',
- accessorFn: () =>
- initialValues?.project_flock?.location.name || '-',
- },
- {
- header: 'Flock',
- accessorFn: () => initialValues?.project_flock?.flock_name || '-',
- },
- {
- header: 'Kandang',
- accessorFn: (row) => row?.name || '-',
- },
- {
- header: 'Kapasitas',
- accessorFn: (row) =>
- (row?.capacity && formatNumber(row?.capacity)) || '-',
- },
- {
- header: 'Penanggung Jawab',
- accessorFn: (row) => row?.pic?.name || '-',
- },
- ]}
- className={{
- tableWrapperClassName: 'overflow-x-auto min-h-full!',
- tableClassName: 'font-inter w-full table-auto min-h-full!',
- headerRowClassName: 'border-b border-b-gray-200',
- headerColumnClassName:
- 'px-6 py-3 text-xs font-semibold text-gray-500 last:flex last:flex-row last:justify-end',
- bodyRowClassName: 'border-b border-b-gray-200',
- bodyColumnClassName:
- 'px-6 py-3 last:flex last:flex-row last:justify-end',
- paginationClassName: 'hidden',
- }}
+ {approvals && !approvalsLoading && (
+
+
+ )}
+
+ {/* Badge Row */}
+
+
+
+ {/* Information Grid */}
+
+ {/* Area */}
+
+
+
+
+ {initialValues.project_flock.area.name}
+
+
+ {/* Lokasi */}
+
+
+
+ {initialValues.project_flock?.location.name}
+
+
+ {/* Kandang */}
+
+
+ {initialValues.kandang.name}
+
+ {/* Jumlah DOC */}
+
+
+
+ {formatNumber(
+ initialValues.chickins?.reduce(
+ (total, chickin) => total + chickin.usage_qty,
+ 0
+ ) ?? 0
+ )}{' '}
+ Ekor
+
+
+
+ {openChickin && (
+ Informasi Chick In+ {/* Badge Row */} +
+
+
- {initialValues?.approval?.step_number == 1 && (
-
- )}
-
-
+ {/* Card List Chickin Logs */}
+ {(initialValues?.chickins || []).length === 0 ? (
+
+
+
+ Belum ada riwayat Chick In...
+
+
+ ) : (
+ (initialValues?.chickins || []).map((chickin, index) => {
+ const isApproved = chickin.usage_qty !== 0;
+ const isPending = chickin.pending_usage_qty !== 0;
+ const quantity = isApproved
+ ? chickin.usage_qty
+ : isPending
+ ? chickin.pending_usage_qty
+ : 0;
+
+ return (
+
+ {/* Header with Status Badge */}
+
+
+
+
+ {/* Tanggal Chick In */}
+
+ Chick In #{index + 1}
+
+
+
+
+ {/* Kandang */}
+
+
+
+ {formatDate(chickin.chick_in_date, 'DD MMM YYYY')}
+
+
+
+
+ {/* Produk */}
+
+
+
+ {chickin.product_warehouse?.warehouse?.name || '-'}
+
+
+
+
+ {/* Jumlah Chick In */}
+
+
+
+ {chickin.product_warehouse?.product?.name || '-'}
+
+
+
+
+
+
+ {quantity > 0 ? `${formatNumber(quantity)} Ekor` : '-'}
+
+ setChickinErrorMessage('')}>
)}
-
+ {availableQty?.product_warehouse?.product?.name}
- );
- },
- },
- {
- accessorFn: (row) => row.product_warehouse_id,
- header: 'Jumlah (ekor)',
- cell(props) {
- const availableQty = initialValues?.available_qtys?.find(
- (availableQty) =>
- availableQty.product_warehouse.id ===
- props.row.original.product_warehouse_id
- );
- return (
-
- {availableQty?.available_qty
- ? formatNumber(availableQty?.available_qty)
- : '-'}
-
- );
- },
- },
- ]}
- className={{
- tableWrapperClassName: 'overflow-x-auto min-h-full!',
- tableClassName: 'font-inter w-full table-auto min-h-full!',
- headerRowClassName: 'border-b border-b-gray-200',
- headerColumnClassName:
- 'px-2 py-3 text-xs font-semibold text-gray-500 last:flex last:flex-row last:justify-end',
- bodyRowClassName: 'border-b border-b-gray-200',
- bodyColumnClassName:
- 'px-2 py-2 last:flex last:flex-row last:justify-end',
- paginationClassName: 'hidden',
- }}
- emptyContent={
-
-
- Isi persediaan DOC untuk kandang belum tersedia...
-
+ {(formik.values.chickin_requests || []).map((chickinRequest, index) => {
+ const availableQty = initialValues?.available_qtys?.find(
+ (availableQty) =>
+ availableQty.product_warehouse.id ===
+ chickinRequest.product_warehouse_id
+ );
+ return (
+
+
- }
- />
-
+ {formatNumber(availableQty?.available_qty ?? 0)} Ekor -{' '}
+ {availableQty?.product_warehouse?.product?.name}
+
+ {chickinRequest.chick_in_date && (
+
-
+
+ )}
{chickinErrorMessage && (
{availableQty?.product_warehouse?.product?.name}
+ );
+ },
+ },
+ {
+ accessorFn: (row) => row.product_warehouse_id,
+ header: 'Jumlah (ekor)',
+ cell(props) {
+ const availableQty = initialValues?.available_qtys?.find(
+ (availableQty) =>
+ availableQty.product_warehouse.id ===
+ props.row.original.product_warehouse_id
+ );
+ return (
+
+ {availableQty?.available_qty
+ ? formatNumber(availableQty?.available_qty)
+ : '-'}
+
+ );
+ },
+ },
+ ]}
+ className={{
+ tableWrapperClassName: 'overflow-x-auto min-h-full!',
+ tableClassName: 'font-inter w-full table-auto min-h-full!',
+ headerRowClassName: 'border-b border-b-gray-200',
+ headerColumnClassName:
+ 'px-2 py-3 text-xs font-semibold text-gray-500 last:flex last:flex-row last:justify-end',
+ bodyRowClassName: 'border-b border-b-gray-200',
+ bodyColumnClassName:
+ 'px-2 py-2 last:flex last:flex-row last:justify-end',
+ paginationClassName: 'hidden',
+ }}
+ emptyContent={
+
+
+ Isi persediaan DOC untuk kandang belum tersedia...
+
+
+ }
+ /> */}
+ {formik.values.chickin_requests?.length > 0 && (
- setChickinErrorMessage('')}>
+
-
+ */}
+
+
+
+ Chick In {projectFlock?.flock_name}
+
+
+ backUrl={`/production/project-flock/detail?projectFlockId=${projectFlock?.id}`}
+ /> */}
+ {/*
+
+ )}
+ {/*
+
+ Informasi Umum+ {/* Badge Row */} +
+
+ {/* Information Grid */}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {/* BARIS 1 */}
+
+
+ {projectFlock.area.name}
+
+ {/* BARIS 2 */}
+
+
+ {projectFlock.location.name}
+
+
+
+ {projectFlock.fcr.name}
+
+ {/* BARIS 3 (Terakhir - TIDAK PERLU garis di bawahnya) */}
+
+
+
+ {formatTitleCase(projectFlock.category)}
+
+
+
+ {/*
+
+ Daftar Kandang+ {isResponseSuccess(listProjectFlock) ? ( + <> + {/* Badge Row */} +
+
+ {/* Card Kandang */}
+
+ {isResponseSuccess(listProjectFlockKandang) &&
+ listProjectFlockKandang.data.map((kandang) => (
+
+
+
+ ))}
+
+
+
+
+
+ Pilih project flock terlebih dahulu...
+
+
+ )}
+
+
+
+ {/* Table Biaya */}
+
+ Informasi Kandang+ + {/* Badge Row */} +
+
+
+ {/* Information Grid */}
+
+ {/* Area */}
+
+
+
+ {projectFlock.area?.name}
+
+ {/* Lokasi */}
+
+
+ {projectFlock.location?.name}
+
+ {/* Kandang */}
+
+
+ {projectFlockKandang.kandang?.name}
+
+ {/* Jumlah DOC */}
+
+
+
+ {formatNumber(
+ projectFlockKandang.chickins?.reduce(
+ (total, chickin) => total + chickin.usage_qty,
+ 0
+ ) ?? 0
+ )}{' '}
+ Ekor
+
+
+
+
+ {/* Table Persediaan Gudang */}
+
+ Biaya+
+ *Pastikan semua biaya sudah selesai sebelum melakukan closing.
+
+ )} */}
+
+
+
+ Persediaan Gudang+
+ *Masih ada sisa stock yang belum dihabiskan.
+
+ )} */}
+
+
+
+
+
+ {/* Header */}
+
+
+
+
+
+ {/* Kandang Aktif */}
+
+
+ Informasi Umum+ {/* Status Approval */} + {approvals && !approvalsLoading && ( +
+
+ )}
+ {/* Badge Row */}
+
+
+ {/* Information Grid */}
+
+
+
+
+
+
+
+ {/*
+
+
+
+ */}
+
+ {/* BARIS 1 */}
+
+
+ {projectFlock?.area?.name}
+
+ {/* BARIS 2 */}
+
+
+ {projectFlock?.location?.name}
+
+
+
+ {projectFlock?.fcr?.name}
+
+ {/* BARIS 3 (Terakhir - TIDAK PERLU garis di bawahnya) */}
+
+
+
+ {formatTitleCase(projectFlock.category ?? '')}
+
+
+
+
+
+ Kandang Aktif+ {kandangApprovals && !kandangApprovalsLoading && ( +
+
+
+ {/* Card List Project Budgets */}
+ {openBudgets &&
+ (projectFlock.project_budgets ?? []).map((budget) => (
+
+
+
+
+
+
+
+ {budget?.nonstock?.name}
+
+
+
+
+
+
+ {budget?.nonstock?.uom?.name}
+
+
+
+
+
+
+ {formatNumber(budget.qty)}
+
+
+
+
+
+
+ {formatCurrency(budget.price)}
+
+
+
+
+
+
+ {formatCurrency(budget.price * budget.qty)}
+
+
+ projectFlock?.approval?.step_number > 1 &&
+ setSelectedKamdangId(kandang?.id?.toString())
+ }
+ >
+
+ ))}
+
+
+
+
+
+
+
+
+
+
+ - {formType === 'add' && 'Tambah Project Flock'} - {formType === 'edit' && 'Edit Project Flock'} - {formType === 'detail' && 'Detail Project Flock'} --
@@ -631,21 +764,6 @@ const ProjectFlockForm = ({
)}
|