diff --git a/.husky/pre-commit b/.husky/pre-commit
index 3782914b..ff51d55a 100644
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -1,3 +1,3 @@
 npm run format
 npm run lint
-npm run build
\ No newline at end of file
+npx tsc --noEmit
\ No newline at end of file
diff --git a/src/app/finance/add/adjust/page.tsx b/src/app/finance/add/adjust/page.tsx
new file mode 100644
index 00000000..3536892d
--- /dev/null
+++ b/src/app/finance/add/adjust/page.tsx
@@ -0,0 +1,5 @@
+const FinanceAdjust = () => {
+  return <div>Finance Adjust</div>;
+};
+
+export default FinanceAdjust;
diff --git a/src/app/finance/add/initial-balance/page.tsx b/src/app/finance/add/initial-balance/page.tsx
new file mode 100644
index 00000000..fb3114ad
--- /dev/null
+++ b/src/app/finance/add/initial-balance/page.tsx
@@ -0,0 +1,7 @@
+import FormFinanceAddInitialBalance from '@/components/pages/finance/add/initial-balance/FormFinanceAddInitialBalance';
+
+const FinanceAddInitialBalancePage = () => {
+  return <FormFinanceAddInitialBalance type='add' />;
+};
+
+export default FinanceAddInitialBalancePage;
diff --git a/src/app/finance/add/injection/page.tsx b/src/app/finance/add/injection/page.tsx
new file mode 100644
index 00000000..502df04b
--- /dev/null
+++ b/src/app/finance/add/injection/page.tsx
@@ -0,0 +1,7 @@
+import FormFinanceInjection from '@/components/pages/finance/add/injection/FormFinanceInjection';
+
+const FinanceAddInjectionPage = () => {
+  return <FormFinanceInjection type='add' />;
+};
+
+export default FinanceAddInjectionPage;
diff --git a/src/app/finance/add/page.tsx b/src/app/finance/add/page.tsx
new file mode 100644
index 00000000..162cd7ec
--- /dev/null
+++ b/src/app/finance/add/page.tsx
@@ -0,0 +1,7 @@
+import FormFinanceAdd from '@/components/pages/finance/add/FormFinanceAdd';
+
+const FinanceAddPage = () => {
+  return <FormFinanceAdd />;
+};
+
+export default FinanceAddPage;
diff --git a/src/app/finance/detail/edit/initial-balance/page.tsx b/src/app/finance/detail/edit/initial-balance/page.tsx
new file mode 100644
index 00000000..fddb46d9
--- /dev/null
+++ b/src/app/finance/detail/edit/initial-balance/page.tsx
@@ -0,0 +1,51 @@
+'use client';
+
+import { useRouter, useSearchParams } from 'next/navigation';
+import useSWR from 'swr';
+import { FinanceApi } from '@/services/api/finance';
+import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
+import FormFinanceAddInitialBalance from '@/components/pages/finance/add/initial-balance/FormFinanceAddInitialBalance';
+
+const EditFinanceInitialBalancePage = () => {
+  const router = useRouter();
+  const searchParams = useSearchParams();
+
+  const financeId = searchParams.get('financeId');
+
+  const { data: finance, isLoading: isLoadingFinance } = useSWR(
+    financeId,
+    (id: number) => FinanceApi.getSingle(id)
+  );
+
+  if (!financeId) {
+    router.back();
+
+    return (
+      <div className='w-full flex flex-row justify-center items-center p-4'>
+        <span className='loading loading-spinner loading-xl' />
+      </div>
+    );
+  }
+
+  if (!isLoadingFinance && (!finance || isResponseError(finance))) {
+    router.replace('/404');
+    return;
+  }
+
+  return (
+    <div className='w-full p-4 flex flex-row justify-center'>
+      {isLoadingFinance && (
+        <span className='loading loading-spinner loading-xl' />
+      )}
+
+      {!isLoadingFinance && (
+        <FormFinanceAddInitialBalance
+          type='edit'
+          initialValues={isResponseSuccess(finance) ? finance.data : undefined}
+        />
+      )}
+    </div>
+  );
+};
+
+export default EditFinanceInitialBalancePage;
diff --git a/src/app/finance/detail/edit/injection/page.tsx b/src/app/finance/detail/edit/injection/page.tsx
new file mode 100644
index 00000000..a538ffd1
--- /dev/null
+++ b/src/app/finance/detail/edit/injection/page.tsx
@@ -0,0 +1,51 @@
+'use client';
+
+import { useRouter, useSearchParams } from 'next/navigation';
+import useSWR from 'swr';
+import { FinanceApi } from '@/services/api/finance';
+import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
+import FormFinanceInjection from '@/components/pages/finance/add/injection/FormFinanceInjection';
+
+const EditFinanceInjectionPage = () => {
+  const router = useRouter();
+  const searchParams = useSearchParams();
+
+  const financeId = searchParams.get('financeId');
+
+  const { data: finance, isLoading: isLoadingFinance } = useSWR(
+    financeId,
+    (id: number) => FinanceApi.getSingle(id)
+  );
+
+  if (!financeId) {
+    router.back();
+
+    return (
+      <div className='w-full flex flex-row justify-center items-center p-4'>
+        <span className='loading loading-spinner loading-xl' />
+      </div>
+    );
+  }
+
+  if (!isLoadingFinance && (!finance || isResponseError(finance))) {
+    router.replace('/404');
+    return;
+  }
+
+  return (
+    <div className='w-full p-4 flex flex-row justify-center'>
+      {isLoadingFinance && (
+        <span className='loading loading-spinner loading-xl' />
+      )}
+
+      {!isLoadingFinance && (
+        <FormFinanceInjection
+          type='edit'
+          initialValues={isResponseSuccess(finance) ? finance.data : undefined}
+        />
+      )}
+    </div>
+  );
+};
+
+export default EditFinanceInjectionPage;
diff --git a/src/app/finance/detail/edit/page.tsx b/src/app/finance/detail/edit/page.tsx
new file mode 100644
index 00000000..93a0daea
--- /dev/null
+++ b/src/app/finance/detail/edit/page.tsx
@@ -0,0 +1,52 @@
+'use client';
+
+import { useRouter, useSearchParams } from 'next/navigation';
+import useSWR from 'swr';
+import { FinanceApi } from '@/services/api/finance';
+import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
+import FormFinanceAdd from '@/components/pages/finance/add/FormFinanceAdd';
+import FormFinanceAddInitialBalance from '@/components/pages/finance/add/initial-balance/FormFinanceAddInitialBalance';
+
+const EditFinanceTransactionPage = () => {
+  const router = useRouter();
+  const searchParams = useSearchParams();
+
+  const financeId = searchParams.get('financeId');
+
+  const { data: finance, isLoading: isLoadingFinance } = useSWR(
+    financeId,
+    (id: number) => FinanceApi.getSingle(id)
+  );
+
+  if (!financeId) {
+    router.back();
+
+    return (
+      <div className='w-full flex flex-row justify-center items-center p-4'>
+        <span className='loading loading-spinner loading-xl' />
+      </div>
+    );
+  }
+
+  if (!isLoadingFinance && (!finance || isResponseError(finance))) {
+    router.replace('/404');
+    return;
+  }
+
+  return (
+    <div className='w-full p-4 flex flex-row justify-center'>
+      {isLoadingFinance && (
+        <span className='loading loading-spinner loading-xl' />
+      )}
+
+      {!isLoadingFinance && (
+        <FormFinanceAdd
+          type='edit'
+          initialValues={isResponseSuccess(finance) ? finance.data : undefined}
+        />
+      )}
+    </div>
+  );
+};
+
+export default EditFinanceTransactionPage;
diff --git a/src/app/production/project-flock/chickin/add/layout.tsx b/src/app/finance/detail/layout.tsx
similarity index 100%
rename from src/app/production/project-flock/chickin/add/layout.tsx
rename to src/app/finance/detail/layout.tsx
diff --git a/src/app/finance/detail/page.tsx b/src/app/finance/detail/page.tsx
new file mode 100644
index 00000000..1d20e9f5
--- /dev/null
+++ b/src/app/finance/detail/page.tsx
@@ -0,0 +1,41 @@
+'use client';
+
+import FinanceDetail from '@/components/pages/finance/FinanceDetail';
+import useSWR from 'swr';
+import { useRouter, useSearchParams } from 'next/navigation';
+import { FinanceApi } from '@/services/api/finance';
+import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
+
+const FinanceDetailPage = () => {
+  const router = useRouter();
+  const financeId = useSearchParams().get('financeId');
+
+  const { data: finance } = useSWR(financeId, () =>
+    FinanceApi.getSingle(Number(financeId))
+  );
+
+  if (!financeId) {
+    router.back();
+
+    return (
+      <div className='w-full flex flex-row justify-center items-center p-4'>
+        <span className='loading loading-spinner loading-xl' />
+      </div>
+    );
+  }
+
+  console.log(finance);
+
+  // if (!finance || isResponseError(finance)) {
+  //   router.replace('/404');
+  //   return;
+  // }
+
+  return (
+    <>
+      {isResponseSuccess(finance) && <FinanceDetail finance={finance.data} />}
+    </>
+  );
+};
+
+export default FinanceDetailPage;
diff --git a/src/app/finance/page.tsx b/src/app/finance/page.tsx
new file mode 100644
index 00000000..ec78820c
--- /dev/null
+++ b/src/app/finance/page.tsx
@@ -0,0 +1,14 @@
+'use client';
+
+import FinanceTable from '@/components/pages/finance/FinanceTable';
+
+const Finance = () => {
+  return (
+    <section className='size-full p-6'>
+      <div className='flex flex-row gap-4'></div>
+      <FinanceTable />
+    </section>
+  );
+};
+
+export default Finance;
diff --git a/src/app/master-data/production-standard/add/page.tsx b/src/app/master-data/production-standard/add/page.tsx
new file mode 100644
index 00000000..f25338d6
--- /dev/null
+++ b/src/app/master-data/production-standard/add/page.tsx
@@ -0,0 +1,13 @@
+'use client';
+
+import ProductionStandardForm from '@/components/pages/master-data/production-standard/form/ProductionStandardForm';
+
+const AddProductionStandardPage = () => {
+  return (
+    <>
+      <ProductionStandardForm formType='add' />
+    </>
+  );
+};
+
+export default AddProductionStandardPage;
diff --git a/src/app/master-data/production-standard/detail/edit/page.tsx b/src/app/master-data/production-standard/detail/edit/page.tsx
new file mode 100644
index 00000000..d048b411
--- /dev/null
+++ b/src/app/master-data/production-standard/detail/edit/page.tsx
@@ -0,0 +1,56 @@
+'use client';
+
+import ProductionStandardForm from '@/components/pages/master-data/production-standard/form/ProductionStandardForm';
+import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
+import { ProductionStandardApi } from '@/services/api/master-data';
+import { useRouter, useSearchParams } from 'next/navigation';
+import useSWR from 'swr';
+
+const EditProductionStandardPage = () => {
+  const router = useRouter();
+  const searchParams = useSearchParams();
+
+  // Get Query Params
+  const productionStandardId = searchParams.get('productionStandardId');
+
+  // Fetch Data
+  const { data: productionStandard, isLoading: isLoadingProductionStandard } =
+    useSWR(productionStandardId, (id: number) =>
+      ProductionStandardApi.getSingle(id)
+    );
+
+  if (!productionStandardId) {
+    router.back();
+
+    return (
+      <div className='w-full flex flex-row justify-center items-center p-4'>
+        <span className='loading loading-spinner loading-xl' />
+      </div>
+    );
+  }
+
+  if (
+    !isLoadingProductionStandard &&
+    (!productionStandard || isResponseError(productionStandard))
+  ) {
+    router.replace('/404');
+    return;
+  }
+
+  return (
+    <>
+      {isLoadingProductionStandard && (
+        <span className='loading loading-spinner loading-xl' />
+      )}
+      {!isLoadingProductionStandard &&
+        isResponseSuccess(productionStandard) && (
+          <ProductionStandardForm
+            formType='edit'
+            initialValue={productionStandard.data}
+          />
+        )}
+    </>
+  );
+};
+
+export default EditProductionStandardPage;
diff --git a/src/app/master-data/production-standard/detail/layout.tsx b/src/app/master-data/production-standard/detail/layout.tsx
new file mode 100644
index 00000000..7220dfa1
--- /dev/null
+++ b/src/app/master-data/production-standard/detail/layout.tsx
@@ -0,0 +1,11 @@
+import SuspenseHelper from '@/components/helper/SuspenseHelper';
+
+const Layout = ({
+  children,
+}: Readonly<{
+  children: React.ReactNode;
+}>) => {
+  return <SuspenseHelper>{children}</SuspenseHelper>;
+};
+
+export default Layout;
diff --git a/src/app/master-data/production-standard/detail/page.tsx b/src/app/master-data/production-standard/detail/page.tsx
new file mode 100644
index 00000000..99806dcd
--- /dev/null
+++ b/src/app/master-data/production-standard/detail/page.tsx
@@ -0,0 +1,56 @@
+'use client';
+
+import ProductionStandardForm from '@/components/pages/master-data/production-standard/form/ProductionStandardForm';
+import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
+import { ProductionStandardApi } from '@/services/api/master-data';
+import { useRouter, useSearchParams } from 'next/navigation';
+import useSWR from 'swr';
+
+const DetailProductionStandardPage = () => {
+  const router = useRouter();
+  const searchParams = useSearchParams();
+
+  // Get Query Params
+  const productionStandardId = searchParams.get('productionStandardId');
+
+  // Fetch Data
+  const { data: productionStandard, isLoading: isLoadingProductionStandard } =
+    useSWR(productionStandardId, (id: number) =>
+      ProductionStandardApi.getSingle(id)
+    );
+
+  if (!productionStandardId) {
+    router.back();
+
+    return (
+      <div className='w-full flex flex-row justify-center items-center p-4'>
+        <span className='loading loading-spinner loading-xl' />
+      </div>
+    );
+  }
+
+  if (
+    !isLoadingProductionStandard &&
+    (!productionStandard || isResponseError(productionStandard))
+  ) {
+    router.replace('/404');
+    return;
+  }
+
+  return (
+    <>
+      {isLoadingProductionStandard && (
+        <span className='loading loading-spinner loading-xl' />
+      )}
+      {!isLoadingProductionStandard &&
+        isResponseSuccess(productionStandard) && (
+          <ProductionStandardForm
+            formType='detail'
+            initialValue={productionStandard.data}
+          />
+        )}
+    </>
+  );
+};
+
+export default DetailProductionStandardPage;
diff --git a/src/app/master-data/production-standard/page.tsx b/src/app/master-data/production-standard/page.tsx
new file mode 100644
index 00000000..ed1107cd
--- /dev/null
+++ b/src/app/master-data/production-standard/page.tsx
@@ -0,0 +1,11 @@
+import ProductionStandardTable from '@/components/pages/master-data/production-standard/ProductionStandardTable';
+
+const ProductionStandardPage = () => {
+  return (
+    <div className='w-full'>
+      <ProductionStandardTable />
+    </div>
+  );
+};
+
+export default ProductionStandardPage;
diff --git a/src/app/production/project-flock/chickin/add/page.tsx b/src/app/production/project-flock/chickin/add/page.tsx
deleted file mode 100644
index 831979cb..00000000
--- a/src/app/production/project-flock/chickin/add/page.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-'use client';
-
-import { FormHeader } from '@/components/helper/form/FormHeader';
-import ProjectFlockChickinDetail from '@/components/pages/production/project-flock/chickin/ProjectFlockChickinDetail';
-import { useSearchParams } from 'next/navigation';
-
-const AddChickin = () => {
-  const searchParams = useSearchParams();
-  const projectFlockId = searchParams.get('projectFlockId');
-
-  return (
-    <>
-      <section className='w-full'>
-        <ProjectFlockChickinDetail projectFlockId={Number(projectFlockId)} />
-      </section>
-    </>
-  );
-};
-
-export default AddChickin;
diff --git a/src/app/production/project-flock/chickin/page.tsx b/src/app/production/project-flock/chickin/page.tsx
deleted file mode 100644
index d40c39a3..00000000
--- a/src/app/production/project-flock/chickin/page.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-import ChickinTable from '@/components/pages/production/chickin/ChickinTable';
-
-const Chickin = () => {
-  return (
-    <section className='w-full'>
-      <ChickinTable />
-    </section>
-  );
-};
-export default Chickin;
diff --git a/src/components/Drawer.tsx b/src/components/Drawer.tsx
index 17b8a56f..4cb59cdb 100644
--- a/src/components/Drawer.tsx
+++ b/src/components/Drawer.tsx
@@ -64,7 +64,7 @@ const Drawer = ({
         ),
         drawerSidebarContent: cn(
           baseClassNames.drawerSidebarContent,
-          'w-full min-w-120 sm:w-fit'
+          'w-full sm:min-w-120 sm:w-fit'
         ),
       };
     } else if (variant === 'left') {
@@ -76,7 +76,7 @@ const Drawer = ({
         ),
         drawerSidebarContent: cn(
           baseClassNames.drawerSidebarContent,
-          'w-full min-w-120 sm:w-fit'
+          'w-full sm:min-w-120 sm:w-fit'
         ),
       };
     }
diff --git a/src/components/pages/finance/FinanceDetail.tsx b/src/components/pages/finance/FinanceDetail.tsx
new file mode 100644
index 00000000..c7057efa
--- /dev/null
+++ b/src/components/pages/finance/FinanceDetail.tsx
@@ -0,0 +1,194 @@
+import Button from '@/components/Button';
+import Card from '@/components/Card';
+import { FormHeader } from '@/components/helper/form/FormHeader';
+import RequirePermission from '@/components/helper/RequirePermission';
+import DebouncedTextInput from '@/components/input/DebouncedTextInput';
+import { useModal } from '@/components/Modal';
+import ConfirmationModal from '@/components/modal/ConfirmationModal';
+import Table from '@/components/Table';
+import {
+  FINANCE_INITIAL_BALANCE_STATUS,
+  FINANCE_TRANSACTION_STATUS,
+} from '@/config/constant';
+import { formatCurrency, formatDate, formatTitleCase } from '@/lib/helper';
+import { FinanceApi } from '@/services/api/finance';
+import { Finance } from '@/types/api/finance/finance';
+import { Icon } from '@iconify/react';
+import { useRouter } from 'next/navigation';
+import { useState } from 'react';
+import toast from 'react-hot-toast';
+
+const FinanceDetail = ({ finance }: { finance: Finance }) => {
+  const router = useRouter();
+  const deleteModal = useModal();
+  const [isDeleteLoading, setIsDeleteLoading] = useState(false);
+  const informasiUmum = [
+    {
+      label: 'ID',
+      value: finance.payment_code,
+    },
+    {
+      label: 'Jenis Transaksi',
+      value: finance.transaction_type,
+    },
+    {
+      label: 'Pihak',
+      value: finance.party.name,
+    },
+    {
+      label: 'Tanggal',
+      value: formatDate(finance.payment_date, 'DD MMM yyyy'),
+    },
+    {
+      label: 'Metode Pembayaran',
+      value: finance.payment_method,
+    },
+    {
+      label: 'Catatan',
+      value: finance.notes || '-',
+    },
+  ];
+  const informasiTransfer = [
+    {
+      label: 'No. Referensi',
+      value: finance.reference_number,
+    },
+    {
+      label: 'Nomor Rekening',
+      value: `${finance.bank.alias} - ${finance.bank.account_number} - ${finance.bank.owner}`,
+    },
+    {
+      label: `Rekening ${formatTitleCase(finance.party.type)}`,
+      value: finance.party.account_number,
+    },
+    {
+      label: 'Nominal',
+      value: formatCurrency(finance.expense_amount),
+    },
+    {
+      label: 'Sisa',
+      value: formatCurrency(finance.income_amount),
+    },
+  ];
+
+  const confirmationModalDeleteClickHandler = async () => {
+    setIsDeleteLoading(true);
+
+    await FinanceApi.delete(finance.id as number);
+    router.back();
+
+    deleteModal.closeModal();
+    toast.success('Successfully delete Finance!');
+    setIsDeleteLoading(false);
+  };
+
+  return (
+    <div className='flex flex-col gap-6 p-6'>
+      <FormHeader title='' backUrl='/finance' />
+
+      <Card
+        title='Detail Keuangan'
+        className={{
+          wrapper: 'w-full',
+        }}
+        variant='bordered'
+      >
+        <div className='grid grid-cols-2 gap-4 mb-6'>
+          <Table
+            data={informasiUmum}
+            columns={[
+              {
+                header: '',
+                id: 'label',
+                accessorKey: 'label',
+              },
+              {
+                header: '',
+                id: 'value',
+                accessorKey: 'value',
+              },
+            ]}
+            className={{
+              headerRowClassName: 'hidden',
+              paginationClassName: 'hidden',
+              containerClassName: 'mb-0',
+            }}
+          />
+          <Table
+            data={informasiTransfer}
+            columns={[
+              {
+                header: '',
+                id: 'label',
+                accessorKey: 'label',
+              },
+              {
+                header: '',
+                id: 'value',
+                accessorKey: 'value',
+              },
+            ]}
+            className={{
+              headerRowClassName: 'hidden',
+              paginationClassName: 'hidden',
+              containerClassName: 'mb-0',
+            }}
+          />
+        </div>
+      </Card>
+
+      <div className='flex flex-row gap-2 justify-end'>
+        {FINANCE_TRANSACTION_STATUS.includes(finance.transaction_type) && (
+          <RequirePermission permissions='lti.finance.payments.update'>
+            <Button
+              color='warning'
+              className='min-w-24'
+              href={`/finance/detail/edit?financeId=${finance.id}`}
+            >
+              <Icon icon='mdi:pencil-outline' />
+              Edit
+            </Button>
+          </RequirePermission>
+        )}
+        {FINANCE_INITIAL_BALANCE_STATUS.includes(finance.transaction_type) && (
+          <RequirePermission permissions='lti.finance.initial_balances.update'>
+            <Button
+              color='warning'
+              className='min-w-24'
+              href={`/finance/detail/edit/initial-balance?financeId=${finance.id}`}
+            >
+              <Icon icon='mdi:pencil-outline' />
+              Edit
+            </Button>
+          </RequirePermission>
+        )}
+        <RequirePermission permissions='lti.finance.transaction.delete'>
+          <Button
+            color='error'
+            className='min-w-24'
+            onClick={() => deleteModal.openModal()}
+          >
+            <Icon icon='mdi:delete-outline' />
+            Delete
+          </Button>
+        </RequirePermission>
+      </div>
+      <ConfirmationModal
+        ref={deleteModal.ref}
+        type='error'
+        text={`Apakah anda yakin ingin menghapus data Finance ini (${finance?.payment_code})?`}
+        secondaryButton={{
+          text: 'Tidak',
+        }}
+        primaryButton={{
+          text: 'Ya',
+          color: 'error',
+          isLoading: isDeleteLoading,
+          onClick: confirmationModalDeleteClickHandler,
+        }}
+      />
+    </div>
+  );
+};
+
+export default FinanceDetail;
diff --git a/src/components/pages/finance/FinanceTable.tsx b/src/components/pages/finance/FinanceTable.tsx
new file mode 100644
index 00000000..71ed6c84
--- /dev/null
+++ b/src/components/pages/finance/FinanceTable.tsx
@@ -0,0 +1,564 @@
+import { ChangeEventHandler, useMemo, useState } from 'react';
+import { CellContext, Row } from '@tanstack/react-table';
+import { useSearchParams } from 'next/navigation';
+import useSWR from 'swr';
+
+import Button from '@/components/Button';
+import Card from '@/components/Card';
+import Dropdown from '@/components/dropdown/Dropdown';
+import DateInput from '@/components/input/DateInput';
+import DebouncedTextInput from '@/components/input/DebouncedTextInput';
+import SelectInput, {
+  OptionType,
+  useSelect,
+} from '@/components/input/SelectInput';
+import Menu from '@/components/menu/Menu';
+import MenuItem from '@/components/menu/MenuItem';
+import Table from '@/components/Table';
+import Tooltip from '@/components/Tooltip';
+import { formatCurrency, formatDate, formatTitleCase } from '@/lib/helper';
+import { useTableFilter } from '@/services/hooks/useTableFilter';
+import { Finance } from '@/types/api/finance/finance';
+import {
+  FINANCE_INITIAL_BALANCE_STATUS,
+  FINANCE_INJECTION_STATUS,
+  FINANCE_TRANSACTION_STATUS,
+  ROWS_OPTIONS,
+} from '@/config/constant';
+import { FinanceApi } from '@/services/api/finance';
+import { isResponseSuccess } from '@/lib/api-helper';
+import { BankApi, CustomerApi, SupplierApi } from '@/services/api/master-data';
+import { Bank } from '@/types/api/master-data/bank';
+import { useModal } from '@/components/Modal';
+import ConfirmationModal from '@/components/modal/ConfirmationModal';
+import toast from 'react-hot-toast';
+import RowOptionsMenuWrapper from '@/components/table/RowOptionsMenuWrapper';
+import RequirePermission from '@/components/helper/RequirePermission';
+import { Icon } from '@iconify/react';
+import RowDropdownOptions from '@/components/table/RowDropdownOptions';
+import RowCollapseOptions from '@/components/table/RowCollapseOptions';
+
+const RowOptionsMenu = ({
+  type = 'dropdown',
+  props,
+  deleteClickHandler,
+}: {
+  type: 'dropdown' | 'collapse';
+  props: CellContext<Finance, unknown>;
+  deleteClickHandler: () => void;
+}) => {
+  return (
+    <RowOptionsMenuWrapper type={type}>
+      <RequirePermission permissions='lti.finance.transaction.detail'>
+        <Button
+          href={`/finance/detail?financeId=${props.row.original.id}`}
+          variant='ghost'
+          color='primary'
+          className='justify-start text-sm'
+        >
+          <Icon icon='mdi:eye-outline' width={16} height={16} />
+          Detail
+        </Button>
+      </RequirePermission>
+
+      {FINANCE_TRANSACTION_STATUS.includes(
+        props.row.original.transaction_type
+      ) && (
+        <RequirePermission permissions='lti.finance.payments.update'>
+          <Button
+            href={`/finance/detail/edit?financeId=${props.row.original.id}`}
+            variant='ghost'
+            color='warning'
+            className='justify-start text-sm'
+          >
+            <Icon icon='material-symbols:edit-outline' width={16} height={16} />
+            Edit
+          </Button>
+        </RequirePermission>
+      )}
+
+      {FINANCE_INITIAL_BALANCE_STATUS.includes(
+        props.row.original.transaction_type
+      ) && (
+        <RequirePermission permissions='lti.finance.initial_balances.update'>
+          <Button
+            href={`/finance/detail/edit/initial-balance?financeId=${props.row.original.id}`}
+            variant='ghost'
+            color='warning'
+            className='justify-start text-sm'
+          >
+            <Icon icon='material-symbols:edit-outline' width={16} height={16} />
+            Edit
+          </Button>
+        </RequirePermission>
+      )}
+
+      {FINANCE_INJECTION_STATUS.includes(
+        props.row.original.transaction_type
+      ) && (
+        <RequirePermission permissions='lti.finance.injections.update'>
+          <Button
+            href={`/finance/detail/edit/injection?financeId=${props.row.original.id}`}
+            variant='ghost'
+            color='warning'
+            className='justify-start text-sm'
+          >
+            <Icon icon='material-symbols:edit-outline' width={16} height={16} />
+            Edit
+          </Button>
+        </RequirePermission>
+      )}
+
+      <RequirePermission permissions='lti.finance.transaction.delete'>
+        <Button
+          onClick={deleteClickHandler}
+          variant='ghost'
+          color='error'
+          className='text-error hover:text-inherit'
+        >
+          <Icon
+            icon='material-symbols:delete-outline-rounded'
+            width={16}
+            height={16}
+            className='justify-start text-sm'
+          />
+          Delete
+        </Button>
+      </RequirePermission>
+    </RowOptionsMenuWrapper>
+  );
+};
+
+const FinanceTable = () => {
+  const {
+    state: tableFilterState,
+    updateFilter,
+    setPage,
+    setPageSize,
+    toQueryString: getTableFilterQueryString,
+  } = useTableFilter({
+    initial: {
+      search: '',
+      transactionType: '',
+      bankId: '',
+      partyType: '',
+      sortBy: '',
+      startDate: '',
+      endDate: '',
+    },
+    paramMap: {
+      page: 'page',
+      pageSize: 'limit',
+      transactionType: 'transaction_type',
+      bankId: 'bank_id',
+      partyType: 'party_type',
+      sortBy: 'sort_date',
+      startDate: 'start_date',
+      endDate: 'end_date',
+    },
+  });
+
+  // ===== State =====
+  const [searchParams, setSearchParams] = useSearchParams();
+  const deleteModal = useModal();
+  const [pendingFilters, setPendingFilters] = useState({
+    search: '',
+    transactionType: '',
+    bankId: '',
+    partyType: '',
+    sortBy: '',
+    startDate: '',
+    endDate: '',
+  });
+  const [selectedTransactionType, setSelectedTransactionType] =
+    useState<OptionType | null>(null);
+  const [selectedBank, setSelectedBank] = useState<OptionType | null>(null);
+  const [selectedPartyType, setSelectedPartyType] = useState<OptionType | null>(
+    null
+  );
+  const [selectedSortBy, setSelectedSortBy] = useState<OptionType | null>(null);
+  const [selectedFinance, setSelectedFinance] = useState<Finance | null>(null);
+  const [isDeleteLoading, setIsDeleteLoading] = useState(false);
+
+  // ===== Fetch Data =====
+  const {
+    data: finances,
+    isLoading,
+    mutate: refreshFinances,
+  } = useSWR(
+    `${FinanceApi.basePath}/transactions${getTableFilterQueryString()}`,
+    FinanceApi.getAllFetcher
+  );
+
+  // ===== Options =====
+  const transactionTypeOptions = useMemo(() => {
+    return [
+      { label: 'Transfer', value: 'TRANSFER' },
+      { label: 'Cash', value: 'CASH' },
+      { label: 'Card', value: 'CARD' },
+      { label: 'Cheque', value: 'CHEQUE' },
+      { label: 'Saldo', value: 'SALDO' },
+    ];
+  }, []);
+  const partyTypeOptions = useMemo(() => {
+    return [
+      { label: 'Customer', value: 'CUSTOMER' },
+      { label: 'Supplier', value: 'SUPPLIER' },
+    ];
+  }, []);
+  const sortByOptions = useMemo(() => {
+    return [
+      { label: 'Tanggal Pembayaran', value: 'payment_date' },
+      { label: 'Tanggal Dibuat', value: 'created_at' },
+    ];
+  }, []);
+  const { options: bankOptions, rawData: bankRawData } = useSelect<Bank>(
+    BankApi.basePath,
+    'id',
+    'alias',
+    '',
+    {
+      limit: 'limit',
+    }
+  );
+
+  // ===== Handler =====
+  const searchChangeHandler: ChangeEventHandler<HTMLInputElement> = (e) => {
+    setPendingFilters((prev) => ({ ...prev, search: e.target.value }));
+  };
+  const transactionTypeChangeHandler = (
+    val: OptionType | OptionType[] | null
+  ) => {
+    setSelectedTransactionType(val as OptionType);
+    setPendingFilters((prev) => ({
+      ...prev,
+      transactionType: val ? ((val as OptionType).value as string) : '',
+    }));
+  };
+  const bankChangeHandler = (val: OptionType | OptionType[] | null) => {
+    setSelectedBank(val as OptionType);
+    setPendingFilters((prev) => ({
+      ...prev,
+      bankId: val ? ((val as OptionType).value as string) : '',
+    }));
+  };
+  const partyTypeChangeHandler = (val: OptionType | OptionType[] | null) => {
+    setSelectedPartyType(val as OptionType);
+    setPendingFilters((prev) => ({
+      ...prev,
+      partyType: val ? ((val as OptionType).value as string) : '',
+    }));
+  };
+  const sortByChangeHandler = (val: OptionType | OptionType[] | null) => {
+    setSelectedSortBy(val as OptionType);
+    setPendingFilters((prev) => ({
+      ...prev,
+      sortBy: val ? ((val as OptionType).value as string) : '',
+    }));
+  };
+  const startDateChangeHandler: ChangeEventHandler<HTMLInputElement> = (e) => {
+    setPendingFilters((prev) => ({ ...prev, startDate: e.target.value }));
+  };
+  const endDateChangeHandler: ChangeEventHandler<HTMLInputElement> = (e) => {
+    setPendingFilters((prev) => ({ ...prev, endDate: e.target.value }));
+  };
+  const pageSizeChangeHandler = (val: OptionType | OptionType[] | null) => {
+    const newVal = val as OptionType;
+    setPageSize(newVal.value as number);
+  };
+  const submitFilterHandler = () => {
+    updateFilter('search', pendingFilters.search);
+    updateFilter('transactionType', pendingFilters.transactionType);
+    updateFilter('bankId', pendingFilters.bankId);
+    updateFilter('partyType', pendingFilters.partyType);
+    updateFilter('sortBy', pendingFilters.sortBy);
+    updateFilter('startDate', pendingFilters.startDate);
+    updateFilter('endDate', pendingFilters.endDate);
+  };
+  const resetFilterHandler = () => {
+    setSelectedTransactionType(null);
+    setSelectedBank(null);
+    setSelectedPartyType(null);
+    setSelectedSortBy(null);
+
+    const emptyFilters = {
+      search: '',
+      transactionType: '',
+      bankId: '',
+      partyType: '',
+      sortBy: '',
+      startDate: '',
+      endDate: '',
+    };
+    setPendingFilters(emptyFilters);
+
+    updateFilter('search', '');
+    updateFilter('transactionType', '');
+    updateFilter('bankId', '');
+    updateFilter('partyType', '');
+    updateFilter('sortBy', '');
+    updateFilter('startDate', '');
+    updateFilter('endDate', '');
+  };
+  const confirmationModalDeleteClickHandler = async () => {
+    setIsDeleteLoading(true);
+
+    await FinanceApi.delete(selectedFinance?.id as number);
+    refreshFinances();
+
+    deleteModal.closeModal();
+    toast.success('Successfully delete Finance!');
+    setIsDeleteLoading(false);
+  };
+
+  const columns = useMemo(() => {
+    return [
+      {
+        header: 'ID',
+        accessorKey: 'payment_code',
+      },
+      {
+        header: 'References Number',
+        accessorKey: 'reference_number',
+        cell: (props: CellContext<Finance, unknown>) => {
+          const value = props.row.original.reference_number;
+          return <span>{value ?? '-'}</span>;
+        },
+      },
+      {
+        header: 'Jenis Transaksi',
+        accessorKey: 'transaction_type',
+        cell: (props: CellContext<Finance, unknown>) => {
+          const value = props.row.original.transaction_type
+            .split('_')
+            .join(' ');
+          return <span>{formatTitleCase(value)}</span>;
+        },
+      },
+      {
+        header: 'Pihak',
+        accessorFn: (finance: Finance) => finance.party.name,
+        cell: (props: CellContext<Finance, unknown>) => {
+          if (props.row.original.party.id) {
+            return <span>{props.row.original.party.name}</span>;
+          }
+          return <span>{'-'}</span>;
+        },
+      },
+      {
+        header: 'Tanggal',
+        accessorFn: (finance: Finance) =>
+          formatDate(finance.payment_date, 'DD MMM YYYY'),
+      },
+      {
+        header: 'Metode Pembayaran',
+        accessorKey: 'payment_method',
+        cell: (props: CellContext<Finance, unknown>) => {
+          const value = props.row.original.payment_method.split('_').join(' ');
+          return <span>{formatTitleCase(value)}</span>;
+        },
+      },
+      {
+        header: 'Bank',
+        accessorFn: (finance: Finance) =>
+          `${finance.bank.alias} - ${finance.bank.account_number} - ${finance.bank.owner}`,
+      },
+      {
+        header: 'Pengeluaran (Rp)',
+        accessorFn: (finance: Finance) =>
+          formatCurrency(finance.expense_amount),
+      },
+      {
+        header: 'Pemasukan (Rp)',
+        accessorFn: (finance: Finance) => formatCurrency(finance.income_amount),
+      },
+      {
+        header: 'Aksi',
+        cell: (props: CellContext<Finance, unknown>) => {
+          const currentPageSize =
+            props.table.getPaginationRowModel().rows.length;
+          const currentPageRows = props.table.getPaginationRowModel().flatRows;
+          const currentRowRelativeIndex =
+            currentPageRows.findIndex((r) => r.id === props.row.id) + 1;
+
+          const isLast2Rows = currentRowRelativeIndex > currentPageSize - 2;
+
+          const deleteClickHandler = () => {
+            setSelectedFinance(props.row.original);
+            deleteModal.openModal();
+          };
+
+          return (
+            <>
+              {currentPageSize > 2 && (
+                <RowDropdownOptions isLast2Rows={isLast2Rows}>
+                  <RowOptionsMenu
+                    type='dropdown'
+                    props={props}
+                    deleteClickHandler={deleteClickHandler}
+                  />
+                </RowDropdownOptions>
+              )}
+
+              {currentPageSize <= 2 && (
+                <RowCollapseOptions>
+                  <RowOptionsMenu
+                    type='collapse'
+                    props={props}
+                    deleteClickHandler={deleteClickHandler}
+                  />
+                </RowCollapseOptions>
+              )}
+            </>
+          );
+        },
+      },
+    ];
+  }, []);
+  return (
+    <section className='size-full p-6 flex flex-col gap-6'>
+      <div className='flex justify-end gap-2'>
+        <RequirePermission permissions='lti.finance.injections.create'>
+          <Button
+            color='warning'
+            className='min-w-24'
+            href='/finance/add/injection'
+          >
+            Injection Saldo Bank
+          </Button>
+        </RequirePermission>
+        <RequirePermission permissions='lti.finance.initial_balances.create'>
+          <Button
+            color='info'
+            className='text-white min-w-24'
+            href='/finance/add/initial-balance'
+          >
+            Saldo Awal
+          </Button>
+        </RequirePermission>
+        <RequirePermission permissions='lti.finance.payments.create'>
+          <Button color='primary' className='min-w-24' href='/finance/add'>
+            Tambah
+          </Button>
+        </RequirePermission>
+      </div>
+      <Card
+        variant='bordered'
+        className={{
+          wrapper: 'w-full',
+        }}
+        footer={
+          <div className='flex justify-end gap-2'>
+            <Button
+              color='warning'
+              className='min-w-24'
+              onClick={resetFilterHandler}
+            >
+              Reset
+            </Button>
+            <Button
+              color='primary'
+              className='min-w-24'
+              onClick={submitFilterHandler}
+            >
+              Cari
+            </Button>
+          </div>
+        }
+      >
+        <div className='grid grid-cols-4 gap-6'>
+          <SelectInput
+            options={transactionTypeOptions}
+            label='Jenis Transaksi'
+            value={selectedTransactionType}
+            onChange={transactionTypeChangeHandler}
+            isClearable
+          />
+          <SelectInput
+            options={
+              isResponseSuccess(bankRawData)
+                ? bankOptions.map((bank) => ({
+                    label:
+                      bankRawData.data.find((data) => data.id === bank.value)
+                        ?.alias +
+                      ' - ' +
+                      bankRawData.data.find((data) => data.id === bank.value)
+                        ?.account_number +
+                      ' - ' +
+                      bankRawData.data.find((data) => data.id === bank.value)
+                        ?.owner,
+                    value: bank.value,
+                  }))
+                : []
+            }
+            label='Bank'
+            value={selectedBank}
+            onChange={bankChangeHandler}
+            isClearable
+          />
+          <SelectInput
+            options={partyTypeOptions}
+            label='Pihak'
+            value={selectedPartyType}
+            onChange={partyTypeChangeHandler}
+            isClearable
+          />
+          <DebouncedTextInput
+            name='search'
+            label='Cari'
+            placeholder='Cari'
+            value={pendingFilters.search}
+            onChange={searchChangeHandler}
+          />
+          <SelectInput
+            options={sortByOptions}
+            label='Urutkan Berdasarkan'
+            value={selectedSortBy}
+            onChange={sortByChangeHandler}
+            isClearable
+          />
+          <DateInput
+            name='startDate'
+            label='Periode Tanggal (Mulai)'
+            value={pendingFilters.startDate}
+            onChange={startDateChangeHandler}
+          />
+          <DateInput
+            name='endDate'
+            label='Periode Tanggal (Akhir)'
+            value={pendingFilters.endDate}
+            onChange={endDateChangeHandler}
+          />
+        </div>
+      </Card>
+      <Table<Finance>
+        data={isResponseSuccess(finances) ? finances.data : []}
+        columns={columns}
+        pageSize={tableFilterState.pageSize}
+        page={tableFilterState.page}
+        onPageChange={setPage}
+        onPageSizeChange={setPageSize}
+        totalItems={
+          isResponseSuccess(finances) ? finances.meta?.total_results : 0
+        }
+        isLoading={isLoading}
+      />
+      <ConfirmationModal
+        ref={deleteModal.ref}
+        type='error'
+        text={`Apakah anda yakin ingin menghapus data Finance ini (${selectedFinance?.payment_code})?`}
+        secondaryButton={{
+          text: 'Tidak',
+        }}
+        primaryButton={{
+          text: 'Ya',
+          color: 'error',
+          isLoading: isDeleteLoading,
+          onClick: confirmationModalDeleteClickHandler,
+        }}
+      />
+    </section>
+  );
+};
+
+export default FinanceTable;
diff --git a/src/components/pages/finance/add/FormFinanceAdd.schema.ts b/src/components/pages/finance/add/FormFinanceAdd.schema.ts
new file mode 100644
index 00000000..9aff81b9
--- /dev/null
+++ b/src/components/pages/finance/add/FormFinanceAdd.schema.ts
@@ -0,0 +1,67 @@
+import * as Yup from 'yup';
+import { OptionType } from '@/components/input/SelectInput';
+
+/**
+ * API Payload format:
+ * {
+    "party_id": 1,
+    "party_type": "CUSTOMER",
+    "payment_date": "2025-11-21",
+    "payment_method": "Transfer",
+    "bank_id": 1,
+    "reference_number": "DO.MBU.123",
+    "nominal": 25000000,
+    "notes": "Pembayaran piutang penjualan telur"
+  }
+ */
+
+// Type for form values (includes option objects for SelectInput)
+export type FinanceFormValues = {
+  party_type_option: OptionType | null;
+  party_id_option: OptionType | null;
+  party_account_number: string;
+  payment_date: string;
+  payment_method_option: OptionType | null;
+  bank_id_option: OptionType | null;
+  reference_number: string;
+  nominal: string;
+  notes: string;
+};
+
+export const FinanceFormSchema = Yup.object().shape({
+  party_type_option: Yup.mixed()
+    .nullable()
+    .test(
+      'is-valid-option',
+      'Jenis transaksi wajib diisi',
+      (value) => value !== null && value !== undefined
+    ),
+  party_id_option: Yup.mixed()
+    .nullable()
+    .test(
+      'is-valid-option',
+      'Pihak wajib diisi',
+      (value) => value !== null && value !== undefined
+    ),
+  party_account_number: Yup.string().required('Nomor rekening wajib diisi'),
+  payment_date: Yup.string().required('Tanggal pembayaran wajib diisi'),
+  payment_method_option: Yup.mixed()
+    .nullable()
+    .test(
+      'is-valid-option',
+      'Metode pembayaran wajib diisi',
+      (value) => value !== null && value !== undefined
+    ),
+  bank_id_option: Yup.mixed()
+    .nullable()
+    .test(
+      'is-valid-option',
+      'Bank wajib diisi',
+      (value) => value !== null && value !== undefined
+    ),
+  reference_number: Yup.string().required('Nomor referensi wajib diisi'),
+  nominal: Yup.string().required('Nominal wajib diisi'),
+  notes: Yup.string().required('Catatan wajib diisi'),
+});
+
+export const UpdateFinanceFormSchema = FinanceFormSchema;
diff --git a/src/components/pages/finance/add/FormFinanceAdd.tsx b/src/components/pages/finance/add/FormFinanceAdd.tsx
new file mode 100644
index 00000000..9b8259be
--- /dev/null
+++ b/src/components/pages/finance/add/FormFinanceAdd.tsx
@@ -0,0 +1,390 @@
+'use client';
+
+import Button from '@/components/Button';
+import Card from '@/components/Card';
+import { FormHeader } from '@/components/helper/form/FormHeader';
+import DateInput from '@/components/input/DateInput';
+import NumberInput from '@/components/input/NumberInput';
+import SelectInput, {
+  OptionType,
+  useSelect,
+} from '@/components/input/SelectInput';
+import TextArea from '@/components/input/TextArea';
+import TextInput from '@/components/input/TextInput';
+import {
+  FinanceFormSchema,
+  FinanceFormValues,
+} from '@/components/pages/finance/add/FormFinanceAdd.schema';
+import {
+  FINANCE_PARTY_TYPE_OPTIONS,
+  FINANCE_PAYMENT_METHOD_OPTIONS,
+} from '@/config/constant';
+import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
+import { formatDate, formatTitleCase } from '@/lib/helper';
+import { FinanceApi } from '@/services/api/finance';
+import { BankApi, CustomerApi, SupplierApi } from '@/services/api/master-data';
+import {
+  CreateFinancePayment,
+  Finance,
+  UpdateFinancePayment,
+} from '@/types/api/finance/finance';
+import { Bank } from '@/types/api/master-data/bank';
+import { useFormik } from 'formik';
+import { useRouter } from 'next/navigation';
+import { useCallback, useMemo } from 'react';
+import toast from 'react-hot-toast';
+
+interface FormFinanceAddProps {
+  type?: 'add' | 'edit';
+  initialValues?: Finance;
+}
+
+const FormFinanceAdd = ({
+  type = 'add',
+  initialValues,
+}: FormFinanceAddProps) => {
+  const router = useRouter();
+
+  // ===== Formik =====
+  const formikInitialValues = useMemo((): FinanceFormValues => {
+    return {
+      party_type_option:
+        FINANCE_PARTY_TYPE_OPTIONS.find(
+          (option) => option.value === initialValues?.party.type
+        ) || null,
+      party_id_option: {
+        label: initialValues?.party.name || '',
+        value: initialValues?.party.id || 0,
+      },
+      payment_date: initialValues?.payment_date || '',
+      payment_method_option:
+        FINANCE_PAYMENT_METHOD_OPTIONS.find(
+          (option) => option.value === initialValues?.payment_method
+        ) || null,
+      bank_id_option: initialValues?.bank
+        ? {
+            label: initialValues.bank.name,
+            value: initialValues.bank.id,
+          }
+        : null,
+      party_account_number: initialValues?.party.account_number || '',
+      reference_number: initialValues?.reference_number || '',
+      nominal: initialValues?.nominal.toString() || '',
+      notes: initialValues?.notes || '',
+    };
+  }, [initialValues]);
+
+  const formik = useFormik<FinanceFormValues>({
+    initialValues: formikInitialValues,
+    validationSchema: FinanceFormSchema,
+    validateOnChange: true,
+    validateOnBlur: true,
+    onSubmit: async (values) => {
+      const payload = transformFormValuesToPayload(values);
+
+      switch (type) {
+        case 'add':
+          await createFinance(payload);
+          break;
+
+        case 'edit':
+          if (initialValues?.id) {
+            await updateFinance(initialValues.id, payload);
+          }
+          break;
+      }
+    },
+  });
+
+  // ===== Options =====
+  const { options: partyOptions, isLoadingOptions: isLoadingPartyOptions } =
+    useSelect(
+      formik.values.party_type_option?.value === 'CUSTOMER'
+        ? CustomerApi.basePath
+        : SupplierApi.basePath,
+      'id',
+      'name',
+      '',
+      { limit: 'limit' }
+    );
+  const {
+    options: bankOptions,
+    rawData: bankRawData,
+    isLoadingOptions: isLoadingBankOptions,
+  } = useSelect<Bank>(BankApi.basePath, 'id', 'name', '', { limit: 'limit' });
+
+  // ===== Helper Functions =====
+  const transformFormValuesToPayload = (
+    values: FinanceFormValues
+  ): CreateFinancePayment => {
+    return {
+      party_id: Number(values.party_id_option?.value) || 0,
+      party_type: (values.party_type_option?.value as string) || '',
+      payment_date: formatDate(values.payment_date, 'YYYY-MM-DD'),
+      payment_method: (values.payment_method_option?.value as string) || '',
+      bank_id: Number(values.bank_id_option?.value) || 0,
+      reference_number: values.reference_number,
+      nominal: Number(values.nominal.replace(/\D/g, '')) || 0,
+      notes: values.notes,
+    };
+  };
+
+  // ===== Handler =====
+  const createFinance = useCallback(
+    async (payload: CreateFinancePayment) => {
+      const response = await FinanceApi.create(payload);
+
+      if (isResponseError(response)) {
+        toast.error(response.message);
+        return;
+      }
+
+      toast.success('Data berhasil ditambahkan');
+      router.refresh();
+      router.push('/finance');
+    },
+    [router]
+  );
+  const updateFinance = useCallback(
+    async (financeId: number, payload: UpdateFinancePayment) => {
+      const response = await FinanceApi.update(financeId, payload);
+
+      if (isResponseError(response)) {
+        toast.error(response.message);
+        return;
+      }
+
+      toast.success('Data berhasil diperbarui');
+      router.refresh();
+      router.push('/finance');
+    },
+    [router]
+  );
+
+  return (
+    <>
+      <section className='w-full max-w-xl mx-auto'>
+        <div className='flex flex-col gap-6 p-6'>
+          <FormHeader
+            title={`${type === 'add' ? 'Tambah' : 'Ubah'} Data Keuangan`}
+            backUrl='/finance'
+          />
+          <form className='flex flex-col gap-4' onSubmit={formik.handleSubmit}>
+            <SelectInput
+              label='Jenis Transaksi'
+              placeholder='Pilih jenis transaksi'
+              options={FINANCE_PARTY_TYPE_OPTIONS}
+              value={formik.values.party_type_option}
+              onChange={(value) => {
+                formik.setFieldValue('party_type_option', value);
+              }}
+              isError={Boolean(
+                formik.touched.party_type_option &&
+                  formik.errors.party_type_option
+              )}
+              errorMessage={
+                formik.touched.party_type_option &&
+                formik.errors.party_type_option
+                  ? formik.errors.party_type_option
+                  : ''
+              }
+              required
+              isClearable
+            />
+            <SelectInput
+              label={
+                formik.values.party_type_option?.value
+                  ? formatTitleCase(
+                      formik.values.party_type_option.value as string
+                    )
+                  : 'Pilih Jenis Transaksi Dahulu'
+              }
+              placeholder={`Pilih ${formik.values.party_type_option?.value ? formatTitleCase(formik.values.party_type_option.value as string) : 'jenis transaksi dahulu'}`}
+              options={partyOptions}
+              value={formik.values.party_id_option}
+              onChange={(value) => {
+                formik.setFieldValue('party_id_option', value);
+              }}
+              isLoading={isLoadingPartyOptions}
+              isError={Boolean(
+                formik.touched.party_id_option && formik.errors.party_id_option
+              )}
+              errorMessage={
+                formik.touched.party_id_option && formik.errors.party_id_option
+                  ? formik.errors.party_id_option
+                  : ''
+              }
+              required
+              isClearable
+              isDisabled={!formik.values.party_type_option?.value}
+            />
+            <DateInput
+              label='Tanggal'
+              placeholder='Pilih tanggal'
+              name='payment_date'
+              value={formik.values.payment_date}
+              onChange={formik.handleChange}
+              onBlur={formik.handleBlur}
+              isError={Boolean(
+                formik.touched.payment_date && formik.errors.payment_date
+              )}
+              errorMessage={
+                formik.touched.payment_date && formik.errors.payment_date
+                  ? formik.errors.payment_date
+                  : ''
+              }
+              required
+            />
+            <SelectInput
+              label='Metode Pembayaran'
+              placeholder='Pilih metode pembayaran'
+              options={FINANCE_PAYMENT_METHOD_OPTIONS}
+              value={formik.values.payment_method_option}
+              onChange={(value) => {
+                formik.setFieldValue('payment_method_option', value);
+              }}
+              isError={Boolean(
+                formik.touched.payment_method_option &&
+                  formik.errors.payment_method_option
+              )}
+              errorMessage={
+                formik.touched.payment_method_option &&
+                formik.errors.payment_method_option
+                  ? formik.errors.payment_method_option
+                  : ''
+              }
+              required
+              isClearable
+            />
+            <SelectInput
+              label='Bank'
+              placeholder='Pilih bank'
+              options={
+                isResponseSuccess(bankRawData)
+                  ? bankOptions.map((option) => ({
+                      label:
+                        bankRawData.data?.find(
+                          (item) => item.id === option.value
+                        )?.alias +
+                        ' - ' +
+                        bankRawData.data?.find(
+                          (item) => item.id === option.value
+                        )?.account_number +
+                        ' - ' +
+                        bankRawData.data?.find(
+                          (item) => item.id === option.value
+                        )?.owner,
+                      value: option.value,
+                    }))
+                  : []
+              }
+              value={formik.values.bank_id_option}
+              onChange={(value) => {
+                formik.setFieldValue('bank_id_option', value);
+              }}
+              isLoading={isLoadingBankOptions}
+              isError={Boolean(
+                formik.touched.bank_id_option && formik.errors.bank_id_option
+              )}
+              errorMessage={
+                formik.touched.bank_id_option && formik.errors.bank_id_option
+                  ? formik.errors.bank_id_option
+                  : ''
+              }
+              required
+              isClearable
+            />
+            <TextInput
+              label={`Nomor Rekening ${formik.values.party_type_option?.value ? formatTitleCase(formik.values.party_type_option.value as string) : 'Pihak'}`}
+              placeholder={`Masukkan nomor rekening ${formik.values.party_type_option?.value ? formatTitleCase(formik.values.party_type_option.value as string) : 'pihak'}`}
+              name='party_account_number'
+              value={formik.values.party_account_number}
+              onChange={formik.handleChange}
+              onBlur={formik.handleBlur}
+              isError={Boolean(
+                formik.touched.party_account_number &&
+                  formik.errors.party_account_number
+              )}
+              errorMessage={
+                formik.touched.party_account_number &&
+                formik.errors.party_account_number
+                  ? formik.errors.party_account_number
+                  : ''
+              }
+              required
+            />
+            <TextInput
+              label='Nomor Referensi'
+              placeholder='Masukkan nomor referensi'
+              name='reference_number'
+              value={formik.values.reference_number}
+              onChange={formik.handleChange}
+              onBlur={formik.handleBlur}
+              isError={Boolean(
+                formik.touched.reference_number &&
+                  formik.errors.reference_number
+              )}
+              errorMessage={
+                formik.touched.reference_number &&
+                formik.errors.reference_number
+                  ? formik.errors.reference_number
+                  : ''
+              }
+              required
+            />
+            <NumberInput
+              label='Nominal'
+              placeholder='Masukkan nominal'
+              name='nominal'
+              value={formik.values.nominal}
+              onChange={formik.handleChange}
+              onBlur={formik.handleBlur}
+              isError={Boolean(formik.touched.nominal && formik.errors.nominal)}
+              errorMessage={
+                formik.touched.nominal && formik.errors.nominal
+                  ? formik.errors.nominal
+                  : ''
+              }
+              required
+            />
+            <TextArea
+              label='Catatan'
+              placeholder='Masukkan catatan'
+              name='notes'
+              value={formik.values.notes}
+              onChange={formik.handleChange}
+              onBlur={formik.handleBlur}
+              isError={Boolean(formik.touched.notes && formik.errors.notes)}
+              errorMessage={
+                formik.touched.notes && formik.errors.notes
+                  ? formik.errors.notes
+                  : ''
+              }
+              required
+            />
+            <div className='flex justify-center gap-4'>
+              <Button
+                type='reset'
+                color='warning'
+                className='w-min-24'
+                onClick={() => formik.resetForm()}
+                disabled={formik.isSubmitting}
+              >
+                Reset
+              </Button>
+              <Button
+                type='submit'
+                className='w-min-24'
+                disabled={formik.isSubmitting || !formik.isValid}
+              >
+                Submit
+              </Button>
+            </div>
+          </form>
+        </div>
+      </section>
+    </>
+  );
+};
+
+export default FormFinanceAdd;
diff --git a/src/components/pages/finance/add/initial-balance/FormFinanceAddInitialBalance.schema.ts b/src/components/pages/finance/add/initial-balance/FormFinanceAddInitialBalance.schema.ts
new file mode 100644
index 00000000..c700f973
--- /dev/null
+++ b/src/components/pages/finance/add/initial-balance/FormFinanceAddInitialBalance.schema.ts
@@ -0,0 +1,62 @@
+import * as Yup from 'yup';
+import { OptionType } from '@/components/input/SelectInput';
+
+/**
+ * API Payload format for Initial Balance:
+ * {
+    "party_type": "CUSTOMER",
+    "party_id": 1,
+    "bank_id": 1,
+    "reference_number": "IB.MBU.001",
+    "initial_balance_type": "DEBIT",
+    "nominal": 5000000,
+    "note": "Saldo awal piutang customer"
+  }
+ */
+
+// Type for form values (includes option objects for SelectInput)
+export type InitialBalanceFormValues = {
+  party_type_option: OptionType | null;
+  party_id_option: OptionType | null;
+  bank_id_option: OptionType | null;
+  reference_number: string;
+  initial_balance_type_option: OptionType | null;
+  nominal: string;
+  note: string;
+};
+
+export const InitialBalanceFormSchema = Yup.object().shape({
+  party_type_option: Yup.mixed()
+    .nullable()
+    .test(
+      'is-valid-option',
+      'Jenis pihak wajib diisi',
+      (value) => value !== null && value !== undefined
+    ),
+  party_id_option: Yup.mixed()
+    .nullable()
+    .test(
+      'is-valid-option',
+      'Pihak wajib diisi',
+      (value) => value !== null && value !== undefined
+    ),
+  bank_id_option: Yup.mixed()
+    .nullable()
+    .test(
+      'is-valid-option',
+      'Bank wajib diisi',
+      (value) => value !== null && value !== undefined
+    ),
+  reference_number: Yup.string().required('Nomor referensi wajib diisi'),
+  initial_balance_type_option: Yup.mixed()
+    .nullable()
+    .test(
+      'is-valid-option',
+      'Tipe saldo awal wajib diisi',
+      (value) => value !== null && value !== undefined
+    ),
+  nominal: Yup.string().required('Nominal wajib diisi'),
+  note: Yup.string().required('Catatan wajib diisi'),
+});
+
+export const UpdateInitialBalanceFormSchema = InitialBalanceFormSchema;
diff --git a/src/components/pages/finance/add/initial-balance/FormFinanceAddInitialBalance.tsx b/src/components/pages/finance/add/initial-balance/FormFinanceAddInitialBalance.tsx
new file mode 100644
index 00000000..aa185647
--- /dev/null
+++ b/src/components/pages/finance/add/initial-balance/FormFinanceAddInitialBalance.tsx
@@ -0,0 +1,378 @@
+'use client';
+
+import Button from '@/components/Button';
+import { FormHeader } from '@/components/helper/form/FormHeader';
+import NumberInput from '@/components/input/NumberInput';
+import SelectInput, {
+  OptionType,
+  useSelect,
+} from '@/components/input/SelectInput';
+import TextArea from '@/components/input/TextArea';
+import TextInput from '@/components/input/TextInput';
+import {
+  InitialBalanceFormSchema,
+  InitialBalanceFormValues,
+} from '@/components/pages/finance/add/initial-balance/FormFinanceAddInitialBalance.schema';
+import {
+  FINANCE_INITIAL_BALANCE_TYPE_OPTIONS,
+  FINANCE_PARTY_TYPE_OPTIONS,
+} from '@/config/constant';
+import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
+import { formatTitleCase } from '@/lib/helper';
+import { FinanceApi } from '@/services/api/finance';
+import { BankApi, CustomerApi, SupplierApi } from '@/services/api/master-data';
+import {
+  CreateInitialBalance,
+  Finance,
+  UpdateInitialBalance,
+} from '@/types/api/finance/finance';
+import { Bank } from '@/types/api/master-data/bank';
+import { Icon } from '@iconify/react';
+import { useFormik } from 'formik';
+import { useRouter } from 'next/navigation';
+import { useCallback, useMemo } from 'react';
+import toast from 'react-hot-toast';
+
+interface FormFinanceAddInitialBalanceProps {
+  type?: 'add' | 'edit';
+  initialValues?: Finance;
+}
+
+const FormFinanceAddInitialBalance = ({
+  type = 'add',
+  initialValues,
+}: FormFinanceAddInitialBalanceProps) => {
+  const router = useRouter();
+
+  // ===== Formik =====
+  const formikInitialValues = useMemo((): InitialBalanceFormValues => {
+    // Type assertion to handle potential initial_balance_type field
+    const extendedInitialValues = initialValues as Finance & {
+      initial_balance_type?: string;
+    };
+
+    return {
+      party_type_option:
+        FINANCE_PARTY_TYPE_OPTIONS.find(
+          (option) => option.value === initialValues?.party.type
+        ) || null,
+      party_id_option: initialValues?.party
+        ? {
+            label: initialValues.party.name,
+            value: initialValues.party.id,
+          }
+        : null,
+      bank_id_option: initialValues?.bank
+        ? {
+            label: initialValues.bank.name,
+            value: initialValues.bank.id,
+          }
+        : null,
+      reference_number: initialValues?.reference_number || '',
+      initial_balance_type_option:
+        (initialValues?.nominal ?? 0) < 0
+          ? FINANCE_INITIAL_BALANCE_TYPE_OPTIONS.find(
+              (option) => option.value === 'NEGATIVE'
+            ) || null
+          : FINANCE_INITIAL_BALANCE_TYPE_OPTIONS.find(
+              (option) => option.value === 'POSITIVE'
+            ) || null,
+      nominal: initialValues?.nominal?.toString() || '',
+      note: initialValues?.notes || '',
+    };
+  }, [initialValues]);
+
+  const formik = useFormik<InitialBalanceFormValues>({
+    initialValues: formikInitialValues,
+    validationSchema: InitialBalanceFormSchema,
+    validateOnChange: true,
+    validateOnBlur: true,
+    onSubmit: async (values) => {
+      const payload = transformFormValuesToPayload(values);
+
+      switch (type) {
+        case 'add':
+          await createInitialBalance(payload);
+          break;
+
+        case 'edit':
+          if (initialValues?.id) {
+            await updateInitialBalance(initialValues.id, payload);
+          }
+          break;
+      }
+    },
+  });
+
+  // ===== Options =====
+  const { options: partyOptions, isLoadingOptions: isLoadingPartyOptions } =
+    useSelect(
+      formik.values.party_type_option?.value === 'CUSTOMER'
+        ? CustomerApi.basePath
+        : SupplierApi.basePath,
+      'id',
+      'name',
+      '',
+      { limit: 'limit' }
+    );
+  const {
+    options: bankOptions,
+    rawData: bankRawData,
+    isLoadingOptions: isLoadingBankOptions,
+  } = useSelect<Bank>(BankApi.basePath, 'id', 'name', '', { limit: 'limit' });
+
+  // ===== Helper Functions =====
+  const transformFormValuesToPayload = (
+    values: InitialBalanceFormValues
+  ): CreateInitialBalance => {
+    return {
+      party_type: (values.party_type_option?.value as string) || '',
+      party_id: Number(values.party_id_option?.value) || 0,
+      bank_id: Number(values.bank_id_option?.value) || 0,
+      reference_number: values.reference_number,
+      initial_balance_type:
+        (values.initial_balance_type_option?.value as string) || '',
+      nominal: Number(values.nominal.replace(/\D/g, '')) || 0,
+      note: values.note,
+    };
+  };
+
+  // ===== Handler =====
+  const createInitialBalance = useCallback(
+    async (payload: CreateInitialBalance) => {
+      const response = await FinanceApi.createInitialBalances(payload);
+
+      if (isResponseError(response)) {
+        toast.error(response.message);
+        return;
+      }
+
+      toast.success('Saldo awal berhasil ditambahkan');
+      router.refresh();
+      router.push('/finance');
+    },
+    [router]
+  );
+
+  const updateInitialBalance = useCallback(
+    async (financeId: number, payload: UpdateInitialBalance) => {
+      const response = await FinanceApi.updateInitialBalances(
+        financeId,
+        payload
+      );
+
+      if (isResponseError(response)) {
+        toast.error(response.message);
+        return;
+      }
+
+      toast.success('Saldo awal berhasil diperbarui');
+      router.refresh();
+      router.push('/finance');
+    },
+    [router]
+  );
+
+  return (
+    <>
+      <section className='w-full max-w-xl mx-auto'>
+        <div className='flex flex-col gap-6 p-6'>
+          <FormHeader
+            title={`${type === 'add' ? 'Tambah' : 'Ubah'} Saldo Awal`}
+            backUrl='/finance'
+          />
+          <form className='flex flex-col gap-4' onSubmit={formik.handleSubmit}>
+            <SelectInput
+              label='Jenis Pihak'
+              placeholder='Pilih jenis pihak'
+              options={FINANCE_PARTY_TYPE_OPTIONS}
+              value={formik.values.party_type_option}
+              onChange={(value) => {
+                formik.setFieldValue('party_type_option', value);
+              }}
+              isError={Boolean(
+                formik.touched.party_type_option &&
+                  formik.errors.party_type_option
+              )}
+              errorMessage={
+                formik.touched.party_type_option &&
+                formik.errors.party_type_option
+                  ? formik.errors.party_type_option
+                  : ''
+              }
+              required
+              isClearable
+            />
+            <SelectInput
+              label={
+                formik.values.party_type_option?.value
+                  ? formatTitleCase(
+                      formik.values.party_type_option.value as string
+                    )
+                  : 'Pilih Jenis Pihak Dahulu'
+              }
+              placeholder={`Pilih ${formik.values.party_type_option?.value ? formatTitleCase(formik.values.party_type_option.value as string) : 'jenis pihak dahulu'}`}
+              options={partyOptions}
+              value={formik.values.party_id_option}
+              onChange={(value) => {
+                formik.setFieldValue('party_id_option', value);
+              }}
+              isLoading={isLoadingPartyOptions}
+              isError={Boolean(
+                formik.touched.party_id_option && formik.errors.party_id_option
+              )}
+              errorMessage={
+                formik.touched.party_id_option && formik.errors.party_id_option
+                  ? formik.errors.party_id_option
+                  : ''
+              }
+              required
+              isClearable
+              isDisabled={!formik.values.party_type_option?.value}
+            />
+            <SelectInput
+              label='Bank'
+              placeholder='Pilih bank'
+              options={
+                isResponseSuccess(bankRawData)
+                  ? bankOptions.map((option) => ({
+                      label:
+                        bankRawData.data?.find(
+                          (item) => item.id === option.value
+                        )?.alias +
+                        ' - ' +
+                        bankRawData.data?.find(
+                          (item) => item.id === option.value
+                        )?.account_number +
+                        ' - ' +
+                        bankRawData.data?.find(
+                          (item) => item.id === option.value
+                        )?.owner,
+                      value: option.value,
+                    }))
+                  : []
+              }
+              value={formik.values.bank_id_option}
+              onChange={(value) => {
+                formik.setFieldValue('bank_id_option', value);
+              }}
+              isLoading={isLoadingBankOptions}
+              isError={Boolean(
+                formik.touched.bank_id_option && formik.errors.bank_id_option
+              )}
+              errorMessage={
+                formik.touched.bank_id_option && formik.errors.bank_id_option
+                  ? formik.errors.bank_id_option
+                  : ''
+              }
+              required
+              isClearable
+            />
+            <TextInput
+              label='Nomor Referensi'
+              placeholder='Masukkan nomor referensi'
+              name='reference_number'
+              value={formik.values.reference_number}
+              onChange={formik.handleChange}
+              onBlur={formik.handleBlur}
+              isError={Boolean(
+                formik.touched.reference_number &&
+                  formik.errors.reference_number
+              )}
+              errorMessage={
+                formik.touched.reference_number &&
+                formik.errors.reference_number
+                  ? formik.errors.reference_number
+                  : ''
+              }
+              required
+            />
+            <SelectInput
+              label='Tipe Saldo Awal'
+              placeholder='Pilih tipe saldo awal'
+              options={FINANCE_INITIAL_BALANCE_TYPE_OPTIONS}
+              value={formik.values.initial_balance_type_option}
+              onChange={(value) => {
+                formik.setFieldValue('initial_balance_type_option', value);
+              }}
+              isError={Boolean(
+                formik.touched.initial_balance_type_option &&
+                  formik.errors.initial_balance_type_option
+              )}
+              errorMessage={
+                formik.touched.initial_balance_type_option &&
+                formik.errors.initial_balance_type_option
+                  ? formik.errors.initial_balance_type_option
+                  : ''
+              }
+              required
+              isClearable
+            />
+            <NumberInput
+              label='Nominal'
+              placeholder='Masukkan nominal'
+              name='nominal'
+              value={formik.values.nominal}
+              onChange={formik.handleChange}
+              onBlur={formik.handleBlur}
+              isError={Boolean(formik.touched.nominal && formik.errors.nominal)}
+              errorMessage={
+                formik.touched.nominal && formik.errors.nominal
+                  ? formik.errors.nominal
+                  : ''
+              }
+              allowNegative={false}
+              startAdornment={
+                formik.values.initial_balance_type_option?.value ===
+                'POSITIVE' ? (
+                  <Icon icon='mdi:plus' />
+                ) : formik.values.initial_balance_type_option?.value ===
+                  'NEGATIVE' ? (
+                  <Icon icon='mdi:minus' />
+                ) : (
+                  ''
+                )
+              }
+              required
+            />
+            <TextArea
+              label='Catatan'
+              placeholder='Masukkan catatan'
+              name='note'
+              value={formik.values.note}
+              onChange={formik.handleChange}
+              onBlur={formik.handleBlur}
+              isError={Boolean(formik.touched.note && formik.errors.note)}
+              errorMessage={
+                formik.touched.note && formik.errors.note
+                  ? formik.errors.note
+                  : ''
+              }
+              required
+            />
+            <div className='flex justify-center gap-4'>
+              <Button
+                type='reset'
+                color='warning'
+                className='w-min-24'
+                onClick={() => formik.resetForm()}
+                disabled={formik.isSubmitting}
+              >
+                Reset
+              </Button>
+              <Button
+                type='submit'
+                className='w-min-24'
+                disabled={formik.isSubmitting || !formik.isValid}
+              >
+                Submit
+              </Button>
+            </div>
+          </form>
+        </div>
+      </section>
+    </>
+  );
+};
+
+export default FormFinanceAddInitialBalance;
diff --git a/src/components/pages/finance/add/injection/FormFinanceInjection.schema.ts b/src/components/pages/finance/add/injection/FormFinanceInjection.schema.ts
new file mode 100644
index 00000000..c6118af6
--- /dev/null
+++ b/src/components/pages/finance/add/injection/FormFinanceInjection.schema.ts
@@ -0,0 +1,25 @@
+import { OptionType } from '@/components/input/SelectInput';
+import * as Yup from 'yup';
+
+// Type for form values (includes option objects for SelectInput)
+export type InjectionFormValues = {
+  bank_id_option: OptionType | null;
+  adjustment_date: string;
+  nominal: string;
+  note: string;
+};
+
+export const InjectionFormSchema = Yup.object<InjectionFormValues>({
+  bank_id_option: Yup.mixed()
+    .nullable()
+    .test(
+      'is-valid-option',
+      'Bank wajib diisi',
+      (value) => value !== null && value !== undefined
+    ),
+  adjustment_date: Yup.string().required('Tanggal penyesuaian wajib diisi'),
+  nominal: Yup.string().required('Nominal wajib diisi'),
+  note: Yup.string().required('Catatan wajib diisi'),
+});
+
+export const UpdateInjectionFormSchema = InjectionFormSchema;
diff --git a/src/components/pages/finance/add/injection/FormFinanceInjection.tsx b/src/components/pages/finance/add/injection/FormFinanceInjection.tsx
new file mode 100644
index 00000000..1ad1a871
--- /dev/null
+++ b/src/components/pages/finance/add/injection/FormFinanceInjection.tsx
@@ -0,0 +1,251 @@
+'use client';
+
+import Button from '@/components/Button';
+import { FormHeader } from '@/components/helper/form/FormHeader';
+import DateInput from '@/components/input/DateInput';
+import NumberInput from '@/components/input/NumberInput';
+import SelectInput, {
+  OptionType,
+  useSelect,
+} from '@/components/input/SelectInput';
+import TextArea from '@/components/input/TextArea';
+import {
+  InjectionFormSchema,
+  InjectionFormValues,
+} from '@/components/pages/finance/add/injection/FormFinanceInjection.schema';
+import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
+import { formatDate } from '@/lib/helper';
+import { FinanceApi } from '@/services/api/finance';
+import { BankApi } from '@/services/api/master-data';
+import {
+  CreateInjection,
+  Finance,
+  UpdateInjection,
+} from '@/types/api/finance/finance';
+import { Bank } from '@/types/api/master-data/bank';
+import { useFormik } from 'formik';
+import { useRouter } from 'next/navigation';
+import { useCallback, useMemo } from 'react';
+import toast from 'react-hot-toast';
+
+interface FormFinanceInjectionProps {
+  type?: 'add' | 'edit';
+  initialValues?: Finance;
+}
+
+const FormFinanceInjection = ({
+  type = 'add',
+  initialValues,
+}: FormFinanceInjectionProps) => {
+  const router = useRouter();
+
+  // ===== Formik =====
+  const formikInitialValues = useMemo((): InjectionFormValues => {
+    return {
+      bank_id_option: initialValues?.bank
+        ? {
+            label: initialValues.bank.name,
+            value: initialValues.bank.id,
+          }
+        : null,
+      adjustment_date: initialValues?.payment_date || '',
+      nominal: initialValues?.nominal?.toString() || '',
+      note: initialValues?.notes || '',
+    };
+  }, [initialValues]);
+
+  const formik = useFormik<InjectionFormValues>({
+    initialValues: formikInitialValues,
+    validationSchema: InjectionFormSchema,
+    validateOnChange: true,
+    validateOnBlur: true,
+    onSubmit: async (values) => {
+      const payload = transformFormValuesToPayload(values);
+
+      switch (type) {
+        case 'add':
+          await createInjection(payload);
+          break;
+
+        case 'edit':
+          if (initialValues?.id) {
+            await updateInjection(initialValues.id, payload);
+          }
+          break;
+      }
+    },
+  });
+
+  // ===== Options =====
+  const {
+    options: bankOptions,
+    rawData: bankRawData,
+    isLoadingOptions: isLoadingBankOptions,
+  } = useSelect<Bank>(BankApi.basePath, 'id', 'name', '', { limit: 'limit' });
+
+  // ===== Helper Functions =====
+  const transformFormValuesToPayload = (
+    values: InjectionFormValues
+  ): CreateInjection => {
+    return {
+      bank_id: Number(values.bank_id_option?.value) || 0,
+      adjustment_date: formatDate(values.adjustment_date, 'YYYY-MM-DD'),
+      nominal: Number(values.nominal.replace(/\D/g, '')) || 0,
+      notes: values.note,
+    };
+  };
+
+  // ===== Handler =====
+  const createInjection = useCallback(
+    async (payload: CreateInjection) => {
+      const response = await FinanceApi.createInjections(payload);
+
+      if (isResponseError(response)) {
+        toast.error(response.message);
+        return;
+      }
+
+      toast.success('Injeksi dana berhasil ditambahkan');
+      router.refresh();
+      router.push('/finance');
+    },
+    [router]
+  );
+
+  const updateInjection = useCallback(
+    async (financeId: number, payload: UpdateInjection) => {
+      const response = await FinanceApi.updateInjections(financeId, payload);
+
+      if (isResponseError(response)) {
+        toast.error(response.message);
+        return;
+      }
+
+      toast.success('Injeksi dana berhasil diperbarui');
+      router.refresh();
+      router.push('/finance');
+    },
+    [router]
+  );
+
+  return (
+    <>
+      <section className='w-full max-w-xl mx-auto'>
+        <div className='flex flex-col gap-6 p-6'>
+          <FormHeader
+            title={`${type === 'add' ? 'Tambah' : 'Ubah'} Injeksi Dana`}
+            backUrl='/finance'
+          />
+          <form className='flex flex-col gap-4' onSubmit={formik.handleSubmit}>
+            <SelectInput
+              label='Bank'
+              placeholder='Pilih bank'
+              options={
+                isResponseSuccess(bankRawData)
+                  ? bankOptions.map((option) => ({
+                      label:
+                        bankRawData.data?.find(
+                          (item) => item.id === option.value
+                        )?.alias +
+                        ' - ' +
+                        bankRawData.data?.find(
+                          (item) => item.id === option.value
+                        )?.account_number +
+                        ' - ' +
+                        bankRawData.data?.find(
+                          (item) => item.id === option.value
+                        )?.owner,
+                      value: option.value,
+                    }))
+                  : []
+              }
+              value={formik.values.bank_id_option}
+              onChange={(value) => {
+                formik.setFieldValue('bank_id_option', value);
+              }}
+              isLoading={isLoadingBankOptions}
+              isError={Boolean(
+                formik.touched.bank_id_option && formik.errors.bank_id_option
+              )}
+              errorMessage={
+                formik.touched.bank_id_option && formik.errors.bank_id_option
+                  ? formik.errors.bank_id_option
+                  : ''
+              }
+              required
+              isClearable
+            />
+            <DateInput
+              label='Tanggal Penyesuaian'
+              placeholder='Pilih tanggal penyesuaian'
+              name='adjustment_date'
+              value={formik.values.adjustment_date}
+              onChange={formik.handleChange}
+              onBlur={formik.handleBlur}
+              isError={Boolean(
+                formik.touched.adjustment_date && formik.errors.adjustment_date
+              )}
+              errorMessage={
+                formik.touched.adjustment_date && formik.errors.adjustment_date
+                  ? formik.errors.adjustment_date
+                  : ''
+              }
+              required
+            />
+            <NumberInput
+              label='Nominal'
+              placeholder='Masukkan nominal'
+              name='nominal'
+              value={formik.values.nominal}
+              onChange={formik.handleChange}
+              onBlur={formik.handleBlur}
+              isError={Boolean(formik.touched.nominal && formik.errors.nominal)}
+              errorMessage={
+                formik.touched.nominal && formik.errors.nominal
+                  ? formik.errors.nominal
+                  : ''
+              }
+              allowNegative={true}
+              required
+            />
+            <TextArea
+              label='Catatan'
+              placeholder='Masukkan catatan'
+              name='note'
+              value={formik.values.note}
+              onChange={formik.handleChange}
+              onBlur={formik.handleBlur}
+              isError={Boolean(formik.touched.note && formik.errors.note)}
+              errorMessage={
+                formik.touched.note && formik.errors.note
+                  ? formik.errors.note
+                  : ''
+              }
+              required
+            />
+            <div className='flex justify-center gap-4'>
+              <Button
+                type='reset'
+                color='warning'
+                className='w-min-24'
+                onClick={() => formik.resetForm()}
+                disabled={formik.isSubmitting}
+              >
+                Reset
+              </Button>
+              <Button
+                type='submit'
+                className='w-min-24'
+                disabled={formik.isSubmitting || !formik.isValid}
+              >
+                Submit
+              </Button>
+            </div>
+          </form>
+        </div>
+      </section>
+    </>
+  );
+};
+
+export default FormFinanceInjection;
diff --git a/src/components/pages/inventory/adjustment/InventoryAdjustmentTable.tsx b/src/components/pages/inventory/adjustment/InventoryAdjustmentTable.tsx
index 7612a081..1bd47caf 100644
--- a/src/components/pages/inventory/adjustment/InventoryAdjustmentTable.tsx
+++ b/src/components/pages/inventory/adjustment/InventoryAdjustmentTable.tsx
@@ -79,18 +79,6 @@ const InventoryAdjustmentTable = () => {
           year: 'numeric',
         }),
     },
-    // {
-    //   id: 'before_quantity',
-    //   header: 'Stok Sebelum',
-    //   accessorFn: (row) =>
-    //     formatNumber(String(row.product_warehouse?.quantity)),
-    // },
-    // {
-    //   id: 'after_quantity',
-    //   header: 'Stok Sesudah',
-    //   accessorFn: (row) =>
-    //     formatNumber(String(row.product_warehouse?.quantity)),
-    // },
     {
       id: 'quantity',
       header: 'Kuantitas',
@@ -187,14 +175,6 @@ const InventoryAdjustmentTable = () => {
                   Tambah
                 </Button>
               </RequirePermission>
-
-              {/* <DebouncedTextInput
-                name='search'
-                placeholder='Cari Stock Adjustment'
-                value={tableFilterState.search}
-                onChange={searchChangeHandler}
-                className={{ wrapper: 'sm:max-w-3xs' }}
-              /> */}
             </div>
 
             <div className='flex flex-row justify-end'>
diff --git a/src/components/pages/marketing/MarketingTable.tsx b/src/components/pages/marketing/MarketingTable.tsx
index bb6c5569..f9cbdbfe 100644
--- a/src/components/pages/marketing/MarketingTable.tsx
+++ b/src/components/pages/marketing/MarketingTable.tsx
@@ -330,6 +330,7 @@ const MarketingTable = () => {
             value={pageSize}
             onChange={pageSizeChangeHandler}
             options={ROWS_OPTIONS}
+            className='flex sm:flex-row flex-col gap-3 items-end justify-end'
           >
             {/* select multiple product */}
             <SelectInput
diff --git a/src/components/pages/marketing/form/MarketingForm.tsx b/src/components/pages/marketing/form/MarketingForm.tsx
index 06c99800..d20269b4 100644
--- a/src/components/pages/marketing/form/MarketingForm.tsx
+++ b/src/components/pages/marketing/form/MarketingForm.tsx
@@ -576,7 +576,7 @@ const MarketingForm = ({
             wrapper: 'bg-white w-full',
           }}
         >
-          <div className='grid grid-cols-2 gap-3 mt-3'>
+          <div className='grid sm:grid-cols-2 gap-3 mt-3'>
             <SelectInput
               label='Pelanggan'
               options={customerOptions}
@@ -651,7 +651,7 @@ const MarketingForm = ({
           )}
 
         {/* Input Notes */}
-        <div className='grid grid-cols-2 gap-3'>
+        <div className='grid sm:grid-cols-2 gap-3'>
           <DebouncedTextArea
             required
             name='notes'
diff --git a/src/components/pages/marketing/form/repeater/delivery-order/DeliverOrderProduct.tsx b/src/components/pages/marketing/form/repeater/delivery-order/DeliverOrderProduct.tsx
index 2dae2da5..f169eb3c 100644
--- a/src/components/pages/marketing/form/repeater/delivery-order/DeliverOrderProduct.tsx
+++ b/src/components/pages/marketing/form/repeater/delivery-order/DeliverOrderProduct.tsx
@@ -193,7 +193,7 @@ const DeliveryOrderProductForm = ({
           </div>
         )}
 
-        <div className='grid grid-cols-2 gap-4'>
+        <div className='grid sm:grid-cols-2 gap-4'>
           <SelectInput
             options={options}
             label='Produk'
diff --git a/src/components/pages/marketing/form/repeater/sales-order/SalesOrderProductForm.tsx b/src/components/pages/marketing/form/repeater/sales-order/SalesOrderProductForm.tsx
index e1eec98d..ad50a927 100644
--- a/src/components/pages/marketing/form/repeater/sales-order/SalesOrderProductForm.tsx
+++ b/src/components/pages/marketing/form/repeater/sales-order/SalesOrderProductForm.tsx
@@ -183,7 +183,7 @@ const SalesOrderProductForm = ({
         {/* <small className='block text-rose-500'>
           {JSON.stringify(formik.errors)}
         </small> */}
-        <div className='grid grid-cols-2 gap-4 z-200'>
+        <div className='grid sm:grid-cols-2 gap-4 z-200'>
           <PatternInput
             name='vehicle_number'
             label='No. Polisi'
diff --git a/src/components/pages/master-data/production-standard/ProductionStandardTable.tsx b/src/components/pages/master-data/production-standard/ProductionStandardTable.tsx
new file mode 100644
index 00000000..afa41295
--- /dev/null
+++ b/src/components/pages/master-data/production-standard/ProductionStandardTable.tsx
@@ -0,0 +1,217 @@
+'use client';
+
+import Button from '@/components/Button';
+import { FormHeader } from '@/components/helper/form/FormHeader';
+import Table, { TABLE_DEFAULT_STYLING } from '@/components/Table';
+import { ProductionStandard } from '@/types/api/master-data/production-standard';
+import { Icon } from '@iconify/react';
+import useSWR from 'swr';
+import { ProductionStandardApi } from '@/services/api/master-data';
+import { isResponseSuccess } from '@/lib/api-helper';
+import RowOptionsMenuWrapper from '@/components/table/RowOptionsMenuWrapper';
+import { CellContext } from '@tanstack/react-table';
+import { useModal } from '@/components/Modal';
+import { useState } from 'react';
+import RowDropdownOptions from '@/components/table/RowDropdownOptions';
+import RowCollapseOptions from '@/components/table/RowCollapseOptions';
+import ConfirmationModal from '@/components/modal/ConfirmationModal';
+import toast from 'react-hot-toast';
+import { cn } from '@/lib/helper';
+import RequirePermission from '@/components/helper/RequirePermission';
+
+const RowOptionsMenu = ({
+  type = 'dropdown',
+  props,
+  deleteClickHandler,
+}: {
+  type: 'dropdown' | 'collapse';
+  props: CellContext<ProductionStandard, unknown>;
+  deleteClickHandler: () => void;
+}) => {
+  return (
+    <RowOptionsMenuWrapper type={type}>
+      <RequirePermission permissions='lti.master.production_standards.detail'>
+        <Button
+          href={`/master-data/production-standard/detail/?productionStandardId=${props.row.original.id}`}
+          variant='ghost'
+          color='primary'
+          className='justify-start text-sm'
+        >
+          <Icon icon='mdi:eye-outline' width={16} height={16} />
+          Detail
+        </Button>
+      </RequirePermission>
+
+      <RequirePermission permissions='lti.master.production_standards.update'>
+        <Button
+          href={`/master-data/production-standard/detail/edit/?productionStandardId=${props.row.original.id}`}
+          variant='ghost'
+          color='warning'
+          className='justify-start text-sm'
+        >
+          <Icon icon='material-symbols:edit-outline' width={16} height={16} />
+          Edit
+        </Button>
+      </RequirePermission>
+
+      <RequirePermission permissions='lti.master.production_standards.delete'>
+        <Button
+          onClick={deleteClickHandler}
+          variant='ghost'
+          color='error'
+          className='text-error hover:text-inherit'
+        >
+          <Icon
+            icon='material-symbols:delete-outline-rounded'
+            width={16}
+            height={16}
+            className='justify-start text-sm'
+          />
+          Delete
+        </Button>
+      </RequirePermission>
+    </RowOptionsMenuWrapper>
+  );
+};
+
+const ProductionStandardTable = () => {
+  const deleteModal = useModal();
+
+  const [selectedProductionStandard, setSelectedProductionStandard] = useState<
+    ProductionStandard | undefined
+  >(undefined);
+  const [isDeleteLoading, setIsDeleteLoading] = useState(false);
+
+  const {
+    data: productionStandards,
+    isLoading: productionStandardsLoading,
+    mutate: refreshProductionStandards,
+  } = useSWR(
+    `${ProductionStandardApi.basePath}`,
+    ProductionStandardApi.getAllFetcher
+  );
+
+  const confirmationModalDeleteClickHandler = async () => {
+    setIsDeleteLoading(true);
+
+    await ProductionStandardApi.delete(
+      selectedProductionStandard?.id as number
+    );
+    refreshProductionStandards();
+
+    deleteModal.closeModal();
+    toast.success('Successfully delete Production Standard!');
+    setIsDeleteLoading(false);
+  };
+
+  return (
+    <>
+      <div className='flex flex-col gap-6 p-6'>
+        <div className='flex flex-row gap-6 justify-start'>
+          <RequirePermission permissions='lti.master.production_standards.create'>
+            <Button
+              href='/master-data/production-standard/add'
+              variant='outline'
+            >
+              <Icon icon='mdi:plus' /> Tambah
+            </Button>
+          </RequirePermission>
+        </div>
+        <RequirePermission permissions='lti.master.production_standards.list'>
+          <Table<ProductionStandard>
+            data={
+              isResponseSuccess(productionStandards)
+                ? productionStandards.data
+                : []
+            }
+            columns={[
+              {
+                header: 'No',
+                accessorFn: (row, index) => index + 1,
+              },
+              {
+                header: 'Nama',
+                accessorKey: 'name',
+              },
+              {
+                header: 'Kategori',
+                accessorFn: (row) => row.project_category,
+              },
+              {
+                header: 'Aksi',
+                cell: (props) => {
+                  const currentPageSize =
+                    props.table.getPaginationRowModel().rows.length;
+                  const currentPageRows =
+                    props.table.getPaginationRowModel().flatRows;
+                  const currentRowRelativeIndex =
+                    currentPageRows.findIndex((r) => r.id === props.row.id) + 1;
+
+                  const isLast2Rows =
+                    currentRowRelativeIndex > currentPageSize - 2;
+
+                  const deleteClickHandler = () => {
+                    setSelectedProductionStandard(props.row.original);
+                    deleteModal.openModal();
+                  };
+
+                  return (
+                    <>
+                      {currentPageSize > 2 && (
+                        <RowDropdownOptions isLast2Rows={isLast2Rows}>
+                          <RowOptionsMenu
+                            type='dropdown'
+                            props={props}
+                            deleteClickHandler={deleteClickHandler}
+                          />
+                        </RowDropdownOptions>
+                      )}
+
+                      {currentPageSize <= 2 && (
+                        <RowCollapseOptions>
+                          <RowOptionsMenu
+                            type='collapse'
+                            props={props}
+                            deleteClickHandler={deleteClickHandler}
+                          />
+                        </RowCollapseOptions>
+                      )}
+                    </>
+                  );
+                },
+              },
+            ]}
+            className={{
+              headerColumnClassName: cn(
+                TABLE_DEFAULT_STYLING.headerColumnClassName,
+                'last:flex last:flex-row last:justify-end'
+              ),
+              bodyColumnClassName: cn(
+                TABLE_DEFAULT_STYLING.bodyColumnClassName,
+                'last:flex last:flex-row last:justify-end'
+              ),
+            }}
+          />
+        </RequirePermission>
+      </div>
+      <RequirePermission permissions='lti.master.production_standards.delete'>
+        <ConfirmationModal
+          ref={deleteModal.ref}
+          type='error'
+          text={`Apakah anda yakin ingin menghapus data Production Standard ini (${selectedProductionStandard?.name})?`}
+          secondaryButton={{
+            text: 'Tidak',
+          }}
+          primaryButton={{
+            text: 'Ya',
+            color: 'error',
+            isLoading: isDeleteLoading,
+            onClick: confirmationModalDeleteClickHandler,
+          }}
+        />
+      </RequirePermission>
+    </>
+  );
+};
+
+export default ProductionStandardTable;
diff --git a/src/components/pages/master-data/production-standard/form/ProductionStandardForm.schema.ts b/src/components/pages/master-data/production-standard/form/ProductionStandardForm.schema.ts
new file mode 100644
index 00000000..6fc3799b
--- /dev/null
+++ b/src/components/pages/master-data/production-standard/form/ProductionStandardForm.schema.ts
@@ -0,0 +1,91 @@
+import * as Yup from 'yup';
+
+// Schema for LAYING category (production_standard_details is required)
+const LayingRepeaterFormSchema = Yup.object({
+  week: Yup.number().required('Minggu wajib diisi!'),
+  production_standard_uniformity_details: Yup.object({
+    target_mean_bw: Yup.number().required('Berat rata-rata wajib diisi!'),
+    max_depletion: Yup.number().required('Maksimal depletion wajib diisi!'),
+    min_uniformity: Yup.number().required('Minimal uniformitas wajib diisi!'),
+    feed_intake: Yup.number().required('Pengambilan makanan wajib diisi!'),
+  }),
+  production_standard_details: Yup.object({
+    target_hen_day_production: Yup.number().required(
+      'Produksi telur per hari wajib diisi!'
+    ),
+    target_hen_house_production: Yup.number().required(
+      'Produksi telur per kandang wajib diisi!'
+    ),
+    target_egg_weight: Yup.number().required('Berat telur wajib diisi!'),
+    target_egg_mass: Yup.number().required('Massa telur wajib diisi!'),
+  }).required(),
+});
+
+// Schema for GROWING category (production_standard_details is optional)
+const GrowingRepeaterFormSchema = Yup.object({
+  week: Yup.number().required('Minggu wajib diisi!'),
+  production_standard_uniformity_details: Yup.object({
+    target_mean_bw: Yup.number().required('Berat rata-rata wajib diisi!'),
+    max_depletion: Yup.number().required('Maksimal depletion wajib diisi!'),
+    min_uniformity: Yup.number().required('Minimal uniformitas wajib diisi!'),
+    feed_intake: Yup.number().required('Pengambilan makanan wajib diisi!'),
+  }),
+  production_standard_details: Yup.object({
+    target_hen_day_production: Yup.number().optional(),
+    target_hen_house_production: Yup.number().optional(),
+    target_egg_weight: Yup.number().optional(),
+    target_egg_mass: Yup.number().optional(),
+  }).optional(),
+});
+
+// Explicit types for better type inference
+export type LayingRepeaterFormValues = Yup.InferType<
+  typeof LayingRepeaterFormSchema
+>;
+export type GrowingRepeaterFormValues = Yup.InferType<
+  typeof GrowingRepeaterFormSchema
+>;
+
+// Union type for repeater form values
+export type ProductionStandardRepeaterFormSchemaValues =
+  | LayingRepeaterFormValues
+  | GrowingRepeaterFormValues;
+
+// Dynamic schema factory for repeater form based on project category
+export const createProductionStandardRepeaterFormSchema = (
+  category: string
+) => {
+  // For LAYING category, production_standard_details is required
+  if (category === 'LAYING') {
+    return LayingRepeaterFormSchema;
+  }
+
+  // For GROWING category, production_standard_details is optional
+  return GrowingRepeaterFormSchema;
+};
+
+// Dynamic schema factory for main form based on project category
+export const createProductionStandardFormSchema = (category: string) => {
+  return Yup.object({
+    name: Yup.string().required('Nama wajib diisi!'),
+    project_category: Yup.string().required('Kategori proyek wajib diisi!'),
+    details: Yup.array().of(
+      createProductionStandardRepeaterFormSchema(category)
+    ),
+  });
+};
+
+// Static schemas for backward compatibility (default to LAYING)
+export const ProductionStandardFormSchema =
+  createProductionStandardFormSchema('LAYING');
+
+export const UpdateProductionStandardFormSchema = ProductionStandardFormSchema;
+
+export type ProductionStandardFormValues = Yup.InferType<
+  typeof ProductionStandardFormSchema
+>;
+
+export const ProductionStandardRepeaterFormSchema = LayingRepeaterFormSchema;
+
+export const UpdateProductionStandardRepeaterFormSchema =
+  ProductionStandardRepeaterFormSchema;
diff --git a/src/components/pages/master-data/production-standard/form/ProductionStandardForm.tsx b/src/components/pages/master-data/production-standard/form/ProductionStandardForm.tsx
new file mode 100644
index 00000000..99edb852
--- /dev/null
+++ b/src/components/pages/master-data/production-standard/form/ProductionStandardForm.tsx
@@ -0,0 +1,1247 @@
+'use client';
+
+import Button from '@/components/Button';
+import { FormHeader } from '@/components/helper/form/FormHeader';
+import NumberInput from '@/components/input/NumberInput';
+import SelectInput, { OptionType } from '@/components/input/SelectInput';
+import TextInput from '@/components/input/TextInput';
+import {
+  ProductionStandardRepeaterFormSchemaValues,
+  ProductionStandardFormValues,
+  createProductionStandardRepeaterFormSchema,
+} from '@/components/pages/master-data/production-standard/form/ProductionStandardForm.schema';
+import Table, { TABLE_DEFAULT_STYLING } from '@/components/Table';
+import { FLOCK_CATEGORY_OPTIONS } from '@/config/constant';
+import { cn } from '@/lib/helper';
+import {
+  ProductionStandard,
+  StandardDetails,
+} from '@/types/api/master-data/production-standard';
+import { Icon } from '@iconify/react';
+import { useFormik } from 'formik';
+import { useCallback, useEffect, useMemo, useState } from 'react';
+import { useFormStore } from '@/stores/form/form.store';
+import { ColumnDef } from '@tanstack/react-table';
+import { useRouter } from 'next/navigation';
+import { ProductionStandardApi } from '@/services/api/master-data';
+import { isResponseError } from '@/lib/api-helper';
+import toast from 'react-hot-toast';
+import ConfirmationModal from '@/components/modal/ConfirmationModal';
+import { useModal } from '@/components/Modal';
+import RequirePermission from '@/components/helper/RequirePermission';
+
+type TableRowsType = {
+  customRow: boolean;
+  placeHolder: string;
+} & ProductionStandardRepeaterFormSchemaValues;
+
+// Type-safe helper to check if production_standard_details errors exist
+type ProductionDetailsErrors = {
+  target_hen_day_production?: string;
+  target_hen_house_production?: string;
+  target_egg_weight?: string;
+  target_egg_mass?: string;
+};
+
+type ProductionDetailsTouched = {
+  target_hen_day_production?: boolean;
+  target_hen_house_production?: boolean;
+  target_egg_weight?: boolean;
+  target_egg_mass?: boolean;
+};
+
+const getProductionDetailsError = (
+  errors: unknown,
+  field: keyof ProductionDetailsErrors
+): string | undefined => {
+  if (errors && typeof errors === 'object' && field in errors) {
+    return (errors as ProductionDetailsErrors)[field];
+  }
+  return undefined;
+};
+
+const getProductionDetailsTouched = (
+  touched: unknown,
+  field: keyof ProductionDetailsTouched
+): boolean => {
+  if (touched && typeof touched === 'object' && field in touched) {
+    return Boolean((touched as ProductionDetailsTouched)[field]);
+  }
+  return false;
+};
+
+const convertPayloadToNumberTypes = (payload: ProductionStandardFormValues) => {
+  return {
+    ...payload,
+    details: payload.details?.map((detail) => ({
+      ...detail,
+      week: Number(detail.week),
+      production_standard_details: detail.production_standard_details
+        ? {
+            ...detail.production_standard_details,
+            target_hen_day_production: Number(
+              detail.production_standard_details.target_hen_day_production
+            ),
+            target_hen_house_production: Number(
+              detail.production_standard_details.target_hen_house_production
+            ),
+            target_egg_weight: Number(
+              detail.production_standard_details.target_egg_weight
+            ),
+            target_egg_mass: Number(
+              detail.production_standard_details.target_egg_mass
+            ),
+          }
+        : undefined,
+      production_standard_uniformity_details: {
+        ...detail.production_standard_uniformity_details,
+        target_mean_bw: Number(
+          detail.production_standard_uniformity_details.target_mean_bw
+        ),
+        max_depletion: Number(
+          detail.production_standard_uniformity_details.max_depletion
+        ),
+        min_uniformity: Number(
+          detail.production_standard_uniformity_details.min_uniformity
+        ),
+        feed_intake: Number(
+          detail.production_standard_uniformity_details.feed_intake
+        ),
+      },
+    })),
+  };
+};
+
+const convertStandardValueToFormValues = (
+  details: StandardDetails[]
+): ProductionStandardRepeaterFormSchemaValues[] => {
+  return details.map((detail) => ({
+    week: detail.week,
+    production_standard_details: detail.egg_production_standard_detail
+      ? {
+          target_hen_day_production: Number(
+            detail.egg_production_standard_detail.target_hen_day_production
+          ),
+          target_hen_house_production: Number(
+            detail.egg_production_standard_detail.target_hen_house_production
+          ),
+          target_egg_weight: Number(
+            detail.egg_production_standard_detail.target_egg_weight
+          ),
+          target_egg_mass: Number(
+            detail.egg_production_standard_detail.target_egg_mass
+          ),
+        }
+      : undefined,
+    production_standard_uniformity_details: {
+      target_mean_bw: Number(detail.growth_standard_detail.target_mean_bw),
+      max_depletion: Number(detail.growth_standard_detail.max_depletion),
+      min_uniformity: Number(detail.growth_standard_detail.min_uniformity),
+      feed_intake: Number(detail.growth_standard_detail.feed_intake),
+    },
+  }));
+};
+
+const ProductionStandardForm = ({
+  formType = 'add',
+  initialValue,
+  afterSubmit,
+}: {
+  formType: 'add' | 'edit' | 'detail';
+  initialValue?: ProductionStandard;
+  afterSubmit?: () => void;
+}) => {
+  // ===== State =====
+  const [editMode, setEditMode] = useState(false);
+  const [editIndex, setEditIndex] = useState<number | null>(null); // Stores week number, not array index
+  const [isTableExpanded, setIsTableExpanded] = useState(false);
+  const [isDeleteLoading, setIsDeleteLoading] = useState(false);
+  const [isAddingRow, setIsAddingRow] = useState(false);
+  const deleteModal = useModal();
+  const [
+    productionStandardFormErrorMessage,
+    setProductionStandardFormErrorMessage,
+  ] = useState('');
+  const router = useRouter();
+
+  // ===== Store =====
+  const {
+    formData,
+    setFormData,
+    addDetail,
+    updateDetail,
+    deleteDetail,
+    clearCache,
+  } = useFormStore();
+
+  // ===== Formik =====
+  const formikInitialValues = useMemo(() => {
+    // For add mode, merge cached data with initial values
+    if (formType === 'add' && formData) {
+      return {
+        name: formData.name || '',
+        project_category: formData.project_category || '',
+        details: formData.details || [],
+      } as ProductionStandardFormValues;
+    }
+
+    return {
+      name: initialValue?.name || '',
+      project_category: initialValue?.project_category || '',
+      details: convertStandardValueToFormValues(initialValue?.details || []),
+    } as ProductionStandardFormValues;
+  }, [initialValue, formData, formType]);
+  const formik = useFormik<ProductionStandardFormValues>({
+    initialValues: formikInitialValues as ProductionStandardFormValues,
+    enableReinitialize: true,
+    onSubmit: (values) => {
+      switch (formType) {
+        case 'add':
+          handleSubmit(convertPayloadToNumberTypes(values));
+          break;
+        case 'edit':
+          handleUpdate(
+            initialValue?.id as number,
+            convertPayloadToNumberTypes(values)
+          );
+          break;
+        default:
+          break;
+      }
+      afterSubmit?.();
+    },
+  });
+  const { setValues: formikSetValues } = formik;
+
+  // ===== Formik Repeater =====
+  const repeaterFormikInitialValues = useMemo(() => {
+    return {
+      week: '' as unknown as number,
+      production_standard_details: {
+        target_hen_day_production: '' as unknown as number,
+        target_hen_house_production: '' as unknown as number,
+        target_egg_weight: '' as unknown as number,
+        target_egg_mass: '' as unknown as number,
+      },
+      production_standard_uniformity_details: {
+        target_mean_bw: '' as unknown as number,
+        max_depletion: '' as unknown as number,
+        min_uniformity: '' as unknown as number,
+        feed_intake: '' as unknown as number,
+      },
+    };
+  }, []);
+  const repeaterValidationSchema = useMemo(
+    () =>
+      createProductionStandardRepeaterFormSchema(
+        formik.values.project_category || 'LAYING'
+      ),
+    [formik.values.project_category]
+  );
+
+  const repeaterFormik = useFormik<ProductionStandardRepeaterFormSchemaValues>({
+    initialValues:
+      repeaterFormikInitialValues as unknown as ProductionStandardRepeaterFormSchemaValues,
+    validationSchema: repeaterValidationSchema,
+    enableReinitialize: true,
+    onSubmit: (values) => {
+      if (editMode && editIndex !== null) {
+        handleUpdateRow(editIndex, values);
+      } else {
+        handleAddRow(values);
+      }
+    },
+  });
+  const { setValues: repeaterFormikSetValues } = repeaterFormik;
+
+  // ===== Effect =====
+  // Load initial values only when component mounts or when initialValue changes (for edit mode)
+  // This allows:
+  // 1. Add mode: Load cached data from formData store
+  // 2. Edit mode: Load existing data from initialValue
+  // We use initialValue?.id as dependency to avoid infinite loops
+  useEffect(() => {
+    if (formType === 'add' && formData) {
+      // For add mode, load from cache
+      formikSetValues({
+        name: formData.name || '',
+        project_category: formData.project_category || '',
+        details: formData.details || [],
+      } as ProductionStandardFormValues);
+    } else if (formType === 'detail' && initialValue) {
+      // For detail mode, load from initialValue and convert the details
+      formikSetValues({
+        name: initialValue.name || '',
+        project_category: initialValue.project_category || '',
+        details: convertStandardValueToFormValues(initialValue.details || []),
+      } as ProductionStandardFormValues);
+    } else if (formType === 'edit' && initialValue) {
+      // For edit mode, load from initialValue and convert the details
+      formikSetValues({
+        name: initialValue.name || '',
+        project_category: initialValue.project_category || '',
+        details: convertStandardValueToFormValues(initialValue.details || []),
+      } as ProductionStandardFormValues);
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [formData, initialValue?.id]); // Trigger when formData or initialValue.id changes
+
+  // ===== Data Table =====
+  const tableRows = useMemo(() => {
+    const details = formik.values.details || [];
+    const rows: TableRowsType[] = [];
+
+    // Show placeholder if no details
+    if (details.length == 0) {
+      rows.push({
+        customRow: true,
+        placeHolder: 'Masukkan data standard produksi',
+      } as TableRowsType);
+    } else {
+      // Sort details by week in ascending order
+      const sortedDetails = [...details].sort((a, b) => {
+        const weekA = Number(a.week) || 0;
+        const weekB = Number(b.week) || 0;
+        return weekA - weekB;
+      });
+
+      // Show actual data rows (sorted)
+      sortedDetails.forEach((detail) => {
+        rows.push(detail as TableRowsType);
+      });
+    }
+
+    // Always add repeater form row at the end
+    if (formType !== 'detail') {
+      rows.push({
+        customRow: true,
+        placeHolder: '',
+      } as TableRowsType);
+    }
+
+    return rows;
+  }, [formik.values.details]);
+  const columns = useMemo<ColumnDef<TableRowsType>[]>(() => {
+    const baseColumns: ColumnDef<TableRowsType>[] = [
+      {
+        header: 'No',
+        accessorFn: (row, index) => index + 1,
+        enableSorting: false,
+      },
+      {
+        header: 'Minggu',
+        accessorKey: 'week',
+        enableSorting: false,
+      },
+    ];
+
+    // Conditionally add production_standard_details columns for LAYING category
+    const productionColumns: ColumnDef<TableRowsType>[] =
+      formik.values.project_category === 'LAYING'
+        ? [
+            {
+              header: 'Hen Day',
+              accessorFn: (row) =>
+                row.production_standard_details?.target_hen_day_production,
+              enableSorting: false,
+            },
+            {
+              header: 'Hen House',
+              accessorFn: (row) =>
+                row.production_standard_details?.target_hen_house_production,
+              enableSorting: false,
+            },
+            {
+              header: 'Egg Weight',
+              accessorFn: (row) =>
+                row.production_standard_details?.target_egg_weight,
+              enableSorting: false,
+            },
+            {
+              header: 'Egg Mass',
+              accessorFn: (row) =>
+                row.production_standard_details?.target_egg_mass,
+              enableSorting: false,
+            },
+          ]
+        : [];
+
+    // Uniformity columns (always shown)
+    const uniformityColumns: ColumnDef<TableRowsType>[] = [
+      {
+        header: 'Mean BW',
+        accessorFn: (row) =>
+          row.production_standard_uniformity_details?.target_mean_bw,
+        enableSorting: false,
+      },
+      {
+        header: 'Max Depletion',
+        accessorFn: (row) =>
+          row.production_standard_uniformity_details?.max_depletion,
+        enableSorting: false,
+      },
+      {
+        header: 'Min Uniformity',
+        accessorFn: (row) =>
+          row.production_standard_uniformity_details?.min_uniformity,
+        enableSorting: false,
+      },
+      {
+        header: 'Feed Intake',
+        accessorFn: (row) =>
+          row.production_standard_uniformity_details?.feed_intake,
+        enableSorting: false,
+      },
+    ];
+
+    // Action column
+    const actionColumn: ColumnDef<TableRowsType> = {
+      header: 'Aksi',
+      cell: (row) => {
+        // Don't show action buttons for custom rows or in detail mode
+        if (row.row.original.customRow || formType === 'detail') return null;
+
+        return (
+          <div className='flex gap-2'>
+            <Button
+              variant='outline'
+              color='warning'
+              className='p-2'
+              onClick={() => handleEditClick(row.row.original.week)}
+            >
+              <Icon icon='mdi:pencil' />
+            </Button>
+            <Button
+              variant='outline'
+              color='error'
+              className='p-2'
+              onClick={() => handleRemoveRow(row.row.original.week)}
+            >
+              <Icon icon='mdi:delete' />
+            </Button>
+          </div>
+        );
+      },
+    };
+
+    return [
+      ...baseColumns,
+      ...productionColumns,
+      ...uniformityColumns,
+      ...(formType !== 'detail' ? [actionColumn] : []),
+    ];
+  }, [formik.values.project_category, formType]);
+
+  // ===== Handler =====
+  const handleAddRow = async (
+    values: ProductionStandardRepeaterFormSchemaValues
+  ) => {
+    // Prevent spam clicking
+    if (isAddingRow) return;
+
+    setIsAddingRow(true);
+
+    // Check for duplicate week
+    const existingWeeks = (formik.values.details || []).map((d) => d.week);
+    if (existingWeeks.includes(values.week)) {
+      repeaterFormik.setFieldError(
+        'week',
+        'Minggu sudah ada, pilih minggu lain!'
+      );
+      setIsAddingRow(false);
+      return;
+    }
+
+    const newValues = [
+      ...(formik.values.details || []),
+    ] as ProductionStandardRepeaterFormSchemaValues[];
+    newValues.push(values);
+
+    const updatedFormValues = {
+      ...formik.values,
+      details: newValues,
+    };
+
+    formikSetValues(updatedFormValues);
+
+    // Save to store (only in add mode)
+    if (formType === 'add') {
+      setFormData({
+        name: updatedFormValues.name,
+        project_category: updatedFormValues.project_category,
+        details: updatedFormValues.details || [],
+      });
+    }
+
+    // Reset repeater form
+    // repeaterFormik.resetForm();
+    repeaterFormikSetValues({
+      ...repeaterFormik.values,
+      week: Number(values.week) + 1,
+    });
+
+    // Scroll to bottom after adding
+    setTimeout(() => scrollToBottom(), 100);
+
+    // Add 200ms delay before allowing next add
+    await new Promise((resolve) => setTimeout(resolve, 200));
+    setIsAddingRow(false);
+  };
+
+  const handleRemoveRow = (week: number) => {
+    const newValues = (formik.values.details || []).filter(
+      (detail) => detail.week !== week
+    );
+
+    const updatedFormValues = {
+      ...formik.values,
+      details: newValues,
+    };
+
+    formikSetValues(updatedFormValues);
+
+    // Save to store (only in add mode)
+    if (formType === 'add') {
+      setFormData({
+        name: updatedFormValues.name,
+        project_category: updatedFormValues.project_category,
+        details: updatedFormValues.details || [],
+      });
+    }
+  };
+
+  const handleUpdateRow = (
+    week: number,
+    values: ProductionStandardRepeaterFormSchemaValues
+  ) => {
+    // Check for duplicate week (excluding current row)
+    const existingWeeks = (formik.values.details || [])
+      .map((d) => (d.week !== week ? d.week : null))
+      .filter((w) => w !== null);
+    if (existingWeeks.includes(values.week)) {
+      repeaterFormik.setFieldError(
+        'week',
+        'Minggu sudah ada, pilih minggu lain!'
+      );
+      return;
+    }
+
+    const newValues = (formik.values.details || []).map((detail) =>
+      detail.week === week ? values : detail
+    );
+
+    const updatedFormValues = {
+      ...formik.values,
+      details: newValues,
+    };
+
+    formikSetValues(updatedFormValues);
+
+    // Save to store (only in add mode)
+    if (formType === 'add') {
+      setFormData({
+        name: updatedFormValues.name,
+        project_category: updatedFormValues.project_category,
+        details: updatedFormValues.details || [],
+      });
+    }
+
+    // Exit edit mode and reset form
+    setEditMode(false);
+    setEditIndex(null);
+    repeaterFormik.resetForm();
+
+    // Scroll to bottom after updating
+    setTimeout(() => scrollToBottom(), 100);
+  };
+
+  const handleEditClick = (week: number) => {
+    const row = formik.values.details?.find(
+      (detail) => detail.week === week
+    ) as ProductionStandardRepeaterFormSchemaValues;
+    if (row) {
+      setEditMode(true);
+      setEditIndex(week);
+      repeaterFormikSetValues(row);
+    }
+  };
+
+  const handleCancelEdit = () => {
+    setEditMode(false);
+    setEditIndex(null);
+    repeaterFormik.resetForm();
+  };
+
+  const handleSubmit = useCallback(
+    async (values: ProductionStandardFormValues) => {
+      const createProductionStandardRes =
+        await ProductionStandardApi.create(values);
+
+      if (isResponseError(createProductionStandardRes)) {
+        setProductionStandardFormErrorMessage(
+          createProductionStandardRes.message
+        );
+        return;
+      }
+
+      toast.success(createProductionStandardRes?.message as string);
+      clearCache();
+      formik.resetForm();
+      afterSubmit?.();
+      router.push('/master-data/production-standard');
+    },
+    [router]
+  );
+
+  const handleUpdate = useCallback(
+    async (id: number, values: ProductionStandardFormValues) => {
+      const updateProductionStandardRes = await ProductionStandardApi.update(
+        id,
+        values
+      );
+
+      if (isResponseError(updateProductionStandardRes)) {
+        setProductionStandardFormErrorMessage(
+          updateProductionStandardRes.message
+        );
+        return;
+      }
+
+      toast.success(updateProductionStandardRes?.message as string);
+      clearCache();
+      afterSubmit?.();
+      router.push('/master-data/production-standard');
+    },
+    [router]
+  );
+
+  const handleReset = () => {
+    // Clear cache and reset form
+    clearCache();
+    formik.resetForm();
+    repeaterFormik.resetForm();
+    setEditMode(false);
+    setEditIndex(null);
+  };
+
+  // Scroll to bottom of table
+  const scrollToBottom = () => {
+    // Find the table wrapper element by its class
+    const tableWrapper = document.querySelector(
+      '.overflow-x-auto.max-h-128, .overflow-x-auto'
+    );
+    if (tableWrapper) {
+      tableWrapper.scrollTo({
+        top: tableWrapper.scrollHeight,
+        behavior: 'smooth',
+      });
+    }
+  };
+
+  // Toggle table height
+  const toggleTableHeight = () => {
+    setIsTableExpanded(!isTableExpanded);
+  };
+
+  // Wrapper handlers for saving to store
+  const handleNameChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+    formik.handleChange(e);
+
+    // Save to store (only in add mode)
+    if (formType === 'add') {
+      setFormData({
+        name: e.target.value,
+        project_category: formik.values.project_category,
+        details: formik.values.details || [],
+      });
+    }
+  };
+
+  const handleProjectCategoryChange = (value: unknown) => {
+    const newValue = ((value as OptionType)?.value as string) || '';
+    const oldValue = formik.values.project_category;
+
+    // When switching from GROWING to LAYING, populate production_standard_details with default values
+    let updatedDetails = formik.values.details || [];
+    if (oldValue === 'GROWING' && newValue === 'LAYING') {
+      updatedDetails = updatedDetails.map((detail) => ({
+        ...detail,
+        production_standard_details: detail.production_standard_details || {
+          target_hen_day_production: 0,
+          target_hen_house_production: 0,
+          target_egg_weight: 0,
+          target_egg_mass: 0,
+        },
+      }));
+    }
+
+    formikSetValues({
+      ...formik.values,
+      project_category: newValue,
+      details: updatedDetails,
+    });
+
+    // Save to store (only in add mode)
+    if (formType === 'add') {
+      setFormData({
+        name: formik.values.name,
+        project_category: newValue,
+        details: updatedDetails,
+      });
+    }
+  };
+
+  const confirmationModalDeleteclickHandler = async () => {
+    setIsDeleteLoading(true);
+
+    await ProductionStandardApi.delete(initialValue?.id as number);
+
+    deleteModal.closeModal();
+    setIsDeleteLoading(false);
+    router.push('/master-data/production-standard');
+  };
+
+  // ===== Function =====
+
+  return (
+    <>
+      <div className='p-6 gap-6 flex flex-col'>
+        <FormHeader
+          title={
+            formType === 'add'
+              ? 'Tambah Data Standard Produksi'
+              : formType === 'edit'
+                ? 'Ubah Data Standard Produksi'
+                : 'Detail Data Standard Produksi'
+          }
+          backUrl='/master-data/production-standard'
+        />
+        <div className='grid sm:grid-cols-2 gap-6'>
+          <TextInput
+            label='Nama'
+            name='name'
+            placeholder='Nama Standard Produksi'
+            value={formik.values.name}
+            onChange={handleNameChange}
+            onBlur={formik.handleBlur}
+            errorMessage={formik.errors.name as string}
+            isError={
+              Boolean(formik.errors.name) && Boolean(formik.touched.name)
+            }
+            required
+            disabled={formType === 'detail'}
+          />
+          <SelectInput
+            label='Kategori Proyek'
+            value={FLOCK_CATEGORY_OPTIONS.find(
+              (option) => option.value === formik.values.project_category
+            )}
+            options={FLOCK_CATEGORY_OPTIONS}
+            onChange={handleProjectCategoryChange}
+            errorMessage={formik.errors.project_category as string}
+            isError={
+              Boolean(formik.errors.project_category) &&
+              Boolean(formik.touched.project_category)
+            }
+            required
+            isDisabled={formType === 'detail'}
+          />
+        </div>
+        <Table<TableRowsType>
+          data={tableRows}
+          columns={columns}
+          pageSize={tableRows.length}
+          className={{
+            containerClassName: 'mb-0',
+            paginationClassName: 'hidden',
+            headerColumnClassName: cn(
+              TABLE_DEFAULT_STYLING.headerColumnClassName,
+              formType != 'detail' && 'last:flex last:flex-row last:justify-end'
+            ),
+            bodyColumnClassName: cn(
+              TABLE_DEFAULT_STYLING.bodyColumnClassName,
+              formType != 'detail' && 'last:flex last:flex-row last:justify-end'
+            ),
+            tableWrapperClassName: cn(
+              TABLE_DEFAULT_STYLING.tableWrapperClassName,
+              'overflow-x-auto',
+              !isTableExpanded && 'max-h-128'
+            ),
+            tableClassName: cn(
+              'font-inter w-full text-sm font-medium',
+              'table table-pin-rows table-pin-cols'
+            ),
+          }}
+          renderCustomRow={(row) => {
+            if (formType != 'detail' && row.original.customRow) {
+              const colSpan =
+                formik.values.project_category === 'LAYING' ? 11 : 7;
+              if (row.original.placeHolder) {
+                return (
+                  <tr key={`placeholder-${row.index}`}>
+                    <td
+                      colSpan={colSpan}
+                      className='p-6 text-center text-gray-400'
+                    >
+                      {row.original.placeHolder}
+                    </td>
+                  </tr>
+                );
+              }
+              return (
+                <tr
+                  key={`row-${row.index}`}
+                  className='sticky bottom-0 bg-base-100 shadow-lg'
+                >
+                  <td colSpan={colSpan} className='p-6'>
+                    <form
+                      className='h-full w-full flex flex-col justify-end'
+                      onSubmit={repeaterFormik.handleSubmit}
+                      onReset={repeaterFormik.handleReset}
+                    >
+                      <div
+                        className={cn(
+                          'grid gap-4 items-start',
+                          formik.values.project_category === 'LAYING'
+                            ? 'grid-cols-9'
+                            : 'grid-cols-5'
+                        )}
+                      >
+                        <NumberInput
+                          name='week'
+                          label='Week'
+                          placeholder='1'
+                          value={repeaterFormik.values.week}
+                          onChange={repeaterFormik.handleChange}
+                          onBlur={repeaterFormik.handleBlur}
+                          errorMessage={repeaterFormik.errors.week as string}
+                          isError={
+                            Boolean(repeaterFormik.errors.week) &&
+                            Boolean(repeaterFormik.touched.week)
+                          }
+                        />
+                        {/* Conditionally render production_standard_details inputs for LAYING category */}
+                        {formik.values.project_category === 'LAYING' && (
+                          <>
+                            <NumberInput
+                              name='production_standard_details.target_hen_day_production'
+                              label='Hen Day'
+                              placeholder='1'
+                              value={
+                                repeaterFormik.values
+                                  .production_standard_details
+                                  ?.target_hen_day_production
+                              }
+                              onChange={repeaterFormik.handleChange}
+                              onBlur={repeaterFormik.handleBlur}
+                              endAdornment={<Icon icon='mdi:percent' />}
+                              errorMessage={getProductionDetailsError(
+                                repeaterFormik.errors
+                                  .production_standard_details,
+                                'target_hen_day_production'
+                              )}
+                              isError={
+                                Boolean(
+                                  getProductionDetailsError(
+                                    repeaterFormik.errors
+                                      .production_standard_details,
+                                    'target_hen_day_production'
+                                  )
+                                ) &&
+                                getProductionDetailsTouched(
+                                  repeaterFormik.touched
+                                    .production_standard_details,
+                                  'target_hen_day_production'
+                                )
+                              }
+                            />
+                            <NumberInput
+                              name='production_standard_details.target_hen_house_production'
+                              label='Hen House'
+                              placeholder='1'
+                              value={
+                                repeaterFormik.values
+                                  .production_standard_details
+                                  ?.target_hen_house_production
+                              }
+                              onChange={repeaterFormik.handleChange}
+                              onBlur={repeaterFormik.handleBlur}
+                              endAdornment={
+                                <div className='w-full h-full flex items-center justify-center'>
+                                  Butir
+                                </div>
+                              }
+                              errorMessage={getProductionDetailsError(
+                                repeaterFormik.errors
+                                  .production_standard_details,
+                                'target_hen_house_production'
+                              )}
+                              isError={
+                                Boolean(
+                                  getProductionDetailsError(
+                                    repeaterFormik.errors
+                                      .production_standard_details,
+                                    'target_hen_house_production'
+                                  )
+                                ) &&
+                                getProductionDetailsTouched(
+                                  repeaterFormik.touched
+                                    .production_standard_details,
+                                  'target_hen_house_production'
+                                )
+                              }
+                            />
+                            <NumberInput
+                              name='production_standard_details.target_egg_weight'
+                              label='Egg Weight'
+                              placeholder='1'
+                              value={
+                                repeaterFormik.values
+                                  .production_standard_details
+                                  ?.target_egg_weight
+                              }
+                              onChange={repeaterFormik.handleChange}
+                              onBlur={repeaterFormik.handleBlur}
+                              endAdornment={
+                                <div className='w-full h-full flex items-center justify-center'>
+                                  gr
+                                </div>
+                              }
+                              errorMessage={getProductionDetailsError(
+                                repeaterFormik.errors
+                                  .production_standard_details,
+                                'target_egg_weight'
+                              )}
+                              isError={
+                                Boolean(
+                                  getProductionDetailsError(
+                                    repeaterFormik.errors
+                                      .production_standard_details,
+                                    'target_egg_weight'
+                                  )
+                                ) &&
+                                getProductionDetailsTouched(
+                                  repeaterFormik.touched
+                                    .production_standard_details,
+                                  'target_egg_weight'
+                                )
+                              }
+                            />
+                            <NumberInput
+                              name='production_standard_details.target_egg_mass'
+                              label='Egg Mass'
+                              placeholder='1'
+                              value={
+                                repeaterFormik.values
+                                  .production_standard_details?.target_egg_mass
+                              }
+                              onChange={repeaterFormik.handleChange}
+                              onBlur={repeaterFormik.handleBlur}
+                              endAdornment={
+                                <div className='w-full h-full flex items-center justify-center'>
+                                  gr
+                                </div>
+                              }
+                              errorMessage={getProductionDetailsError(
+                                repeaterFormik.errors
+                                  .production_standard_details,
+                                'target_egg_mass'
+                              )}
+                              isError={
+                                Boolean(
+                                  getProductionDetailsError(
+                                    repeaterFormik.errors
+                                      .production_standard_details,
+                                    'target_egg_mass'
+                                  )
+                                ) &&
+                                getProductionDetailsTouched(
+                                  repeaterFormik.touched
+                                    .production_standard_details,
+                                  'target_egg_mass'
+                                )
+                              }
+                            />
+                          </>
+                        )}
+                        <NumberInput
+                          name='production_standard_uniformity_details.target_mean_bw'
+                          label='Mean BW'
+                          placeholder='1'
+                          value={
+                            repeaterFormik.values
+                              .production_standard_uniformity_details
+                              .target_mean_bw
+                          }
+                          onChange={repeaterFormik.handleChange}
+                          onBlur={repeaterFormik.handleBlur}
+                          endAdornment={
+                            <div className='w-full h-full flex items-center justify-center'>
+                              gr
+                            </div>
+                          }
+                          errorMessage={
+                            repeaterFormik.errors
+                              .production_standard_uniformity_details
+                              ?.target_mean_bw as string
+                          }
+                          isError={
+                            Boolean(
+                              repeaterFormik.errors
+                                .production_standard_uniformity_details
+                                ?.target_mean_bw
+                            ) &&
+                            Boolean(
+                              repeaterFormik.touched
+                                .production_standard_uniformity_details
+                                ?.target_mean_bw
+                            )
+                          }
+                        />
+                        <NumberInput
+                          name='production_standard_uniformity_details.max_depletion'
+                          label='Max Depletion'
+                          placeholder='1'
+                          value={
+                            repeaterFormik.values
+                              .production_standard_uniformity_details
+                              .max_depletion
+                          }
+                          onChange={repeaterFormik.handleChange}
+                          onBlur={repeaterFormik.handleBlur}
+                          endAdornment={<Icon icon='mdi:percent' />}
+                          errorMessage={
+                            repeaterFormik.errors
+                              .production_standard_uniformity_details
+                              ?.max_depletion as string
+                          }
+                          isError={
+                            Boolean(
+                              repeaterFormik.errors
+                                .production_standard_uniformity_details
+                                ?.max_depletion
+                            ) &&
+                            Boolean(
+                              repeaterFormik.touched
+                                .production_standard_uniformity_details
+                                ?.max_depletion
+                            )
+                          }
+                        />
+                        <NumberInput
+                          name='production_standard_uniformity_details.min_uniformity'
+                          label='Min Uniformity'
+                          placeholder='1'
+                          value={
+                            repeaterFormik.values
+                              .production_standard_uniformity_details
+                              .min_uniformity
+                          }
+                          onChange={repeaterFormik.handleChange}
+                          onBlur={repeaterFormik.handleBlur}
+                          endAdornment={<Icon icon='mdi:percent' />}
+                          errorMessage={
+                            repeaterFormik.errors
+                              .production_standard_uniformity_details
+                              ?.min_uniformity as string
+                          }
+                          isError={
+                            Boolean(
+                              repeaterFormik.errors
+                                .production_standard_uniformity_details
+                                ?.min_uniformity
+                            ) &&
+                            Boolean(
+                              repeaterFormik.touched
+                                .production_standard_uniformity_details
+                                ?.min_uniformity
+                            )
+                          }
+                        />
+                        <NumberInput
+                          name='production_standard_uniformity_details.feed_intake'
+                          label='Feed Intake'
+                          placeholder='1'
+                          value={
+                            repeaterFormik.values
+                              .production_standard_uniformity_details
+                              .feed_intake
+                          }
+                          onChange={repeaterFormik.handleChange}
+                          onBlur={repeaterFormik.handleBlur}
+                          endAdornment={
+                            <div className='w-full h-full flex items-center justify-center'>
+                              gr/ekor
+                            </div>
+                          }
+                          errorMessage={
+                            repeaterFormik.errors
+                              .production_standard_uniformity_details
+                              ?.feed_intake as string
+                          }
+                          isError={
+                            Boolean(
+                              repeaterFormik.errors
+                                .production_standard_uniformity_details
+                                ?.feed_intake
+                            ) &&
+                            Boolean(
+                              repeaterFormik.touched
+                                .production_standard_uniformity_details
+                                ?.feed_intake
+                            )
+                          }
+                        />
+                      </div>
+                      <div className='flex justify-center mt-6 gap-2'>
+                        {editMode && (
+                          <Button
+                            type='button'
+                            color='error'
+                            variant='outline'
+                            className='min-w-24'
+                            onClick={handleCancelEdit}
+                          >
+                            <Icon icon='mdi:close' /> Batal
+                          </Button>
+                        )}
+                        <Button
+                          type='submit'
+                          color={editMode ? 'warning' : 'success'}
+                          className='min-w-24'
+                          disabled={isAddingRow}
+                          isLoading={isAddingRow}
+                        >
+                          <Icon icon={editMode ? 'mdi:pencil' : 'mdi:plus'} />{' '}
+                          {editMode ? 'Edit Data' : 'Tambah Data'}
+                        </Button>
+                        {/* Should not be absolute */}
+                        <Button
+                          type='button'
+                          variant='outline'
+                          color='primary'
+                          onClick={toggleTableHeight}
+                          className='absolute bottom-6 right-6'
+                        >
+                          <Icon
+                            icon={
+                              isTableExpanded
+                                ? 'mdi:chevron-up'
+                                : 'mdi:chevron-down'
+                            }
+                          />
+                          {isTableExpanded ? 'Tutup Tabel' : 'Lihat Semua'}
+                        </Button>
+                      </div>
+                    </form>
+                  </td>
+                </tr>
+              );
+            }
+            return null;
+          }}
+        />
+        <form
+          className='flex justify-between mt-6 gap-2 flex-wrap'
+          onSubmit={formik.handleSubmit}
+        >
+          {formType === 'detail' && (
+            <div className='gap-2 flex items-center'>
+              <RequirePermission permissions='lti.master.production_standards.update'>
+                <Button
+                  className='min-w-24'
+                  color='warning'
+                  href={`/master-data/production-standard/detail/edit?productionStandardId=${initialValue?.id}`}
+                >
+                  <Icon icon='mdi:pencil' />
+                  Edit
+                </Button>
+              </RequirePermission>
+              <RequirePermission permissions='lti.master.production_standards.delete'>
+                <Button
+                  type='button'
+                  className='min-w-24'
+                  color='error'
+                  onClick={() => {
+                    deleteModal.openModal();
+                  }}
+                >
+                  <Icon icon='mdi:delete' />
+                  Hapus
+                </Button>
+              </RequirePermission>
+            </div>
+          )}
+          {formType == 'edit' && (
+            <RequirePermission permissions='lti.master.production_standards.delete'>
+              <Button
+                className='min-w-24'
+                color='error'
+                onClick={() => {
+                  deleteModal.openModal();
+                }}
+                type='button'
+              >
+                <Icon icon='mdi:delete' />
+                Hapus
+              </Button>
+            </RequirePermission>
+          )}
+          <div className='gap-2 flex items-center'>
+            {formType === 'detail' ? 'Detail' : 'Total'}{' '}
+            {formik.values.details?.length || 0} Data
+          </div>
+          {formType !== 'detail' && (
+            <div className='flex gap-2'>
+              <Button
+                type='button'
+                className='min-w-24'
+                color='warning'
+                onClick={handleReset}
+              >
+                Reset
+              </Button>
+              <Button type='submit' className='min-w-24'>
+                Submit
+              </Button>
+            </div>
+          )}
+
+          {formType === 'detail' && (
+            <div className='flex gap-2'>
+              <Button
+                type='button'
+                variant='outline'
+                color='primary'
+                onClick={toggleTableHeight}
+                className='min-w-24'
+              >
+                <Icon
+                  icon={isTableExpanded ? 'mdi:chevron-up' : 'mdi:chevron-down'}
+                />
+                {isTableExpanded ? 'Tutup Tabel' : 'Lihat Semua'}
+              </Button>
+            </div>
+          )}
+        </form>
+      </div>
+
+      <ConfirmationModal
+        ref={deleteModal.ref}
+        type='error'
+        text={`Apakah anda yakin ingin menghapus data Standard Produksi ini (${initialValue?.name})?`}
+        secondaryButton={{
+          text: 'Tidak',
+        }}
+        primaryButton={{
+          text: 'Ya',
+          color: 'error',
+          onClick: confirmationModalDeleteclickHandler,
+          isLoading: isDeleteLoading,
+        }}
+      />
+    </>
+  );
+};
+
+export default ProductionStandardForm;
diff --git a/src/components/pages/production/chickin/ChickinTable.tsx b/src/components/pages/production/chickin/ChickinTable.tsx
deleted file mode 100644
index 732923d4..00000000
--- a/src/components/pages/production/chickin/ChickinTable.tsx
+++ /dev/null
@@ -1,324 +0,0 @@
-'use client';
-
-import Button from '@/components/Button';
-import DebouncedTextInput from '@/components/input/DebouncedTextInput';
-import { OptionType } from '@/components/input/SelectInput';
-import Modal, { useModal } from '@/components/Modal';
-import ConfirmationModal from '@/components/modal/ConfirmationModal';
-import Table from '@/components/Table';
-import RowCollapseOptions from '@/components/table/RowCollapseOptions';
-import RowDropdownOptions from '@/components/table/RowDropdownOptions';
-import RowOptionsMenuWrapper from '@/components/table/RowOptionsMenuWrapper';
-import { TableRowSizeSelector } from '@/components/table/TableRowSizeSelector';
-import { ROWS_OPTIONS } from '@/config/constant';
-import { isResponseSuccess } from '@/lib/api-helper';
-import { cn, formatNumber } from '@/lib/helper';
-import { ChickinApi } from '@/services/api/production/chickin';
-import { useTableFilter } from '@/services/hooks/useTableFilter';
-import { Chickin } from '@/types/api/production/chickin';
-import { Icon } from '@iconify/react';
-import { CellContext, SortingState } from '@tanstack/react-table';
-import { useState } from 'react';
-import useSWR from 'swr';
-
-const ChickinTable = () => {
-  const {
-    state: tableFilterState,
-    updateFilter,
-    setPage,
-    setPageSize,
-    toQueryString: getTableFilterQueryString,
-  } = useTableFilter({
-    initial: {
-      search: '',
-    },
-    paramMap: {
-      page: 'page',
-      pageSize: 'limit',
-      search: 'search',
-    },
-  });
-
-  const [sorting, setSorting] = useState<SortingState>([]);
-  const [selectedChickin, setSelectedChickin] = useState<Chickin | undefined>(
-    undefined
-  );
-  const [isDeleteLoading, setIsDeleteLoading] = useState(false);
-
-  const deleteModal = useModal();
-  const chickinModal = useModal();
-
-  // Data Fetching
-  const {
-    data: chickins,
-    isLoading,
-    mutate: refreshChickins,
-  } = useSWR(
-    `${ChickinApi.basePath}${getTableFilterQueryString()}`,
-    ChickinApi.getAllFetcher
-  );
-
-  const searchChangeHandler = (event: React.ChangeEvent<HTMLInputElement>) => {
-    updateFilter('search', event.target.value);
-    setPage(1);
-  };
-
-  const pageSizeChangeHandler = (val: OptionType | OptionType[] | null) => {
-    const newVal = val as OptionType;
-    setPageSize(newVal.value as number);
-    setPage(1);
-  };
-
-  const confirmationModalDeleteClickHandler = async () => {
-    setIsDeleteLoading(true);
-    try {
-      await ChickinApi.delete(selectedChickin?.id as number);
-      refreshChickins();
-      deleteModal.closeModal();
-    } finally {
-      setIsDeleteLoading(false);
-    }
-  };
-
-  return (
-    <>
-      <div className='flex flex-col gap-4'>
-        <div className='flex flex-col gap-2 mb-4'>
-          <div className='w-full flex flex-col sm:flex-row justify-between items-end sm:items-center gap-2'>
-            <Button
-              href='/production/project-flock/chickin/add?projectFlockId=1'
-              variant='outline'
-              color='primary'
-              className='w-full sm:w-fit'
-            >
-              <Icon icon='uil:plus' width={24} height={24} />
-              Tambah
-            </Button>
-            <DebouncedTextInput
-              name='search'
-              placeholder='Cari Chickin'
-              value={tableFilterState.search}
-              onChange={searchChangeHandler}
-              className={{ wrapper: 'sm:max-w-3xs' }}
-            />
-          </div>
-          <TableRowSizeSelector
-            value={tableFilterState.pageSize}
-            onChange={pageSizeChangeHandler}
-            options={ROWS_OPTIONS}
-          />
-        </div>
-      </div>
-      <Table<Chickin>
-        data={isResponseSuccess(chickins) ? chickins?.data : []}
-        columns={[
-          {
-            header: '#',
-            cell: (props) =>
-              tableFilterState.pageSize * (tableFilterState.page - 1) +
-              props.row.index +
-              1,
-          },
-          {
-            accessorFn: (row) => row.project_flock_kandang?.kandang.name,
-            header: 'Kandang',
-          },
-          {
-            accessorFn: (row) => row.quantity,
-            header: 'Jumlah Chickin',
-            cell: (props) => {
-              if (props.row.original.quantity) {
-                return formatNumber(props.row.original.quantity);
-              } else {
-                return '-';
-              }
-            },
-          },
-          {
-            accessorFn: (row) => row.chick_in_date,
-            header: 'Tanggal Chickin',
-            cell: (props) => {
-              if (props.row.original.chick_in_date) {
-                return new Date(
-                  props.row.original.chick_in_date
-                ).toLocaleDateString('id-ID');
-              } else {
-                return '-';
-              }
-            },
-          },
-          {
-            accessorFn: (row) => row.note,
-            header: 'Catatan',
-          },
-          {
-            header: 'Aksi',
-            cell: (props) => {
-              const currentPageSize =
-                props.table.getPaginationRowModel().rows.length;
-              const currentPageRows =
-                props.table.getPaginationRowModel().flatRows;
-              const currentRowRelativeIndex =
-                currentPageRows.findIndex((r) => r.id === props.row.id) + 1;
-
-              const isLast2Rows = currentRowRelativeIndex > currentPageSize - 2;
-
-              const deleteClickHandler = () => {
-                setSelectedChickin(props.row.original);
-                deleteModal.openModal();
-              };
-
-              const editClickHandler = () => {
-                setSelectedChickin(props.row.original);
-                chickinModal.openModal();
-              };
-
-              return (
-                <>
-                  {currentPageSize > 2 && (
-                    <RowDropdownOptions isLast2Rows={isLast2Rows}>
-                      <RowOptionsMenu
-                        type='dropdown'
-                        props={props}
-                        deleteClickHandler={deleteClickHandler}
-                        editClickHandler={editClickHandler}
-                      />
-                    </RowDropdownOptions>
-                  )}
-
-                  {currentPageSize <= 2 && (
-                    <RowCollapseOptions>
-                      <RowOptionsMenu
-                        type='collapse'
-                        props={props}
-                        deleteClickHandler={deleteClickHandler}
-                        editClickHandler={editClickHandler}
-                      />
-                    </RowCollapseOptions>
-                  )}
-                </>
-              );
-            },
-          },
-        ]}
-        pageSize={tableFilterState.pageSize}
-        page={isResponseSuccess(chickins) ? chickins?.meta?.page : 0}
-        totalItems={
-          isResponseSuccess(chickins) ? chickins?.meta?.total_results : 0
-        }
-        onPageChange={setPage}
-        isLoading={isLoading}
-        sorting={sorting}
-        setSorting={setSorting}
-        className={{
-          containerClassName: cn({
-            'mb-20':
-              isResponseSuccess(chickins) && chickins?.data?.length === 0,
-          }),
-          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',
-        }}
-      />
-      <ConfirmationModal
-        ref={deleteModal.ref}
-        type='error'
-        text={`Apakah anda yakin ingin menghapus data Chickin ini?`}
-        secondaryButton={{
-          text: 'Tidak',
-        }}
-        primaryButton={{
-          text: 'Ya',
-          onClick: confirmationModalDeleteClickHandler,
-          isLoading: isDeleteLoading,
-          color: 'error',
-        }}
-      />
-      <Modal ref={chickinModal.ref}>
-        <div className='flex flex-row justify-between items-center'>
-          <h1 className='text-xl font-semibold text-center mb-6'>
-            Chickin Kandang -{' '}
-            {selectedChickin?.project_flock_kandang &&
-              selectedChickin?.project_flock_kandang.kandang?.name}
-          </h1>
-          <Button
-            color='error'
-            variant='link'
-            onClick={chickinModal.closeModal}
-          >
-            <Icon
-              className='text-black'
-              icon='uil:times'
-              width={24}
-              height={24}
-            />
-          </Button>
-        </div>
-        {/* <ChickinForm
-          initialValues={selectedChickin}
-          formType='edit'
-          afterSubmit={() => {
-            refreshChickins();
-            chickinModal.closeModal();
-          }}
-        /> */}
-      </Modal>
-    </>
-  );
-};
-
-const RowOptionsMenu = ({
-  type = 'dropdown',
-  props,
-  editClickHandler,
-  deleteClickHandler,
-}: {
-  type: 'dropdown' | 'collapse';
-  props: CellContext<Chickin, unknown>;
-  editClickHandler: () => void;
-  deleteClickHandler: () => void;
-}) => {
-  return (
-    <RowOptionsMenuWrapper type={type}>
-      <Button
-        href={`/production/project-flock/chickin/detail?chickinId=${props.row.original.id}`}
-        variant='ghost'
-        color='primary'
-        className='justify-start text-sm'
-      >
-        <Icon icon='mdi:eye-outline' width={16} height={16} />
-        Detail
-      </Button>
-      <Button
-        variant='ghost'
-        color='warning'
-        className='justify-start text-sm'
-        onClick={editClickHandler}
-      >
-        <Icon icon='mdi:pencil-outline' width={16} height={16} />
-        Edit
-      </Button>
-      <Button
-        onClick={deleteClickHandler}
-        variant='ghost'
-        color='error'
-        className='justify-start text-sm text-error focus-visible:text-error-content hover:text-error-content'
-      >
-        <Icon
-          icon='material-symbols:delete-outline-rounded'
-          width={16}
-          height={16}
-          className='justify-start text-sm'
-        />
-        Delete
-      </Button>
-    </RowOptionsMenuWrapper>
-  );
-};
-
-export default ChickinTable;
diff --git a/src/components/pages/production/chickin/form/ChickinForm.tsx b/src/components/pages/production/chickin/form/ChickinForm.tsx
index b6c5a2c0..7d8a4c7c 100644
--- a/src/components/pages/production/chickin/form/ChickinForm.tsx
+++ b/src/components/pages/production/chickin/form/ChickinForm.tsx
@@ -17,6 +17,7 @@ import DrawerHeader from '@/components/helper/drawer/DrawerHeader';
 import { Icon } from '@iconify/react';
 import Badge from '@/components/Badge';
 import { CHICKINS_APPROVAL_LINE } from '@/config/approval-line';
+import RequirePermission from '@/components/helper/RequirePermission';
 const ChickinFormKandang = ({
   formType = 'add',
   initialValues,
@@ -144,17 +145,24 @@ const ChickinFormKandang = ({
         <h2 className='text-xl font-semibold'>Informasi Chick In</h2>
         {/* Badge Row  */}
         <div className='flex flex-row gap-2'>
-          <Badge
-            variant='soft'
-            color={'success'}
-            className={{
-              badge: 'rounded-lg px-2',
-            }}
-          >
-            <Icon icon='mdi:circle' width={12} height={12} color={'success'} />{' '}
-            Perlu Chick In ({initialValues.available_qtys?.length ?? 0})
-          </Badge>
-          <div className='divider divider-horizontal p-0 m-0'></div>
+          <RequirePermission permissions='lti.production.chickins.create'>
+            <Badge
+              variant='soft'
+              color={'success'}
+              className={{
+                badge: 'rounded-lg px-2',
+              }}
+            >
+              <Icon
+                icon='mdi:circle'
+                width={12}
+                height={12}
+                color={'success'}
+              />{' '}
+              Perlu Chick In ({initialValues.available_qtys?.length ?? 0})
+            </Badge>
+            <div className='divider divider-horizontal p-0 m-0'></div>
+          </RequirePermission>
           <Badge
             color='neutral'
             variant='soft'
@@ -176,11 +184,13 @@ const ChickinFormKandang = ({
           afterSubmit={afterSubmitFormChickin}
         />
       )}
-      <ChickinFormView
-        initialValues={initialValues}
-        formType={formType}
-        afterSubmit={afterSubmitFormChickin}
-      />
+      <RequirePermission permissions='lti.production.chickins.create'>
+        <ChickinFormView
+          initialValues={initialValues}
+          formType={formType}
+          afterSubmit={afterSubmitFormChickin}
+        />
+      </RequirePermission>
     </>
   );
 };
diff --git a/src/components/pages/production/chickin/form/tabs/ChickLogsView.tsx b/src/components/pages/production/chickin/form/tabs/ChickLogsView.tsx
index 99eb1cb3..17c76822 100644
--- a/src/components/pages/production/chickin/form/tabs/ChickLogsView.tsx
+++ b/src/components/pages/production/chickin/form/tabs/ChickLogsView.tsx
@@ -1,6 +1,7 @@
 import Alert from '@/components/Alert';
 import Button from '@/components/Button';
 import Card from '@/components/Card';
+import RequirePermission from '@/components/helper/RequirePermission';
 import { useModal } from '@/components/Modal';
 import ConfirmationModalWithNotes from '@/components/modal/ConfirmationModalWithNotes';
 import PillBadge from '@/components/PillBadge';
@@ -146,14 +147,16 @@ const ChickinLogsView = ({
         )}
 
         {initialValues?.approval?.step_number <= 2 && (
-          <Button
-            color='success'
-            onClick={handleClickApprove}
-            className='w-full'
-          >
-            <Icon width={24} height={24} icon='material-symbols:check' />
-            Approve Semua Chick In
-          </Button>
+          <RequirePermission permissions='lti.production.chickins.approve'>
+            <Button
+              color='success'
+              onClick={handleClickApprove}
+              className='w-full'
+            >
+              <Icon width={24} height={24} icon='material-symbols:check' />
+              Approve Semua Chick In
+            </Button>
+          </RequirePermission>
         )}
 
         {chickinErrorMessage && (
diff --git a/src/components/pages/production/project-flock/ProjectFlockTable.tsx b/src/components/pages/production/project-flock/ProjectFlockTable.tsx
index 7f8ee104..233c43d7 100644
--- a/src/components/pages/production/project-flock/ProjectFlockTable.tsx
+++ b/src/components/pages/production/project-flock/ProjectFlockTable.tsx
@@ -293,7 +293,7 @@ const ProjectFlockTable = ({ refresh }: { refresh?: () => void }) => {
 
   return (
     <>
-      <div className='min-h-screen w-full p-0 sm:p-4'>
+      <div className='min-h-screen w-full p-4'>
         <div className='flex flex-col gap-2 mb-4'>
           <div className='w-full flex flex-col justify-between items-end gap-2'>
             <div className='flex flex-col sm:flex-row gap-3 w-full'>
@@ -307,32 +307,6 @@ const ProjectFlockTable = ({ refresh }: { refresh?: () => void }) => {
                   Tambah
                 </Button>
               </RequirePermission>
-              {/* <Button
-                variant='outline'
-                color='success'
-                onClick={() => {
-                  setApprovalAction('APPROVED');
-                  confirmModal.openModal();
-                }}
-                disabled={selectedRowIds.length === 0}
-                className='w-full sm:w-fit'
-              >
-                <Icon icon='material-symbols:check' width={24} height={24} />
-                Approve
-              </Button>
-              <Button
-                variant='outline'
-                color='error'
-                onClick={() => {
-                  setApprovalAction('REJECTED');
-                  confirmModal.openModal();
-                }}
-                disabled={selectedRowIds.length === 0}
-                className='w-full sm:w-fit'
-              >
-                <Icon icon='mdi:times' width={24} height={24} />
-                Reject
-              </Button> */}
               <div className='ms-auto w-full sm:w-auto'>
                 <DebouncedTextInput
                   name='search'
@@ -551,49 +525,6 @@ const ProjectFlockTable = ({ refresh }: { refresh?: () => void }) => {
                 cell: (props) =>
                   formatDate(props.row.original.created_at, 'MMM DD, YYYY'),
               },
-              // {
-              //   header: 'Aksi',
-              //   cell: (props) => {
-              //     const currentPageSize =
-              //       props.table.getPaginationRowModel().rows.length;
-              //     const currentPageRows =
-              //       props.table.getPaginationRowModel().flatRows;
-              //     const currentRowRelativeIndex =
-              //       currentPageRows.findIndex((r) => r.id === props.row.id) + 1;
-
-              //     const isLast2Rows =
-              //       currentRowRelativeIndex > currentPageSize - 2;
-
-              //     const deleteClickHandler = () => {
-              //       setSelectedProjectFlock(props.row.original);
-              //       deleteModal.openModal();
-              //     };
-
-              //     return (
-              //       <>
-              //         {currentPageSize > 2 && (
-              //           <RowDropdownOptions isLast2Rows={isLast2Rows}>
-              //             <RowOptionsMenu
-              //               type='dropdown'
-              //               props={props}
-              //               deleteClickHandler={deleteClickHandler}
-              //             />
-              //           </RowDropdownOptions>
-              //         )}
-
-              //         {currentPageSize <= 2 && (
-              //           <RowCollapseOptions>
-              //             <RowOptionsMenu
-              //               type='collapse'
-              //               props={props}
-              //               deleteClickHandler={deleteClickHandler}
-              //             />
-              //           </RowCollapseOptions>
-              //         )}
-              //       </>
-              //     );
-              //   },
-              // },
             ]}
             pageSize={tableFilterState.pageSize}
             page={
diff --git a/src/components/pages/production/project-flock/chickin/ProjectFlockChickinDetail.tsx b/src/components/pages/production/project-flock/chickin/ProjectFlockChickinDetail.tsx
deleted file mode 100644
index 087f0848..00000000
--- a/src/components/pages/production/project-flock/chickin/ProjectFlockChickinDetail.tsx
+++ /dev/null
@@ -1,643 +0,0 @@
-'use client';
-
-import Badge from '@/components/Badge';
-import Button from '@/components/Button';
-import Card from '@/components/Card';
-import SelectInput, {
-  OptionType,
-  useSelect,
-} from '@/components/input/SelectInput';
-import PillBadge from '@/components/PillBadge';
-import Table from '@/components/Table';
-import { isResponseSuccess } from '@/lib/api-helper';
-import { cn, formatDate, formatTitleCase } from '@/lib/helper';
-import { ProjectFlockApi } from '@/services/api/production/project-flock';
-import { ProjectFlockKandangApi } from '@/services/api/production';
-import { useTableFilter } from '@/services/hooks/useTableFilter';
-import { ProjectFlock } from '@/types/api/production/project-flock';
-import { ProjectFlockKandang } from '@/types/api/production/project-flock-kandang';
-import { Icon } from '@iconify/react';
-import { useRouter } from 'next/navigation';
-import { useEffect, useState } from 'react';
-import useSWR from 'swr';
-import { FormHeader } from '@/components/helper/form/FormHeader';
-import Link from 'next/link';
-import RequirePermission from '@/components/helper/RequirePermission';
-
-const ProjectFlockChickinDetail = ({
-  projectFlockId,
-}: {
-  projectFlockId: number | undefined;
-}) => {
-  const router = useRouter();
-
-  // Tables Props
-  const { state: tableFilterState } = useTableFilter({
-    initial: { search: '' },
-    paramMap: { page: 'page', pageSize: 'limit' },
-  });
-
-  // States
-  const [searchProjectFlock, setSearchProjectFlock] = useState('');
-  const [selectedProjectFlock, setSelectedProjectFlock] =
-    useState<OptionType | null>(null);
-  const [projectFlock, setProjectFlock] = useState<ProjectFlock>();
-
-  // Fetch Data
-  const { data: listProjectFlockKandang } = useSWR(
-    `${ProjectFlockKandangApi.basePath}?${new URLSearchParams({
-      search: searchProjectFlock,
-      project_flock_id:
-        projectFlock?.id?.toString() ?? projectFlockId?.toString() ?? '',
-    }).toString()}`,
-    ProjectFlockKandangApi.getAllFetcher
-  );
-
-  const {
-    options: options,
-    isLoadingOptions: isLoadingListProjectFlock,
-    rawData: listProjectFlock,
-  } = useSelect<ProjectFlock>(
-    ProjectFlockApi.basePath,
-    'id',
-    'flock_name',
-    '',
-    {
-      search: searchProjectFlock,
-    }
-  );
-
-  // Handle Function
-  const handleChickinClick = async (
-    projectFlockKandang: ProjectFlockKandang
-  ) => {
-    router.push(
-      `/production/project-flock/chickin/add/kandang?projectFlockKandangId=${projectFlockKandang.id}&projectFlockId=${projectFlockId ?? selectedProjectFlock?.value}`
-    );
-  };
-
-  const handleChangeProjectFlock = (val: OptionType | null) => {
-    setSelectedProjectFlock(val);
-    if (isResponseSuccess(listProjectFlock) && val) {
-      const selected = listProjectFlock.data.find(
-        (pf) => pf.id === Number(val.value)
-      );
-      setProjectFlock(selected);
-    } else {
-      setProjectFlock(undefined);
-    }
-    if (projectFlockId) {
-      router.push('/production/project-flock/chickin/add');
-    }
-    if (!val && projectFlockId) {
-      router.push('/production/project-flock/chickin/add');
-    }
-  };
-
-  useEffect(() => {
-    if (projectFlockId && isResponseSuccess(listProjectFlock)) {
-      setProjectFlock(
-        listProjectFlock.data.find((pf) => pf.id === Number(projectFlockId))
-      );
-    }
-  }, [projectFlockId, listProjectFlock]);
-  return (
-    <>
-      {/* Header */}
-      <div className='flex flex-row justify-between items-center px-4 py-4'>
-        <div className='flex flex-row items-center h-full gap-2'>
-          <Link
-            href={`/production/project-flock/detail?projectFlockId=${projectFlock?.id}`}
-            className='hover:text-gray-400'
-          >
-            <Icon icon='mdi:arrow-left' width={24} height={24} />
-          </Link>
-          <div className='divider divider-horizontal p-0 m-0'></div>
-          <div className='text-sm text-neutral'>
-            Chick In {projectFlock?.flock_name}
-          </div>
-        </div>
-      </div>
-      {/* <FormHeader
-        title={`Chick In ${projectFlock?.flock_name ?? 'Project Flock'}`}
-        backUrl={`/production/project-flock/detail?projectFlockId=${projectFlock?.id}`}
-      /> */}
-      {/* <div className='flex flex-col gap-4 w-full my-4'>
-        <div className='max-w-full sm:max-w-1/2 md:max-w-3/5 lg:max-w-2/5'>
-          <SelectInput
-            required
-            label='Ganti Project Flock'
-            placeholder='Pilih Project Flock'
-            options={options}
-            onInputChange={(val) => {
-              setSearchProjectFlock(val);
-            }}
-            isLoading={isLoadingListProjectFlock}
-            value={
-              projectFlock
-                ? {
-                    label: `${projectFlock?.flock_name}`,
-                    value: projectFlock?.id,
-                  }
-                : null
-            }
-            onChange={(val) => {
-              handleChangeProjectFlock(val as OptionType | null);
-            }}
-            isSearchable
-            isClearable
-            startAdornment={
-              projectFlock && (
-                <Badge
-                  variant='soft'
-                  color='success'
-                  size='sm'
-                  className={{
-                    badge: 'whitespace-nowrap font-semibold',
-                  }}
-                >
-                  Periode {projectFlock?.period}
-                </Badge>
-              )
-            }
-          />
-        </div>
-      </div> */}
-      {/* Informasi Umum */}
-      {projectFlock && (
-        <div className='border-t-1 border-gray-300'>
-          <div className='p-4 flex flex-col gap-4'>
-            <h2 className='text-2xl font-semibold'>Informasi Umum</h2>
-            {/* Badge Row  */}
-            <div className='flex flex-row gap-2'>
-              <Badge
-                variant='soft'
-                color={
-                  projectFlock.approval.step_number == 1
-                    ? 'neutral'
-                    : projectFlock.approval.step_number == 2
-                      ? 'success'
-                      : projectFlock.approval.step_number >= 3
-                        ? 'error'
-                        : undefined
-                }
-                className={{
-                  badge: 'rounded-lg px-2',
-                }}
-              >
-                <Icon
-                  icon='mdi:circle'
-                  width={12}
-                  height={12}
-                  color={
-                    projectFlock.approval.step_number == 1
-                      ? 'neutral'
-                      : projectFlock.approval.step_number == 2
-                        ? 'success'
-                        : projectFlock.approval.step_number >= 3
-                          ? 'error'
-                          : undefined
-                  }
-                />{' '}
-                {projectFlock.approval.step_name}
-              </Badge>
-              <div className='divider divider-horizontal p-0 m-0'></div>
-              <Badge
-                color='neutral'
-                variant='soft'
-                className={{ badge: 'rounded-lg px-2' }}
-              >
-                <Icon icon='mdi:bookmark' width={12} height={12} />
-                {` ${formatTitleCase(projectFlock.category)}`}
-              </Badge>
-            </div>
-            {/* Information Grid */}
-            <div className='grid grid-cols-3 gap-4'>
-              <div className='col-span-1 flex flex-row items-center text-gray-400 font-semibold gap-2'>
-                <Icon width={14} height={14} icon='mdi:account' /> Submitted
-              </div>
-              <div className='col-span-2'>
-                <Badge
-                  variant='soft'
-                  color='neutral'
-                  className={{
-                    badge: 'rounded-lg px-2',
-                  }}
-                >
-                  <Icon icon='mdi:account-circle' width={14} height={14} />{' '}
-                  {projectFlock.created_user.name}
-                </Badge>
-              </div>
-
-              <div className='col-span-1 flex flex-row items-center text-gray-400 font-semibold gap-2'>
-                <Icon width={14} height={14} icon={'mdi:clock'} /> History
-              </div>
-              <div className='col-span-2'>
-                <Button variant='outline' className='py-1 text-sm'>
-                  See History{' '}
-                  <Icon
-                    icon='mdi:arrow-top-right-thin'
-                    width={11}
-                    height={11}
-                  />
-                </Button>
-              </div>
-
-              {/* BARIS 1 */}
-              <div
-                className='col-span-1 flex flex-row items-center text-gray-400 font-semibold gap-2 
-        relative 
-        before:content-[""] before:absolute before:left-[5px] before:top-[90%] before:bottom-[-100%] before:w-[1px] before:border-1 before:border-dashed before:border-gray-400'
-              >
-                <Icon width={14} height={14} icon='mdi:circle-slice-8' /> Area
-              </div>
-              <div className='col-span-2'>{projectFlock.area.name}</div>
-
-              {/* BARIS 2 */}
-              <div
-                className='col-span-1 flex flex-row items-center text-gray-400 font-semibold gap-2 
-        relative 
-        before:content-[""] before:absolute before:left-[5px] before:top-[90%] before:bottom-[-100%] before:w-[1px] before:border-1 before:border-dashed before:border-gray-400'
-              >
-                <Icon width={14} height={14} icon='mdi:circle-slice-8' /> Lokasi
-              </div>
-              <div className='col-span-2'>{projectFlock.location.name}</div>
-
-              <div
-                className='col-span-1 flex flex-row items-center text-gray-400 font-semibold gap-2 
-        relative 
-        before:content-[""] before:absolute before:left-[5px] before:top-[90%] before:bottom-[-100%] before:w-[1px] before:border-1 before:border-dashed before:border-gray-400'
-              >
-                <Icon width={14} height={14} icon='mdi:circle-slice-8' /> FCR
-              </div>
-              <div className='col-span-2'>{projectFlock.fcr.name}</div>
-
-              {/* BARIS 3 (Terakhir - TIDAK PERLU garis di bawahnya) */}
-              <div className='col-span-1 flex flex-row items-center text-gray-400 font-semibold gap-2'>
-                <Icon width={14} height={14} icon='mdi:circle-slice-8' />{' '}
-                Kategori
-              </div>
-              <div className='col-span-2'>
-                {formatTitleCase(projectFlock.category)}
-              </div>
-            </div>
-          </div>
-        </div>
-      )}
-      {/* <Card
-        title='Informasi Flock'
-        className={{
-          wrapper: 'w-full bg-white mb-3',
-        }}
-      >
-        <Table<ProjectFlock>
-          emptyContent={
-            <div className='w-full p-5 text-center'>
-              <span className='text-lg opacity-50'>
-                Pilih project flock terlebih dahulu...
-              </span>
-            </div>
-          }
-          data={projectFlock ? [projectFlock] : []}
-          columns={[
-            {
-              header: 'ID',
-              accessorKey: 'id',
-            },
-            {
-              header: 'Area',
-              accessorKey: 'area.name',
-            },
-            {
-              header: 'Lokasi',
-              accessorKey: 'location.name',
-            },
-            {
-              header: 'Nama Flock',
-              accessorKey: 'flock_name',
-            },
-            {
-              header: 'Kategori',
-              accessorKey: 'category',
-            },
-            {
-              header: 'Status',
-              accessorKey: 'status',
-              cell: (props) => {
-                return props.row.original.approval?.step_name ? (
-                  <PillBadge
-                    color={(() => {
-                      switch (
-                        props.row.original.approval?.step_name.toUpperCase()
-                      ) {
-                        case 'AKTIF':
-                          return 'red';
-                        case 'PENGAJUAN':
-                          return 'green';
-                        default:
-                          return 'gray';
-                      }
-                    })()}
-                    content={props.row.original.approval?.step_name
-                      .toLowerCase()
-                      .replace(/_/g, ' ')
-                      .replace(/\b\w/g, (char) => char.toUpperCase())}
-                  />
-                ) : (
-                  '-'
-                );
-              },
-            },
-            {
-              header: 'FCR Layer',
-              accessorKey: 'fcr.name',
-            },
-          ]}
-          page={undefined}
-          className={{
-            containerClassName: cn({
-              'mb-20': projectFlock && projectFlock.kandangs?.length === 0,
-            }),
-            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',
-          }}
-        />
-      </Card> */}
-      {/* Card Kandangs */}
-      <div className='border-t-1 border-gray-300'>
-        <div className='p-4 flex flex-col gap-4'>
-          <h2 className='text-2xl font-semibold'>Daftar Kandang</h2>
-          {isResponseSuccess(listProjectFlock) ? (
-            <>
-              {/* Badge Row  */}
-              <div className='flex flex-row gap-2'>
-                <Badge
-                  variant='soft'
-                  color={'success'}
-                  className={{
-                    badge: 'rounded-lg px-2',
-                  }}
-                >
-                  <Icon
-                    icon='mdi:circle'
-                    width={12}
-                    height={12}
-                    color={'success'}
-                  />{' '}
-                  Disetujui (
-                  {isResponseSuccess(listProjectFlockKandang) &&
-                    listProjectFlockKandang.data.filter(
-                      (k) => k.approval?.step_number == 1
-                    ).length}
-                  )
-                </Badge>
-                <div className='divider divider-horizontal p-0 m-0'></div>
-                <Badge
-                  variant='soft'
-                  color={'neutral'}
-                  className={{
-                    badge: 'rounded-lg px-2',
-                  }}
-                >
-                  <Icon
-                    icon='mdi:circle'
-                    width={12}
-                    height={12}
-                    color={'neutral'}
-                  />{' '}
-                  Pengajuan (
-                  {isResponseSuccess(listProjectFlockKandang) &&
-                    listProjectFlockKandang.data.filter(
-                      (k) => k.approval?.step_number == 2
-                    ).length}
-                  )
-                </Badge>
-                <div className='divider divider-horizontal p-0 m-0'></div>
-                <Badge
-                  color='error'
-                  variant='soft'
-                  className={{ badge: 'rounded-lg px-2' }}
-                >
-                  <Icon
-                    icon={`mdi:circle`}
-                    width={12}
-                    height={12}
-                    color='error'
-                  />
-                  Belum Chickin (
-                  {isResponseSuccess(listProjectFlockKandang) &&
-                    listProjectFlockKandang.data.filter(
-                      (k) => k.approval == null
-                    ).length}
-                  )
-                </Badge>
-              </div>
-              {/* Card Kandang */}
-              <Card
-                variant='bordered'
-                className={{
-                  wrapper: 'w-full',
-                  body: 'p-3',
-                }}
-              >
-                <div className='flex flex-col gap-6'>
-                  {isResponseSuccess(listProjectFlockKandang) &&
-                    listProjectFlockKandang.data.map((kandang) => (
-                      <div
-                        key={kandang.id}
-                        className='flex flex-row justify-between items-center'
-                      >
-                        <div className='flex flex-row gap-2 items-center cursor-pointer text-gray-400'>
-                          <Badge
-                            variant='soft'
-                            color={
-                              kandang.approval
-                                ? kandang.approval.step_number == 1
-                                  ? 'success'
-                                  : 'neutral'
-                                : 'error'
-                            }
-                            className={{
-                              badge: 'rounded-lg px-2',
-                            }}
-                          >
-                            <Icon
-                              icon='mdi:circle'
-                              width={12}
-                              height={12}
-                              color={
-                                kandang.approval
-                                  ? kandang.approval.step_number == 1
-                                    ? 'success'
-                                    : 'neutral'
-                                  : 'gray'
-                              }
-                            />
-                          </Badge>
-                          <span className='font-semibold'>
-                            {kandang.kandang.name}
-                          </span>
-                        </div>
-                        <RequirePermission permissions='lti.production.chickins.create'>
-                          <Button
-                            variant='outline'
-                            className='py-1 text-sm'
-                            onClick={() => {
-                              handleChickinClick(kandang);
-                            }}
-                            disabled={projectFlock?.approval?.step_number === 1}
-                          >
-                            Chick In{' '}
-                            <Icon
-                              icon='mdi:arrow-top-right-thin'
-                              width={11}
-                              height={11}
-                            />
-                          </Button>
-                        </RequirePermission>
-                      </div>
-                    ))}
-                </div>
-              </Card>
-            </>
-          ) : (
-            <div className='w-full p-5 text-center'>
-              <span className='text-lg opacity-50'>
-                Pilih project flock terlebih dahulu...
-              </span>
-            </div>
-          )}
-        </div>
-      </div>
-      {/* <Card
-        title='Daftar Kandang'
-        className={{
-          wrapper: 'w-full bg-white',
-        }}
-      >
-        <Table<ProjectFlockKandang>
-          emptyContent={
-            <div className='w-full p-5 text-center'>
-              <span className='text-lg opacity-50'>
-                Pilih project flock terlebih dahulu...
-              </span>
-            </div>
-          }
-          data={
-            projectFlock && isResponseSuccess(listProjectFlockKandang)
-              ? listProjectFlockKandang.data
-              : []
-          }
-          columns={[
-            {
-              header: '#',
-              cell: (props) =>
-                tableFilterState.pageSize * (tableFilterState.page - 1) +
-                props.row.index +
-                1,
-            },
-            {
-              accessorFn: (row) => row?.project_flock?.area?.name,
-              header: 'Area',
-            },
-            {
-              accessorFn: (row) => row?.project_flock?.location?.name,
-              header: 'Lokasi',
-            },
-            {
-              accessorKey: 'kandang.name',
-              header: 'Kandang',
-            },
-            {
-              accessorKey: 'kandang.capacity',
-              header: 'Kapasitas',
-            },
-            {
-              accessorFn: () => projectFlock?.period,
-              header: 'Periode',
-            },
-            {
-              accessorKey: 'approval.step_name',
-              header: 'Status',
-              cell: (props) => {
-                return props.row.original.approval?.step_name ? (
-                  <PillBadge
-                    color={(() => {
-                      switch (
-                        props.row.original.approval?.step_name.toUpperCase()
-                      ) {
-                        case 'DISETUJUI':
-                          return 'green';
-                        case 'PENGAJUAN':
-                          return 'yellow';
-                        default:
-                          return 'gray';
-                      }
-                    })()}
-                    content={props.row.original.approval?.step_name
-                      .toLowerCase()
-                      .replace(/_/g, ' ')
-                      .replace(/\b\w/g, (char) => char.toUpperCase())}
-                  />
-                ) : projectFlock?.approval?.step_number === 1 ? (
-                  <PillBadge color='red' content={'Tidak Dapat Chick In'} />
-                ) : (
-                  <PillBadge color='gray' content={'Belum Chick In'} />
-                );
-              },
-            },
-            {
-              header: 'Aksi',
-              cell: (props) => {
-                return (
-                  <>
-                    <Button
-                      color='success'
-                      variant='outline'
-                      onClick={() => {
-                        handleChickinClick(props.row.original);
-                      }}
-                      className='p-1'
-                      disabled={projectFlock?.approval?.step_number === 1}
-                    >
-                      <Icon
-                        icon='mdi:home-import-outline'
-                        width={18}
-                        height={18}
-                      />
-                      Chickin
-                    </Button>
-                  </>
-                );
-              },
-            },
-          ]}
-          page={undefined}
-          className={{
-            containerClassName: cn({
-              'mb-20': projectFlock && projectFlock.kandangs?.length === 0,
-            }),
-            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',
-          }}
-        />
-      </Card> */}
-    </>
-  );
-};
-
-export default ProjectFlockChickinDetail;
diff --git a/src/components/pages/production/project-flock/closing/ProjectFlockClosingForm.tsx b/src/components/pages/production/project-flock/closing/ProjectFlockClosingForm.tsx
index 8caaf216..ead77e30 100644
--- a/src/components/pages/production/project-flock/closing/ProjectFlockClosingForm.tsx
+++ b/src/components/pages/production/project-flock/closing/ProjectFlockClosingForm.tsx
@@ -22,6 +22,7 @@ import toast from 'react-hot-toast';
 import { useRouter } from 'next/navigation';
 import { ProductWarehouse } from '@/types/api/inventory/product-warehouse';
 import { ApprovalApi } from '@/services/api/approval';
+import RequirePermission from '@/components/helper/RequirePermission';
 
 const ProjectFlockClosingForm = ({
   projectFlock,
@@ -285,16 +286,18 @@ const ProjectFlockClosingForm = ({
       </div>
 
       <div className='p-4 mt-6'>
-        <Button
-          className='w-full'
-          color='error'
-          isLoading={isLoading}
-          disabled={!isCanCloseValid}
-          onClick={() => closeModal.openModal()}
-        >
-          <Icon icon='mdi:checkbox-marked-circle-outline' />{' '}
-          {isCanClose ? 'Close' : 'Unclose'}
-        </Button>
+        <RequirePermission permissions='lti.production.project_flock_kandangs.closing'>
+          <Button
+            className='w-full'
+            color='error'
+            isLoading={isLoading}
+            disabled={!isCanCloseValid}
+            onClick={() => closeModal.openModal()}
+          >
+            <Icon icon='mdi:checkbox-marked-circle-outline' />{' '}
+            {isCanClose ? 'Close' : 'Unclose'}
+          </Button>
+        </RequirePermission>
       </div>
 
       <ConfirmationModal
diff --git a/src/components/pages/production/project-flock/detail/ProjectFlockDetail.tsx b/src/components/pages/production/project-flock/detail/ProjectFlockDetail.tsx
index 0ee3ae32..9835c244 100644
--- a/src/components/pages/production/project-flock/detail/ProjectFlockDetail.tsx
+++ b/src/components/pages/production/project-flock/detail/ProjectFlockDetail.tsx
@@ -423,7 +423,7 @@ const ProjectFlockDetail = ({
               </RadioGroup>
             </Card>
             <div className='grid grid-cols-4 gap-3'>
-              <RequirePermission permissions='lti.production.chickins.create'>
+              <RequirePermission permissions='lti.production.chickins.detail'>
                 <Link
                   href={`/production/project-flock/chickin/add/kandang?projectFlockKandangId=${selectedKandang?.project_flock_kandang_id}&projectFlockId=${projectFlock.id}`}
                   className='m-0 p-0'
@@ -441,7 +441,7 @@ const ProjectFlockDetail = ({
                   </Button>
                 </Link>
               </RequirePermission>
-              <RequirePermission permissions='lti.production.project_flock_kandangs.closing'>
+              <RequirePermission permissions='lti.production.project_flock_kandangs.closing.detail'>
                 <Link
                   href={`/production/project-flock/closing?projectFlockId=${projectFlock.id}&projectFlockKandangId=${selectedKandang?.project_flock_kandang_id}`}
                   className='m-0 p-0'
diff --git a/src/components/table/TableRowSizeSelector.tsx b/src/components/table/TableRowSizeSelector.tsx
index 645151b6..9df9b426 100644
--- a/src/components/table/TableRowSizeSelector.tsx
+++ b/src/components/table/TableRowSizeSelector.tsx
@@ -1,4 +1,5 @@
 import SelectInput from '@/components/input/SelectInput';
+import { cn } from '@/lib/helper';
 
 export interface OptionType {
   label: string;
@@ -10,6 +11,7 @@ interface TableRowSizeSelectorProps {
   onChange: (val: OptionType | OptionType[] | null) => void;
   options: OptionType[];
   children?: React.ReactNode;
+  className?: string;
 }
 
 export const TableRowSizeSelector = ({
@@ -17,9 +19,10 @@ export const TableRowSizeSelector = ({
   onChange,
   options,
   children,
+  className,
 }: TableRowSizeSelectorProps) => {
   return (
-    <div className='flex flex-row gap-3 items-end justify-end'>
+    <div className={cn('flex flex-row gap-3 items-end justify-end', className)}>
       {children}
       <SelectInput
         label='Baris'
diff --git a/src/config/constant.ts b/src/config/constant.ts
index e07731fb..047ed279 100644
--- a/src/config/constant.ts
+++ b/src/config/constant.ts
@@ -42,6 +42,11 @@ export const MAIN_DRAWER_LINKS: SidebarMenuItem[] = [
     link: '/marketing',
     icon: 'heroicons-outline:currency-dollar',
   },
+  {
+    text: 'Keuangan',
+    link: '/finance',
+    icon: 'heroicons-outline:banknotes',
+  },
   {
     text: 'Biaya',
     link: '/expense',
@@ -185,6 +190,10 @@ export const MAIN_DRAWER_LINKS: SidebarMenuItem[] = [
         link: '/master-data/flock',
         permission: ['lti.master.flocks.list'],
       },
+      {
+        text: 'Standar Produksi',
+        link: '/master-data/production-standard',
+      },
     ],
   },
 ] as const;
@@ -278,6 +287,30 @@ export const RECORDING_FLAG_OPTIONS = [
   { label: 'Ayam Mati', value: 'Ayam Mati' },
 ];
 
+export const FINANCE_PARTY_TYPE_OPTIONS = [
+  { label: 'Customer', value: 'CUSTOMER' },
+  { label: 'Supplier', value: 'SUPPLIER' },
+];
+
+export const FINANCE_PAYMENT_METHOD_OPTIONS = [
+  { label: 'Transfer', value: 'TRANSFER' },
+  { label: 'Cash', value: 'CASH' },
+  { label: 'Card', value: 'CARD' },
+  { label: 'Cheque', value: 'CHEQUE' },
+  { label: 'Saldo', value: 'SALDO' },
+];
+
+export const FINANCE_INITIAL_BALANCE_TYPE_OPTIONS = [
+  { label: 'Saldo Awal Positif', value: 'POSITIVE' },
+  { label: 'Saldo Awal Negatif', value: 'NEGATIVE' },
+];
+
+export const FINANCE_TRANSACTION_STATUS = ['PENJUALAN', 'BIAYA'];
+
+export const FINANCE_INITIAL_BALANCE_STATUS = ['SALDO_AWAL'];
+
+export const FINANCE_INJECTION_STATUS = ['INJECTION'];
+
 export const APPROVAL_WORKFLOWS = [
   {
     key: 'PROJECT_FLOCKS',
diff --git a/src/config/route-permission.ts b/src/config/route-permission.ts
index ed6d4771..1b9df69d 100644
--- a/src/config/route-permission.ts
+++ b/src/config/route-permission.ts
@@ -7,16 +7,23 @@ export const ROUTE_PERMISSIONS: Record<string, string[]> = {
   // Production
   // Production - Project Flock
   '/production/project-flock/': ['lti.production.project_flocks.list'],
-  '/production/project-flock/add/': ['lti.production.project_flocks.create'],
+  '/production/project-flock/add/': [
+    'lti.production.project_flocks.create',
+    'lti.production.project_flocks.delete',
+  ],
   '/production/project-flock/detail/': ['lti.production.project_flocks.detail'],
   '/production/project-flock/detail/edit/': [
     'lti.production.project_flocks.update',
+    'lti.production.project_flocks.delete',
   ],
   '/production/project-flock/chickin/add/kandang/': [
     'lti.production.chickins.create',
+    'lti.production.chickins.detail',
+    'lti.production.chickins.approve',
   ],
   '/production/project-flock/closing/': [
     'lti.production.project_flock_kandangs.closing',
+    'lti.production.project_flock_kandangs.closing.detail',
   ],
 
   // Production - Recording
@@ -61,6 +68,28 @@ export const ROUTE_PERMISSIONS: Record<string, string[]> = {
   '/expense/realization/': ['lti.expense.create.realization'],
   '/expense/realization/edit/': ['lti.expense.update.realization'],
 
+  // Finance
+  // // ===== FINANCE =====
+  // 		"lti.finance.transaction.list",
+  // 		"lti.finance.transaction.detail",
+  // 		"lti.finance.transaction.delete",
+  // 		"lti.finance.payments.create",
+  // 		"lti.finance.payments.update",
+  // 		"lti.finance.initial_balances.create",
+  // 		"lti.finance.initial_balances.update",
+  // 		"lti.finance.injections.create",
+  // 		"lti.finance.injections.update",
+  '/finance/': ['lti.finance.transaction.list'],
+  '/finance/detail/': ['lti.finance.transaction.detail'],
+  '/finance/add/': ['lti.finance.payments.create'],
+  '/finance/detail/edit/': ['lti.finance.payments.update'],
+  '/finance/add/initial-balance/': ['lti.finance.initial_balances.create'],
+  '/finance/detail/edit/initial-balance/': [
+    'lti.finance.initial_balances.update',
+  ],
+  '/finance/add/injection/': ['lti.finance.injections.create'],
+  '/finance/detail/edit/injection/': ['lti.finance.injections.update'],
+
   // Closing
   '/closing/': ['lti.closing.list'],
   '/closing/detail/': ['lti.closing.detail'],
@@ -152,4 +181,15 @@ export const ROUTE_PERMISSIONS: Record<string, string[]> = {
   '/master-data/flock/add/': ['lti.master.flocks.create'],
   '/master-data/flock/detail/': ['lti.master.flocks.detail'],
   '/master-data/flock/detail/edit/': ['lti.master.flocks.update'],
+
+  '/master-data/production-standard/': ['lti.master.production_standards.list'],
+  '/master-data/production-standard/add/': [
+    'lti.master.production_standards.create',
+  ],
+  '/master-data/production-standard/detail/': [
+    'lti.master.production_standards.detail',
+  ],
+  '/master-data/production-standard/detail/edit/': [
+    'lti.master.production_standards.update',
+  ],
 };
diff --git a/src/dummy/closing.dummy.ts b/src/dummy/closing.dummy.ts
deleted file mode 100644
index 3b9a9a7b..00000000
--- a/src/dummy/closing.dummy.ts
+++ /dev/null
@@ -1,1175 +0,0 @@
-/**
- * Dummy Data untuk Closing API
- *
- * File ini berisi dummy data untuk testing API Closing sebelum backend siap.
- *
- * Struktur data mengikuti tipe yang didefinisikan di @/types/api/closing.d.ts
- *
- * @example
- * // 1. Menggunakan getAllFetcher dengan SWR:
- * import useSWR from 'swr';
- * import { ClosingApi } from '@/services/api/closing';
- *
- * const { data, error, isLoading } = useSWR(
- *   '/closings',
- *   ClosingApi.getAllFetcher.bind(ClosingApi)
- * );
- *
- * if (data?.status === 'success') {
- *   console.log(data.data); // Array of Closing objects
- * }
- *
- * @example
- * // 2. Menggunakan getSingle:
- * import { ClosingApi } from '@/services/api/closing';
- *
- * const response = await ClosingApi.getSingle(1);
- * if (response?.status === 'success') {
- *   console.log(response.data); // Single Closing object
- * } else if (response?.status === 'error') {
- *   console.error(response.message); // Error message
- * }
- *
- * @example
- * // 3. Menggunakan getGeneralInfo dengan SWR:
- * import useSWR from 'swr';
- * import { ClosingApi } from '@/services/api/closing';
- *
- * const closingId = 1;
- * const { data, error, isLoading } = useSWR(
- *   closingId,
- *   (id: number) => ClosingApi.getGeneralInfo(id)
- * );
- *
- * if (data?.status === 'success') {
- *   console.log(data.data); // ClosingGeneralInformation object
- * }
- *
- * @example
- * // 4. Menggunakan getAllIncomingSapronakFetcher dengan SWR:
- * import useSWR from 'swr';
- * import { ClosingApi } from '@/services/api/closing';
- *
- * const { data, error, isLoading } = useSWR(
- *   `${ClosingApi.basePath}/1/sapronak/incoming`,
- *   ClosingApi.getAllIncomingSapronakFetcher.bind(ClosingApi)
- * );
- *
- * if (data?.status === 'success') {
- *   console.log(data.data); // Array of ClosingIncomingSapronak
- * }
- *
- * @example
- * // 5. Menggunakan getAllOutgoingSapronakFetcher dengan SWR:
- * import useSWR from 'swr';
- * import { ClosingApi } from '@/services/api/closing';
- *
- * const { data, error, isLoading } = useSWR(
- *   `${ClosingApi.basePath}/1/sapronak/outgoing`,
- *   ClosingApi.getAllOutgoingSapronakFetcher.bind(ClosingApi)
- * );
- *
- * if (data?.status === 'success') {
- *   console.log(data.data); // Array of ClosingOutgoingSapronak
- * }
- *
- * @see {@link /home/sweetpotet/Documents/projects/lti-web-client/src/types/api/closing.d.ts}
- */
-
-import { format } from 'date-fns';
-import {
-  Closing,
-  ClosingGeneralInformation,
-  ClosingIncomingSapronak,
-  ClosingOutgoingSapronak,
-  ClosingOverhead,
-  ClosingProductionData,
-  ClosingSapronakCalculation,
-} from '@/types/api/closing';
-import { CreatedUser, BaseApiResponse } from '@/types/api/api-general';
-
-// Waktu saat ini untuk created_at/updated_at
-const now = format(new Date(), 'yyyy-MM-dd HH:mm:ss');
-const today = format(new Date(), 'yyyy-MM-dd');
-const yesterday = format(
-  new Date().setDate(new Date().getDate() - 1),
-  'yyyy-MM-dd'
-);
-const lastWeek = format(
-  new Date().setDate(new Date().getDate() - 7),
-  'yyyy-MM-dd'
-);
-const lastMonth = format(
-  new Date().setMonth(new Date().getMonth() - 1),
-  'yyyy-MM-dd'
-);
-
-// ======================
-// 👤 Created User
-// ======================
-export const createdUser: CreatedUser = {
-  id: 1,
-  id_user: 1,
-  email: 'admin@example.com',
-  name: 'Admin Utama',
-};
-
-// ======================
-// 📊 Closing Dummy Data
-// ======================
-export const dummyClosings: Closing[] = [
-  // 1. Closing dengan status Pengajuan - GROWING
-  {
-    id: 1,
-    location_id: 1,
-    location_name: 'Farm Sukajadi',
-    project_category: 'GROWING',
-    period: 1,
-    closing_date: today,
-    shed_label: 'Kandang A1, A2, A3',
-    shed_count: 3,
-    sales_paid_amount: 150000000,
-    sales_remaining_amount: 50000000,
-    sales_payment_status: 'Sebagian Lunas',
-    project_status: 'Pengajuan',
-    created_user: createdUser,
-    created_at: now,
-    updated_at: now,
-  },
-
-  // 2. Closing dengan status Aktif - LAYING
-  {
-    id: 2,
-    location_id: 2,
-    location_name: 'Farm Cihampelas',
-    project_category: 'LAYING',
-    period: 2,
-    closing_date: yesterday,
-    shed_label: 'Kandang B1, B2',
-    shed_count: 2,
-    sales_paid_amount: 200000000,
-    sales_remaining_amount: 0,
-    sales_payment_status: 'Lunas',
-    project_status: 'Aktif',
-    created_user: createdUser,
-    created_at: lastWeek,
-    updated_at: yesterday,
-  },
-
-  // 3. Closing dengan status Selesai - GROWING
-  {
-    id: 3,
-    location_id: 3,
-    location_name: 'Farm Pasteur',
-    project_category: 'GROWING',
-    period: 3,
-    closing_date: lastWeek,
-    shed_label: 'Kandang C1, C2, C3, C4',
-    shed_count: 4,
-    sales_paid_amount: 300000000,
-    sales_remaining_amount: 25000000,
-    sales_payment_status: 'Sebagian Lunas',
-    project_status: 'Selesai',
-    created_user: createdUser,
-    created_at: lastMonth,
-    updated_at: lastWeek,
-  },
-
-  // 4. Closing dengan status Aktif - LAYING
-  {
-    id: 4,
-    location_id: 4,
-    location_name: 'Farm Setiabudi',
-    project_category: 'LAYING',
-    period: 1,
-    closing_date: today,
-    shed_label: 'Kandang D1',
-    shed_count: 1,
-    sales_paid_amount: 75000000,
-    sales_remaining_amount: 75000000,
-    sales_payment_status: 'Belum Lunas',
-    project_status: 'Aktif',
-    created_user: createdUser,
-    created_at: yesterday,
-    updated_at: now,
-  },
-
-  // 5. Closing dengan status Selesai - GROWING
-  {
-    id: 5,
-    location_id: 5,
-    location_name: 'Farm Dago',
-    project_category: 'GROWING',
-    period: 4,
-    closing_date: lastMonth,
-    shed_label: 'Kandang E1, E2, E3, E4, E5',
-    shed_count: 5,
-    sales_paid_amount: 500000000,
-    sales_remaining_amount: 0,
-    sales_payment_status: 'Lunas',
-    project_status: 'Selesai',
-    created_user: createdUser,
-    created_at: lastMonth,
-    updated_at: lastMonth,
-  },
-
-  // 6. Closing dengan status Pengajuan - LAYING
-  {
-    id: 6,
-    location_id: 6,
-    location_name: 'Farm Lembang',
-    project_category: 'LAYING',
-    period: 2,
-    closing_date: undefined, // Belum ada tanggal closing
-    shed_label: 'Kandang F1, F2',
-    shed_count: 2,
-    sales_paid_amount: 0,
-    sales_remaining_amount: 180000000,
-    sales_payment_status: 'Belum Lunas',
-    project_status: 'Pengajuan',
-    created_user: createdUser,
-    created_at: now,
-    updated_at: now,
-  },
-
-  // 7. Closing dengan status Aktif - GROWING
-  {
-    id: 7,
-    location_id: 7,
-    location_name: 'Farm Ciwidey',
-    project_category: 'GROWING',
-    period: 1,
-    closing_date: yesterday,
-    shed_label: 'Kandang G1, G2, G3',
-    shed_count: 3,
-    sales_paid_amount: 120000000,
-    sales_remaining_amount: 30000000,
-    sales_payment_status: 'Sebagian Lunas',
-    project_status: 'Aktif',
-    created_user: createdUser,
-    created_at: lastWeek,
-    updated_at: yesterday,
-  },
-
-  // 8. Closing dengan status Selesai - LAYING
-  {
-    id: 8,
-    location_id: 8,
-    location_name: 'Farm Bandung Timur',
-    project_category: 'LAYING',
-    period: 3,
-    closing_date: lastMonth,
-    shed_label: 'Kandang H1, H2, H3, H4, H5, H6',
-    shed_count: 6,
-    sales_paid_amount: 600000000,
-    sales_remaining_amount: 0,
-    sales_payment_status: 'Lunas',
-    project_status: 'Selesai',
-    created_user: createdUser,
-    created_at: lastMonth,
-    updated_at: lastMonth,
-  },
-];
-
-// ======================
-// 📊 Closing General Information Dummy Data
-// ======================
-export const dummyClosingGeneralInformations: ClosingGeneralInformation[] = [
-  // 1. General Info - GROWING - Pengajuan
-  {
-    id: 1,
-    location_id: 1,
-    location_name: 'Farm Sukajadi',
-    project_category: 'GROWING',
-    period: 1,
-    closing_date: today,
-    shed_label: 'Kandang A1, A2, A3',
-    shed_count: 3,
-    sales_paid_amount: 150000000,
-    sales_remaining_amount: 50000000,
-    sales_payment_status: 'Sebagian Lunas',
-    project_status: 'Pengajuan',
-    flock_id: 101,
-    project_type: 'GROWING',
-    population: 15000,
-    active_house_count: 3,
-    closing_status: 'Draft',
-    created_user: createdUser,
-    created_at: now,
-    updated_at: now,
-  },
-
-  // 2. General Info - LAYING - Aktif
-  {
-    id: 2,
-    location_id: 2,
-    location_name: 'Farm Cihampelas',
-    project_category: 'LAYING',
-    period: 2,
-    closing_date: yesterday,
-    shed_label: 'Kandang B1, B2',
-    shed_count: 2,
-    sales_paid_amount: 200000000,
-    sales_remaining_amount: 0,
-    sales_payment_status: 'Lunas',
-    project_status: 'Aktif',
-    flock_id: 102,
-    project_type: 'LAYING',
-    population: 10000,
-    active_house_count: 2,
-    closing_status: 'In Progress',
-    created_user: createdUser,
-    created_at: lastWeek,
-    updated_at: yesterday,
-  },
-
-  // 3. General Info - GROWING - Selesai
-  {
-    id: 3,
-    location_id: 3,
-    location_name: 'Farm Pasteur',
-    project_category: 'GROWING',
-    period: 3,
-    closing_date: lastWeek,
-    shed_label: 'Kandang C1, C2, C3, C4',
-    shed_count: 4,
-    sales_paid_amount: 300000000,
-    sales_remaining_amount: 25000000,
-    sales_payment_status: 'Sebagian Lunas',
-    project_status: 'Selesai',
-    flock_id: 103,
-    project_type: 'GROWING',
-    population: 20000,
-    active_house_count: 4,
-    closing_status: 'Completed',
-    created_user: createdUser,
-    created_at: lastMonth,
-    updated_at: lastWeek,
-  },
-
-  // 4. General Info - LAYING - Aktif
-  {
-    id: 4,
-    location_id: 4,
-    location_name: 'Farm Setiabudi',
-    project_category: 'LAYING',
-    period: 1,
-    closing_date: today,
-    shed_label: 'Kandang D1',
-    shed_count: 1,
-    sales_paid_amount: 75000000,
-    sales_remaining_amount: 75000000,
-    sales_payment_status: 'Belum Lunas',
-    project_status: 'Aktif',
-    flock_id: 104,
-    project_type: 'LAYING',
-    population: 5000,
-    active_house_count: 1,
-    closing_status: 'In Progress',
-    created_user: createdUser,
-    created_at: yesterday,
-    updated_at: now,
-  },
-
-  // 5. General Info - GROWING - Selesai
-  {
-    id: 5,
-    location_id: 5,
-    location_name: 'Farm Dago',
-    project_category: 'GROWING',
-    period: 4,
-    closing_date: lastMonth,
-    shed_label: 'Kandang E1, E2, E3, E4, E5',
-    shed_count: 5,
-    sales_paid_amount: 500000000,
-    sales_remaining_amount: 0,
-    sales_payment_status: 'Lunas',
-    project_status: 'Selesai',
-    flock_id: 105,
-    project_type: 'GROWING',
-    population: 25000,
-    active_house_count: 5,
-    closing_status: 'Completed',
-    created_user: createdUser,
-    created_at: lastMonth,
-    updated_at: lastMonth,
-  },
-
-  // 6. General Info - LAYING - Pengajuan
-  {
-    id: 6,
-    location_id: 6,
-    location_name: 'Farm Lembang',
-    project_category: 'LAYING',
-    period: 2,
-    closing_date: undefined,
-    shed_label: 'Kandang F1, F2',
-    shed_count: 2,
-    sales_paid_amount: 0,
-    sales_remaining_amount: 180000000,
-    sales_payment_status: 'Belum Lunas',
-    project_status: 'Pengajuan',
-    flock_id: 106,
-    project_type: 'LAYING',
-    population: 12000,
-    active_house_count: 2,
-    closing_status: 'Draft',
-    created_user: createdUser,
-    created_at: now,
-    updated_at: now,
-  },
-
-  // 7. General Info - GROWING - Aktif
-  {
-    id: 7,
-    location_id: 7,
-    location_name: 'Farm Ciwidey',
-    project_category: 'GROWING',
-    period: 1,
-    closing_date: yesterday,
-    shed_label: 'Kandang G1, G2, G3',
-    shed_count: 3,
-    sales_paid_amount: 120000000,
-    sales_remaining_amount: 30000000,
-    sales_payment_status: 'Sebagian Lunas',
-    project_status: 'Aktif',
-    flock_id: 107,
-    project_type: 'GROWING',
-    population: 18000,
-    active_house_count: 3,
-    closing_status: 'In Progress',
-    created_user: createdUser,
-    created_at: lastWeek,
-    updated_at: yesterday,
-  },
-
-  // 8. General Info - LAYING - Selesai
-  {
-    id: 8,
-    location_id: 8,
-    location_name: 'Farm Bandung Timur',
-    project_category: 'LAYING',
-    period: 3,
-    closing_date: lastMonth,
-    shed_label: 'Kandang H1, H2, H3, H4, H5, H6',
-    shed_count: 6,
-    sales_paid_amount: 600000000,
-    sales_remaining_amount: 0,
-    sales_payment_status: 'Lunas',
-    project_status: 'Selesai',
-    flock_id: 108,
-    project_type: 'LAYING',
-    population: 30000,
-    active_house_count: 6,
-    closing_status: 'Completed',
-    created_user: createdUser,
-    created_at: lastMonth,
-    updated_at: lastMonth,
-  },
-];
-
-// ======================
-// 📦 Incoming Sapronak Dummy Data
-// ======================
-export const dummyIncomingSapronaks: ClosingIncomingSapronak[] = [
-  {
-    id: 1,
-    date: today,
-    reference_number: 'IN-2025-001',
-    transaction_type: 'Pembelian',
-    product_name: 'DOC Broiler Cobb 500',
-    product_category: 'DOC',
-    product_sub_category: 'DOC Broiler',
-    source_warehouse: 'Gudang Pusat',
-    destination_warehouse: 'Kandang A1',
-    quantity: 5000,
-    unit: 'Ekor',
-    formatted_quantity: '5,000 Ekor',
-    notes: 'DOC berkualitas tinggi dari supplier terpercaya',
-  },
-  {
-    id: 2,
-    date: yesterday,
-    reference_number: 'IN-2025-002',
-    transaction_type: 'Transfer Masuk',
-    product_name: 'Pakan Starter BR-1',
-    product_category: 'Pakan',
-    product_sub_category: 'Starter',
-    source_warehouse: 'Gudang Area Bandung',
-    destination_warehouse: 'Kandang B1',
-    quantity: 100,
-    unit: 'Sak',
-    formatted_quantity: '100 Sak (5,000 Kg)',
-    notes: 'Pakan starter untuk periode awal',
-  },
-  {
-    id: 3,
-    date: lastWeek,
-    reference_number: 'IN-2025-003',
-    transaction_type: 'Pembelian',
-    product_name: 'Vitamin B Complex',
-    product_category: 'OVK',
-    product_sub_category: 'Vitamin',
-    source_warehouse: 'Supplier Medion',
-    destination_warehouse: 'Gudang Farmasi',
-    quantity: 50,
-    unit: 'Botol',
-    formatted_quantity: '50 Botol',
-    notes: 'Vitamin untuk meningkatkan daya tahan tubuh',
-  },
-  {
-    id: 4,
-    date: today,
-    reference_number: 'IN-2025-004',
-    transaction_type: 'Pembelian',
-    product_name: 'Pakan Finisher BR-2',
-    product_category: 'Pakan',
-    product_sub_category: 'Finisher',
-    source_warehouse: 'Gudang Pusat',
-    destination_warehouse: 'Kandang C1',
-    quantity: 200,
-    unit: 'Sak',
-    formatted_quantity: '200 Sak (10,000 Kg)',
-    notes: 'Pakan finisher untuk periode akhir',
-  },
-  {
-    id: 5,
-    date: yesterday,
-    reference_number: 'IN-2025-005',
-    transaction_type: 'Transfer Masuk',
-    product_name: 'Antibiotik Enrofloxacin',
-    product_category: 'OVK',
-    product_sub_category: 'Obat',
-    source_warehouse: 'Gudang Area Jakarta',
-    destination_warehouse: 'Gudang Farmasi',
-    quantity: 30,
-    unit: 'Box',
-    formatted_quantity: '30 Box',
-    notes: 'Antibiotik untuk pencegahan penyakit',
-  },
-];
-
-// ======================
-// 📤 Outgoing Sapronak Dummy Data
-// ======================
-export const dummyOutgoingSapronaks: ClosingOutgoingSapronak[] = [
-  {
-    id: 1,
-    date: today,
-    reference_number: 'OUT-2025-001',
-    transaction_type: 'Pemakaian',
-    product_name: 'Pakan Starter BR-1',
-    product_category: 'Pakan',
-    product_sub_category: 'Starter',
-    source_warehouse: 'Kandang A1',
-    destination_warehouse: 'Konsumsi Kandang A1',
-    quantity: 50,
-    unit: 'Sak',
-    formatted_quantity: '50 Sak (2,500 Kg)',
-    notes: 'Pemakaian pakan harian periode starter',
-  },
-  {
-    id: 2,
-    date: yesterday,
-    reference_number: 'OUT-2025-002',
-    transaction_type: 'Transfer Keluar',
-    product_name: 'DOC Broiler Cobb 500',
-    product_category: 'DOC',
-    product_sub_category: 'DOC Broiler',
-    source_warehouse: 'Kandang B1',
-    destination_warehouse: 'Kandang B2',
-    quantity: 1000,
-    unit: 'Ekor',
-    formatted_quantity: '1,000 Ekor',
-    notes: 'Transfer DOC ke kandang baru',
-  },
-  {
-    id: 3,
-    date: lastWeek,
-    reference_number: 'OUT-2025-003',
-    transaction_type: 'Pemakaian',
-    product_name: 'Vitamin B Complex',
-    product_category: 'OVK',
-    product_sub_category: 'Vitamin',
-    source_warehouse: 'Gudang Farmasi',
-    destination_warehouse: 'Konsumsi Kandang C1',
-    quantity: 10,
-    unit: 'Botol',
-    formatted_quantity: '10 Botol',
-    notes: 'Pemberian vitamin untuk meningkatkan kesehatan',
-  },
-  {
-    id: 4,
-    date: today,
-    reference_number: 'OUT-2025-004',
-    transaction_type: 'Pemakaian',
-    product_name: 'Pakan Finisher BR-2',
-    product_category: 'Pakan',
-    product_sub_category: 'Finisher',
-    source_warehouse: 'Kandang C1',
-    destination_warehouse: 'Konsumsi Kandang C1',
-    quantity: 80,
-    unit: 'Sak',
-    formatted_quantity: '80 Sak (4,000 Kg)',
-    notes: 'Pemakaian pakan harian periode finisher',
-  },
-  {
-    id: 5,
-    date: yesterday,
-    reference_number: 'OUT-2025-005',
-    transaction_type: 'Pemakaian',
-    product_name: 'Antibiotik Enrofloxacin',
-    product_category: 'OVK',
-    product_sub_category: 'Obat',
-    source_warehouse: 'Gudang Farmasi',
-    destination_warehouse: 'Konsumsi Kandang D1',
-    quantity: 5,
-    unit: 'Box',
-    formatted_quantity: '5 Box',
-    notes: 'Pengobatan untuk ayam yang sakit',
-  },
-  {
-    id: 6,
-    date: lastWeek,
-    reference_number: 'OUT-2025-006',
-    transaction_type: 'Transfer Keluar',
-    product_name: 'Pakan Starter BR-1',
-    product_category: 'Pakan',
-    product_sub_category: 'Starter',
-    source_warehouse: 'Kandang E1',
-    destination_warehouse: 'Kandang E2',
-    quantity: 30,
-    unit: 'Sak',
-    formatted_quantity: '30 Sak (1,500 Kg)',
-    notes: 'Transfer pakan antar kandang',
-  },
-];
-
-// ======================
-// 📊 Perhitungan Sapronak Dummy Data
-// ======================
-export const dummySapronakCalculation: ClosingSapronakCalculation = {
-  // DOC Broiler Calculation
-  doc_broiler: {
-    rows: [
-      {
-        id: 1,
-        tanggal: today,
-        no_referensi: 'IN-2025-001',
-        qty_masuk: 5000,
-        qty_keluar: 0,
-        qty_pakai: 0,
-        uraian: 'DOC Broiler Cobb 500',
-        kategori_produk: 'DOC Broiler',
-        harga_beli_per_qty: 8000,
-        total_harga: 40000000,
-        keterangan: 'Pembelian DOC dari supplier',
-      },
-      {
-        id: 2,
-        tanggal: yesterday,
-        no_referensi: 'OUT-2025-002',
-        qty_masuk: 0,
-        qty_keluar: 1000,
-        qty_pakai: 0,
-        uraian: 'DOC Broiler Cobb 500',
-        kategori_produk: 'DOC Broiler',
-        harga_beli_per_qty: 8000,
-        total_harga: 8000000,
-        keterangan: 'Transfer DOC ke kandang lain',
-      },
-      {
-        id: 3,
-        tanggal: lastWeek,
-        no_referensi: 'USE-2025-001',
-        qty_masuk: 0,
-        qty_keluar: 0,
-        qty_pakai: 50,
-        uraian: 'DOC Broiler Cobb 500',
-        kategori_produk: 'DOC Broiler',
-        harga_beli_per_qty: 8000,
-        total_harga: 400000,
-        keterangan: 'Mortalitas DOC',
-      },
-    ],
-    total: {
-      label: 'Total DOC Broiler',
-      qty_masuk: 5000,
-      qty_keluar: 1000,
-      qty_pakai: 50,
-      harga_beli_per_qty: 8000,
-      total_harga: 48400000,
-    },
-  },
-
-  // OVK Calculation
-  ovk: {
-    rows: [
-      {
-        id: 1,
-        tanggal: today,
-        no_referensi: 'IN-2025-003',
-        qty_masuk: 50,
-        qty_keluar: 0,
-        qty_pakai: 0,
-        uraian: 'Vitamin B Complex',
-        kategori_produk: 'Vitamin',
-        harga_beli_per_qty: 150000,
-        total_harga: 7500000,
-        keterangan: 'Pembelian vitamin',
-      },
-      {
-        id: 2,
-        tanggal: yesterday,
-        no_referensi: 'IN-2025-005',
-        qty_masuk: 30,
-        qty_keluar: 0,
-        qty_pakai: 0,
-        uraian: 'Antibiotik Enrofloxacin',
-        kategori_produk: 'Obat',
-        harga_beli_per_qty: 250000,
-        total_harga: 7500000,
-        keterangan: 'Pembelian antibiotik',
-      },
-      {
-        id: 3,
-        tanggal: lastWeek,
-        no_referensi: 'OUT-2025-003',
-        qty_masuk: 0,
-        qty_keluar: 0,
-        qty_pakai: 10,
-        uraian: 'Vitamin B Complex',
-        kategori_produk: 'Vitamin',
-        harga_beli_per_qty: 150000,
-        total_harga: 1500000,
-        keterangan: 'Pemakaian vitamin',
-      },
-      {
-        id: 4,
-        tanggal: yesterday,
-        no_referensi: 'OUT-2025-005',
-        qty_masuk: 0,
-        qty_keluar: 0,
-        qty_pakai: 5,
-        uraian: 'Antibiotik Enrofloxacin',
-        kategori_produk: 'Obat',
-        harga_beli_per_qty: 250000,
-        total_harga: 1250000,
-        keterangan: 'Pemakaian antibiotik',
-      },
-    ],
-    total: {
-      label: 'Total OVK',
-      qty_masuk: 80,
-      qty_keluar: 0,
-      qty_pakai: 15,
-      harga_beli_per_qty: 200000,
-      total_harga: 17750000,
-    },
-  },
-
-  // Pakan Calculation
-  pakan: {
-    rows: [
-      {
-        id: 1,
-        tanggal: yesterday,
-        no_referensi: 'IN-2025-002',
-        qty_masuk: 100,
-        qty_keluar: 0,
-        qty_pakai: 0,
-        uraian: 'Pakan Starter BR-1',
-        kategori_produk: 'Starter',
-        harga_beli_per_qty: 450000,
-        total_harga: 45000000,
-        keterangan: 'Pembelian pakan starter',
-      },
-      {
-        id: 2,
-        tanggal: today,
-        no_referensi: 'IN-2025-004',
-        qty_masuk: 200,
-        qty_keluar: 0,
-        qty_pakai: 0,
-        uraian: 'Pakan Finisher BR-2',
-        kategori_produk: 'Finisher',
-        harga_beli_per_qty: 480000,
-        total_harga: 96000000,
-        keterangan: 'Pembelian pakan finisher',
-      },
-      {
-        id: 3,
-        tanggal: today,
-        no_referensi: 'OUT-2025-001',
-        qty_masuk: 0,
-        qty_keluar: 0,
-        qty_pakai: 50,
-        uraian: 'Pakan Starter BR-1',
-        kategori_produk: 'Starter',
-        harga_beli_per_qty: 450000,
-        total_harga: 22500000,
-        keterangan: 'Pemakaian pakan starter',
-      },
-      {
-        id: 4,
-        tanggal: today,
-        no_referensi: 'OUT-2025-004',
-        qty_masuk: 0,
-        qty_keluar: 0,
-        qty_pakai: 80,
-        uraian: 'Pakan Finisher BR-2',
-        kategori_produk: 'Finisher',
-        harga_beli_per_qty: 480000,
-        total_harga: 38400000,
-        keterangan: 'Pemakaian pakan finisher',
-      },
-      {
-        id: 5,
-        tanggal: lastWeek,
-        no_referensi: 'OUT-2025-006',
-        qty_masuk: 0,
-        qty_keluar: 30,
-        qty_pakai: 0,
-        uraian: 'Pakan Starter BR-1',
-        kategori_produk: 'Starter',
-        harga_beli_per_qty: 450000,
-        total_harga: 13500000,
-        keterangan: 'Transfer pakan ke kandang lain',
-      },
-    ],
-    total: {
-      label: 'Total Pakan',
-      qty_masuk: 300,
-      qty_keluar: 30,
-      qty_pakai: 130,
-      harga_beli_per_qty: 465000,
-      total_harga: 215400000,
-    },
-  },
-};
-
-// ======================
-// 💰 Overhead Dummy Data
-// ======================
-export const dummyOverhead: ClosingOverhead = {
-  overheads: [
-    {
-      item_name: 'Expedisi DOC',
-      uom_name: 'Ekor',
-      budget_quantity: 500,
-      budget_unit_price: 8000,
-      budget_total_amount: 4000000,
-      actual_date: '',
-      actual_quantity: 0,
-      actual_unit_price: 0,
-      actual_total_amount: 0,
-      cost_per_bird: 0,
-    },
-    {
-      item_name: 'Solar',
-      uom_name: 'Liter',
-      budget_quantity: 0,
-      budget_unit_price: 0,
-      budget_total_amount: 0,
-      actual_date: today,
-      actual_quantity: 20,
-      actual_unit_price: 10000,
-      actual_total_amount: 200000,
-      cost_per_bird: 200,
-    },
-    {
-      item_name: 'Gaji Karyawan Kandang',
-      uom_name: 'Orang',
-      budget_quantity: 3,
-      budget_unit_price: 3000000,
-      budget_total_amount: 9000000,
-      actual_date: today,
-      actual_quantity: 3,
-      actual_unit_price: 3200000,
-      actual_total_amount: 9600000,
-      cost_per_bird: 640,
-    },
-    {
-      item_name: 'Listrik Kandang',
-      uom_name: 'Bulan',
-      budget_quantity: 1,
-      budget_unit_price: 2500000,
-      budget_total_amount: 2500000,
-      actual_date: today,
-      actual_quantity: 1,
-      actual_unit_price: 2800000,
-      actual_total_amount: 2800000,
-      cost_per_bird: 187,
-    },
-    {
-      item_name: 'Air Bersih',
-      uom_name: 'Bulan',
-      budget_quantity: 1,
-      budget_unit_price: 500000,
-      budget_total_amount: 500000,
-      actual_date: today,
-      actual_quantity: 1,
-      actual_unit_price: 450000,
-      actual_total_amount: 450000,
-      cost_per_bird: 30,
-    },
-    {
-      item_name: 'Perbaikan Kandang',
-      uom_name: 'Paket',
-      budget_quantity: 1,
-      budget_unit_price: 3000000,
-      budget_total_amount: 3000000,
-      actual_date: yesterday,
-      actual_quantity: 1,
-      actual_unit_price: 3500000,
-      actual_total_amount: 3500000,
-      cost_per_bird: 233,
-    },
-    {
-      item_name: 'Service Peralatan',
-      uom_name: 'Kali',
-      budget_quantity: 2,
-      budget_unit_price: 500000,
-      budget_total_amount: 1000000,
-      actual_date: lastWeek,
-      actual_quantity: 2,
-      actual_unit_price: 550000,
-      actual_total_amount: 1100000,
-      cost_per_bird: 73,
-    },
-    {
-      item_name: 'ATK & Supplies',
-      uom_name: 'Paket',
-      budget_quantity: 1,
-      budget_unit_price: 500000,
-      budget_total_amount: 500000,
-      actual_date: today,
-      actual_quantity: 1,
-      actual_unit_price: 450000,
-      actual_total_amount: 450000,
-      cost_per_bird: 30,
-    },
-    {
-      item_name: 'Biaya Komunikasi',
-      uom_name: 'Bulan',
-      budget_quantity: 1,
-      budget_unit_price: 300000,
-      budget_total_amount: 300000,
-      actual_date: today,
-      actual_quantity: 1,
-      actual_unit_price: 320000,
-      actual_total_amount: 320000,
-      cost_per_bird: 21,
-    },
-    {
-      item_name: 'BBM Kendaraan Operasional',
-      uom_name: 'Liter',
-      budget_quantity: 200,
-      budget_unit_price: 10000,
-      budget_total_amount: 2000000,
-      actual_date: today,
-      actual_quantity: 220,
-      actual_unit_price: 10500,
-      actual_total_amount: 2310000,
-      cost_per_bird: 154,
-    },
-  ],
-  total: {
-    budget_quantity: 710,
-    budget_total_amount: 23300000,
-    actual_quantity: 250,
-    actual_total_amount: 24530000,
-    cost_per_bird: 1568,
-  },
-};
-
-// ======================
-// 🔧 Dummy API Response Functions
-// ======================
-
-/**
- * Dummy implementation for getAllFetcher
- * Returns all closing records
- */
-export const dummyGetAllFetcher = async (): Promise<{
-  code: number;
-  status: 'success';
-  message: string;
-  data: Closing[];
-}> => {
-  await new Promise((resolve) => setTimeout(resolve, 500));
-  return {
-    code: 200,
-    status: 'success',
-    message: 'Data closing berhasil diambil',
-    data: dummyClosings,
-  };
-};
-
-/**
- * Dummy implementation for getSingle
- * Returns a single closing by ID
- */
-export const dummyGetSingle = async (
-  id: number
-): Promise<BaseApiResponse<Closing> | undefined> => {
-  await new Promise((resolve) => setTimeout(resolve, 300));
-  const closing = dummyClosings.find((c) => c.id === id);
-
-  if (!closing) {
-    return {
-      code: 404,
-      status: 'error',
-      message: `Closing dengan ID ${id} tidak ditemukan`,
-    };
-  }
-
-  return {
-    code: 200,
-    status: 'success',
-    message: 'Data closing berhasil diambil',
-    data: closing,
-  };
-};
-
-/**
- * Dummy implementation for getAllIncomingSapronakFetcher
- * Returns all incoming sapronak records
- */
-export const dummyGetAllIncomingSapronakFetcher = async (): Promise<{
-  code: number;
-  status: 'success';
-  message: string;
-  data: ClosingIncomingSapronak[];
-}> => {
-  await new Promise((resolve) => setTimeout(resolve, 400));
-  return {
-    code: 200,
-    status: 'success',
-    message: 'Data sapronak masuk berhasil diambil',
-    data: dummyIncomingSapronaks,
-  };
-};
-
-/**
- * Dummy implementation for getAllOutgoingSapronakFetcher
- * Returns all outgoing sapronak records
- */
-export const dummyGetAllOutgoingSapronakFetcher = async (): Promise<{
-  code: number;
-  status: 'success';
-  message: string;
-  data: ClosingOutgoingSapronak[];
-}> => {
-  await new Promise((resolve) => setTimeout(resolve, 400));
-  return {
-    code: 200,
-    status: 'success',
-    message: 'Data sapronak keluar berhasil diambil',
-    data: dummyOutgoingSapronaks,
-  };
-};
-
-/**
- * Dummy implementation for getGeneralInfo
- * Returns closing general information by ID
- */
-export const dummyGetGeneralInfo = async (
-  id: number
-): Promise<BaseApiResponse<ClosingGeneralInformation> | undefined> => {
-  await new Promise((resolve) => setTimeout(resolve, 300));
-  const closingInfo = dummyClosingGeneralInformations.find((c) => c.id == id);
-
-  if (!closingInfo) {
-    return {
-      code: 404,
-      status: 'error',
-      message: `Closing general information dengan ID ${id} tidak ditemukan`,
-    };
-  }
-
-  return {
-    code: 200,
-    status: 'success',
-    message: 'Data closing general information berhasil diambil',
-    data: closingInfo,
-  };
-};
-
-/**
- * Dummy implementation for getPerhitunganSapronak
- * Returns sapronak calculation data
- */
-export const dummyGetPerhitunganSapronak = async (
-  id: number
-): Promise<
-  | {
-      code: number;
-      status: 'success';
-      message: string;
-      data: ClosingSapronakCalculation;
-    }
-  | undefined
-> => {
-  await new Promise((resolve) => setTimeout(resolve, 400));
-  return {
-    code: 200,
-    status: 'success',
-    message: 'Data perhitungan sapronak berhasil diambil',
-    data: dummySapronakCalculation,
-  };
-};
-
-/**
- * Dummy implementation for getOverhead
- * Returns overhead data
- */
-export const dummyGetOverhead = async (
-  id: number
-): Promise<BaseApiResponse<ClosingOverhead> | undefined> => {
-  await new Promise((resolve) => setTimeout(resolve, 400));
-  return {
-    code: 200,
-    status: 'success',
-    message: 'Data overhead berhasil diambil',
-    data: dummyOverhead,
-  };
-};
-
-export const dummyClosingProductionData: ClosingProductionData = {
-  purchase: {
-    initial_population: 12000,
-    claim_culling: 150,
-    final_population: 11850,
-    feed_in: 24000,
-    feed_used: 22500,
-    feed_used_per_head: 1.9,
-  },
-
-  sales: {
-    chicken: {
-      sales_population: 10500,
-      sales_weight: 21000,
-      average_weight: 2.0,
-      chicken_average_selling_price: 28500,
-    },
-    egg: {
-      egg_pieces: 185000,
-      egg_mass_kg: 9250,
-      average_egg_weight_kg: 0.05,
-      egg_average_selling_price: 1800,
-    },
-  },
-
-  performance: {
-    depletion: 150,
-    age_day: 35,
-    mortality_std: 3.5,
-    mortality_act: 4.2,
-    deff_mortality: 0.7,
-    fcr_std: 1.6,
-    fcr_act: 1.72,
-    deff_fcr: 0.12,
-    awg: 60,
-  },
-};
diff --git a/src/dummy/report/marketing-report.dummy.ts b/src/dummy/report/marketing-report.dummy.ts
deleted file mode 100644
index ea5af398..00000000
--- a/src/dummy/report/marketing-report.dummy.ts
+++ /dev/null
@@ -1,139 +0,0 @@
-import { BaseApiResponse } from '@/types/api/api-general';
-import { DailyMarketingReport } from '@/types/api/report/marketing';
-
-// TODO: delete this later
-export const DAILY_MARKETING_DUMMY_DATA: BaseApiResponse<DailyMarketingReport> =
-  {
-    code: 200,
-    status: 'success',
-    message: 'Get daily marketing report successfully',
-    meta: {
-      page: 1,
-      limit: 10,
-      total_pages: 1,
-      total_results: 2,
-    },
-    data: {
-      rows: [
-        {
-          // metadata
-          created_user: {
-            id: 1,
-            id_user: 101,
-            email: 'admin@example.com',
-            name: 'Admin User',
-          },
-          created_at: '2025-12-01T08:00:00Z',
-          updated_at: '2025-12-01T08:00:00Z',
-
-          // row data
-          no: 1,
-          so_date: '2025-12-01',
-          do_date: '2025-12-08',
-          aging_days: 7,
-
-          warehouse: {
-            id: 1,
-            name: 'Warehouse Kandang A',
-            type: 'KANDANG',
-            area: {
-              id: 1,
-              name: 'Area Barat',
-            },
-            location: {
-              id: 1,
-              name: 'Farm Bandung',
-              address: 'Jl. Raya Farm No. 1',
-              area: null,
-            },
-            kandang: {
-              id: 1,
-              name: 'Kandang A1',
-              status: 'ACTIVE',
-              capacity: 5000,
-              location: null,
-              pic: null,
-            },
-          },
-
-          customer: {
-            id: 1,
-            name: 'PT Maju Jaya',
-            pic_id: 10,
-            pic: {
-              id: 10,
-              id_user: 210,
-              email: 'pic@majujaya.com',
-              name: 'Budi Santoso',
-            },
-            type: 'BROILER',
-            address: 'Jl. Industri No. 10',
-            phone: '08123456789',
-            email: 'contact@majujaya.com',
-            account_number: '1234567890',
-          },
-
-          sales: 'Andi Wijaya',
-
-          product: {
-            id: 1,
-            name: 'Live Chicken',
-            brand: 'LTI Farm',
-            sku: 'LC-001',
-            product_price: 18_000,
-            selling_price: 20_000,
-            tax: 0,
-            expiry_period: 0,
-            uom: {
-              id: 1,
-              name: 'Kg',
-              created_user: {
-                id: 1,
-                id_user: 101,
-                email: 'admin@example.com',
-                name: 'Admin User',
-              },
-              created_at: '2025-01-01T00:00:00Z',
-              updated_at: '2025-01-01T00:00:00Z',
-            },
-            product_category: {
-              id: 1,
-              code: 'BROILER',
-              name: 'Broiler Chicken',
-              created_user: {
-                id: 1,
-                id_user: 101,
-                email: 'admin@example.com',
-                name: 'Admin User',
-              },
-              created_at: '2025-01-01T00:00:00Z',
-              updated_at: '2025-01-01T00:00:00Z',
-            },
-            suppliers: [],
-            flags: ['LIVE'],
-          },
-
-          do_number: 'DO-2025-0001',
-          vehicle_number: 'B 1234 CD',
-          marketing_type: 'REGULAR',
-
-          qty: 1000,
-          average_weight_kg: 1.8,
-          total_weight_kg: 1800,
-
-          sales_price_per_kg: 20_000,
-          hpp_price_per_kg: 18_000,
-
-          sales_amount: 36_000_000,
-          hpp_amount: 32_400_000,
-        },
-      ],
-
-      summary: {
-        total_qty: 1000,
-        total_weight_kg: 1800,
-        total_sales_amount: 36_000_000,
-        total_hpp_amount: 32_400_000,
-      },
-    },
-  };
diff --git a/src/services/api/closing.ts b/src/services/api/closing.ts
index 9513760c..c1f0db62 100644
--- a/src/services/api/closing.ts
+++ b/src/services/api/closing.ts
@@ -15,20 +15,6 @@ import {
 import { BaseApiResponse } from '@/types/api/api-general';
 import { httpClient, httpClientFetcher } from '@/services/http/client';
 import { ClosingSales } from '@/types/api/closing';
-
-// TODO: delete these dummy data later
-import {
-  dummyGetAllFetcher,
-  dummyGetSingle,
-  dummyGetAllIncomingSapronakFetcher,
-  dummyGetAllOutgoingSapronakFetcher,
-  dummyGetGeneralInfo,
-  dummyGetPerhitunganSapronak,
-  dummyGetOverhead,
-  dummyClosingProductionData,
-} from '@/dummy/closing.dummy';
-import { sleep } from '@/lib/helper';
-
 export class ClosingApiService extends BaseApiService<Closing, null, null> {
   constructor(basePath: string) {
     super(basePath);
diff --git a/src/services/api/finance.ts b/src/services/api/finance.ts
new file mode 100644
index 00000000..f9ba367f
--- /dev/null
+++ b/src/services/api/finance.ts
@@ -0,0 +1,193 @@
+import axios from 'axios';
+import { BaseApiService } from '@/services/api/base';
+import { BaseApiResponse } from '@/types/api/api-general';
+import { httpClient, httpClientFetcher } from '@/services/http/client';
+import {
+  CreateFinancePayment,
+  CreateInitialBalance,
+  CreateInjection,
+  Finance,
+  UpdateFinancePayment,
+  UpdateInitialBalance,
+  UpdateInjection,
+} from '@/types/api/finance/finance';
+
+export class FinanceApiService extends BaseApiService<
+  Finance,
+  unknown,
+  unknown
+> {
+  constructor(basePath: string) {
+    super(basePath);
+  }
+
+  async getSingle(id: number): Promise<BaseApiResponse<Finance>> {
+    return await httpClientFetcher<BaseApiResponse<Finance>>(
+      `${this.basePath}/transactions/${id}`
+    );
+  }
+
+  async create(payload: CreateFinancePayment) {
+    const isFormData =
+      typeof FormData !== 'undefined' && payload instanceof FormData;
+    try {
+      const headers = isFormData
+        ? { ...(this.header ?? {}) }
+        : { 'Content-Type': 'application/json', ...(this.header ?? {}) };
+
+      const createRes = await httpClient<BaseApiResponse<Finance>>(
+        `${this.basePath}/payments`,
+        {
+          method: 'POST',
+          body: payload,
+          headers,
+        }
+      );
+      return createRes;
+    } catch (error: unknown) {
+      if (axios.isAxiosError<BaseApiResponse<Finance>>(error)) {
+        return error.response?.data;
+      }
+      return undefined;
+    }
+  }
+
+  async createInitialBalances(payload: CreateInitialBalance) {
+    const isFormData =
+      typeof FormData !== 'undefined' && payload instanceof FormData;
+    try {
+      const headers = isFormData
+        ? { ...(this.header ?? {}) }
+        : { 'Content-Type': 'application/json', ...(this.header ?? {}) };
+
+      const createRes = await httpClient<BaseApiResponse<Finance>>(
+        `${this.basePath}/initial-balances`,
+        {
+          method: 'POST',
+          body: payload,
+          headers,
+        }
+      );
+      return createRes;
+    } catch (error: unknown) {
+      if (axios.isAxiosError<BaseApiResponse<Finance>>(error)) {
+        return error.response?.data;
+      }
+      return undefined;
+    }
+  }
+
+  async createInjections(payload: CreateInjection) {
+    const isFormData =
+      typeof FormData !== 'undefined' && payload instanceof FormData;
+    try {
+      const headers = isFormData
+        ? { ...(this.header ?? {}) }
+        : { 'Content-Type': 'application/json', ...(this.header ?? {}) };
+
+      const createRes = await httpClient<BaseApiResponse<Finance>>(
+        `${this.basePath}/injections`,
+        {
+          method: 'POST',
+          body: payload,
+          headers,
+        }
+      );
+      return createRes;
+    } catch (error: unknown) {
+      if (axios.isAxiosError<BaseApiResponse<Finance>>(error)) {
+        return error.response?.data;
+      }
+      return undefined;
+    }
+  }
+
+  async update(id: number, payload: UpdateFinancePayment) {
+    const isFormData =
+      typeof FormData !== 'undefined' && payload instanceof FormData;
+    try {
+      const updatePath = `${this.basePath}/payments/${id}`;
+
+      const headers = isFormData
+        ? { ...(this.header ?? {}) }
+        : { 'Content-Type': 'application/json', ...(this.header ?? {}) };
+
+      const updateRes = await httpClient<BaseApiResponse<Finance>>(updatePath, {
+        method: 'PATCH',
+        body: payload,
+        headers,
+      });
+      return updateRes;
+    } catch (error: unknown) {
+      if (axios.isAxiosError<BaseApiResponse<Finance>>(error)) {
+        return error.response?.data;
+      }
+      return undefined;
+    }
+  }
+
+  async updateInitialBalances(id: number, payload: UpdateInitialBalance) {
+    const isFormData =
+      typeof FormData !== 'undefined' && payload instanceof FormData;
+    try {
+      const updatePath = `${this.basePath}/initial-balances/${id}`;
+
+      const headers = isFormData
+        ? { ...(this.header ?? {}) }
+        : { 'Content-Type': 'application/json', ...(this.header ?? {}) };
+
+      const updateRes = await httpClient<BaseApiResponse<Finance>>(updatePath, {
+        method: 'PATCH',
+        body: payload,
+        headers,
+      });
+      return updateRes;
+    } catch (error: unknown) {
+      if (axios.isAxiosError<BaseApiResponse<Finance>>(error)) {
+        return error.response?.data;
+      }
+      return undefined;
+    }
+  }
+
+  async updateInjections(id: number, payload: UpdateInjection) {
+    const isFormData =
+      typeof FormData !== 'undefined' && payload instanceof FormData;
+    try {
+      const updatePath = `${this.basePath}/injections/${id}`;
+
+      const headers = isFormData
+        ? { ...(this.header ?? {}) }
+        : { 'Content-Type': 'application/json', ...(this.header ?? {}) };
+
+      const updateRes = await httpClient<BaseApiResponse<Finance>>(updatePath, {
+        method: 'PATCH',
+        body: payload,
+        headers,
+      });
+      return updateRes;
+    } catch (error: unknown) {
+      if (axios.isAxiosError<BaseApiResponse<Finance>>(error)) {
+        return error.response?.data;
+      }
+      return undefined;
+    }
+  }
+
+  async delete(id: number) {
+    try {
+      const deletePath = `${this.basePath}/transactions/${id}`;
+      const deleteRes = await httpClient<BaseApiResponse>(deletePath, {
+        method: 'DELETE',
+      });
+      return deleteRes;
+    } catch (error) {
+      if (axios.isAxiosError<BaseApiResponse>(error)) {
+        return error.response?.data;
+      }
+      return undefined;
+    }
+  }
+}
+
+export const FinanceApi = new FinanceApiService('/finance');
diff --git a/src/services/api/master-data.ts b/src/services/api/master-data.ts
index 66df717a..f15de21d 100644
--- a/src/services/api/master-data.ts
+++ b/src/services/api/master-data.ts
@@ -64,6 +64,7 @@ import {
   Flock,
   UpdateFlockPayload,
 } from '@/types/api/master-data/flock';
+import { ProductionStandard } from '@/types/api/master-data/production-standard';
 
 export const UomApi = new BaseApiService<
   Uom,
@@ -141,3 +142,9 @@ export const FlockApi = new BaseApiService<
   CreateFlockPayload,
   UpdateFlockPayload
 >('/master-data/flocks');
+
+export const ProductionStandardApi = new BaseApiService<
+  ProductionStandard,
+  unknown,
+  unknown
+>('/master-data/production-standards');
diff --git a/src/stores/form/form.store.ts b/src/stores/form/form.store.ts
new file mode 100644
index 00000000..c3ea0dba
--- /dev/null
+++ b/src/stores/form/form.store.ts
@@ -0,0 +1,23 @@
+'use client';
+
+import { create } from 'zustand';
+import { devtools, persist } from 'zustand/middleware';
+
+import { FormStore } from '@/types/stores';
+import { createProductionStandardFormSlice } from '@/stores/form/slices/production-standard-form.slice';
+
+export const useFormStore = create<FormStore>()(
+  devtools(
+    persist(
+      (...args) => ({
+        ...createProductionStandardFormSlice(...args),
+      }),
+      {
+        name: 'production-standard-form-cache',
+      }
+    ),
+    {
+      name: 'FormStore',
+    }
+  )
+);
diff --git a/src/stores/form/slices/production-standard-form.slice.ts b/src/stores/form/slices/production-standard-form.slice.ts
new file mode 100644
index 00000000..1029ecba
--- /dev/null
+++ b/src/stores/form/slices/production-standard-form.slice.ts
@@ -0,0 +1,67 @@
+import { StateCreator } from 'zustand';
+import { FormStore } from '@/types/stores';
+
+export const createProductionStandardFormSlice: StateCreator<
+  FormStore,
+  [],
+  [],
+  FormStore
+> = (set): FormStore => ({
+  formData: null,
+  editMode: false,
+  editIndex: null,
+
+  setFormData: (data) =>
+    set(() => ({
+      formData: data,
+    })),
+
+  setEditMode: (mode, index) =>
+    set(() => ({
+      editMode: mode,
+      editIndex: index,
+    })),
+
+  addDetail: (detail) =>
+    set((state) => ({
+      formData: state.formData
+        ? {
+            ...state.formData,
+            details: [...state.formData.details, detail],
+          }
+        : null,
+    })),
+
+  updateDetail: (index, detail) =>
+    set((state) => {
+      if (!state.formData) return state;
+      const newDetails = [...state.formData.details];
+      newDetails[index] = detail;
+      return {
+        formData: {
+          ...state.formData,
+          details: newDetails,
+        },
+      };
+    }),
+
+  deleteDetail: (index) =>
+    set((state) => {
+      if (!state.formData) return state;
+      const newDetails = [...state.formData.details];
+      newDetails.splice(index, 1);
+      return {
+        formData: {
+          ...state.formData,
+          details: newDetails,
+        },
+      };
+    }),
+
+  clearCache: () =>
+    set(() => ({
+      formData: null,
+      editMode: false,
+      editIndex: null,
+    })),
+});
diff --git a/src/types/api/finance/finance.d.ts b/src/types/api/finance/finance.d.ts
new file mode 100644
index 00000000..02f8bbbb
--- /dev/null
+++ b/src/types/api/finance/finance.d.ts
@@ -0,0 +1,60 @@
+export type Finance = {
+  id: number;
+  payment_code: string;
+  reference_number: string;
+  transaction_type: string;
+  party: FinanceParty;
+  payment_date: string;
+  created_at: string;
+  payment_method: string;
+  bank: FinanceBank;
+  expense_amount: number;
+  income_amount: number;
+  nominal: number;
+  notes: string;
+};
+
+export type FinanceParty = {
+  id: number;
+  name: string;
+  type: string;
+  account_number: string;
+};
+export type FinanceBank = {
+  id: number;
+  name: string;
+  alias: string;
+  owner: string;
+  account_number: string;
+};
+export type CreateFinancePayment = {
+  party_id: number;
+  party_type: string;
+  payment_date: string;
+  payment_method: string;
+  bank_id: number;
+  reference_number: string;
+  nominal: number;
+  notes: string;
+};
+
+export type UpdateFinancePayment = CreateFinancePayment;
+export type CreateInitialBalance = {
+  party_type: string;
+  party_id: number;
+  bank_id: number;
+  reference_number: string;
+  initial_balance_type: string;
+  nominal: number;
+  note: string;
+};
+
+export type UpdateInitialBalance = CreateInitialBalance;
+export type CreateInjection = {
+  bank_id: number;
+  adjustment_date: string;
+  nominal: number;
+  notes: string;
+};
+
+export type UpdateInjection = CreateInjection;
diff --git a/src/types/api/master-data/production-standard.d.ts b/src/types/api/master-data/production-standard.d.ts
new file mode 100644
index 00000000..efe5476e
--- /dev/null
+++ b/src/types/api/master-data/production-standard.d.ts
@@ -0,0 +1,71 @@
+import { CreatedUser } from '@/types/api/api-general';
+
+export interface ProductionStandard {
+  id: number;
+  name: string;
+  project_category: string;
+  created_at: string;
+  updated_at: string;
+  created_user: CreatedUser;
+  details: StandardDetails[];
+}
+
+export interface StandardDetails {
+  week: number;
+  growth_standard_detail: StandardGrowthDetails;
+  egg_production_standard_detail: ProductionStandardDetails;
+}
+
+export interface ProductionStandardDetails {
+  target_hen_day_production: number;
+  target_hen_house_production: number;
+  target_egg_weight: number;
+  target_egg_mass: number;
+}
+
+export interface StandardGrowthDetails {
+  target_mean_bw: number;
+  max_depletion: number;
+  min_uniformity: number;
+  feed_intake: number;
+}
+
+export interface CreateProductionStandardPayload {
+  name: string;
+  project_category: string;
+  details: {
+    week: number;
+    growth_standard_detail: {
+      target_mean_bw: number;
+      max_depletion: number;
+      min_uniformity: number;
+      feed_intake: number;
+    };
+    egg_production_standard_detail: {
+      target_hen_day_production: number;
+      target_hen_house_production: number;
+      target_egg_weight: number;
+      target_egg_mass: number;
+    };
+  }[];
+}
+
+export interface UpdateProductionStandardPayload {
+  name: string;
+  project_category: string;
+  details: {
+    week: number;
+    growth_standard_detail: {
+      target_mean_bw: number;
+      max_depletion: number;
+      min_uniformity: number;
+      feed_intake: number;
+    };
+    egg_production_standard_detail: {
+      target_hen_day_production: number;
+      target_hen_house_production: number;
+      target_egg_weight: number;
+      target_egg_mass: number;
+    };
+  }[];
+}
diff --git a/src/types/stores.d.ts b/src/types/stores.d.ts
index 37b252fe..96b681c0 100644
--- a/src/types/stores.d.ts
+++ b/src/types/stores.d.ts
@@ -1,3 +1,5 @@
+import type { ProductionStandardRepeaterFormSchemaValues } from '@/components/pages/master-data/production-standard/form/ProductionStandardForm.schema';
+
 type MainUiSlice = {
   mainDrawerOpen: boolean;
   setMainDrawerOpen: (open: boolean) => void;
@@ -13,3 +15,28 @@ type DrawerUISlice = {
 };
 
 export type UIStore = MainUiSlice & DrawerUISlice;
+
+type ProductionStandardFormSlice = {
+  formData: {
+    name: string;
+    project_category: string;
+    details: ProductionStandardRepeaterFormSchemaValues[];
+  } | null;
+  editMode: boolean;
+  editIndex: number | null;
+  setFormData: (data: {
+    name: string;
+    project_category: string;
+    details: ProductionStandardRepeaterFormSchemaValues[];
+  }) => void;
+  setEditMode: (mode: boolean, index: number | null) => void;
+  addDetail: (detail: ProductionStandardRepeaterFormSchemaValues) => void;
+  updateDetail: (
+    index: number,
+    detail: ProductionStandardRepeaterFormSchemaValues
+  ) => void;
+  deleteDetail: (index: number) => void;
+  clearCache: () => void;
+};
+
+export type FormStore = ProductionStandardFormSlice;