fix(FE): closing project flock & merge development

src/components/pages/production/project-flock/closing/ProjectFlockClosingForm.tsx

@@ -9,6 +9,7 @@ import { ProjectFlock } from '@/types/api/production/project-flock';
 import {
   ClosingExpense,
   ProjectFlockKandang,
+  StockItem,
 } from '@/types/api/production/project-flock-kandang';
 import { Icon } from '@iconify/react';
 import useSWR from 'swr';
@@ -41,7 +42,7 @@ const ProjectFlockClosingForm = ({
   const confirmationModalCloseClickHandler = async () => {
     setIsClosingLoading(true);
     const deleteProjectFlockRes = await ProjectFlockKandangApi.closing(
-      projectFlock?.id as number,
+      projectFlockKandang?.id as number,
       {
         closed_date: formatDate(new Date(), 'YYYY-MM-DD'),
         action: isCanClose ? 'close' : 'unclose',
@@ -222,7 +223,7 @@ const ProjectFlockClosingForm = ({
       <div className='divider'></div>
       <div className='px-4 pb-4'>
         <h2 className='text-2xl font-semibold'>Persediaan Gudang</h2>
-        <Table<ProductWarehouse>
+        <Table<StockItem>
           data={
             isResponseSuccess(closingData)
               ? closingData.data?.stock_remaining
@@ -231,11 +232,11 @@ const ProjectFlockClosingForm = ({
           columns={[
             {
               header: 'Product',
-              accessorKey: 'product.name',
+              accessorKey: 'product_name',
             },
             {
               header: 'Kategori',
-              accessorKey: 'product.product_category.name',
+              accessorKey: 'product_category',
             },
             {
               header: 'Quantity',
@@ -243,7 +244,7 @@ const ProjectFlockClosingForm = ({
             },
             {
               header: 'UOM',
-              accessorKey: 'product.uom.name',
+              accessorKey: 'uom',
             },
           ]}
           className={{