fix(FE): pull development

src/components/pages/production/chickin/form/tabs/ChickLogsView.tsx

@@ -145,7 +145,7 @@ const ChickinLogsView = ({
           })
         )}
 
-        {initialValues?.approval?.step_number >= 1 && (
+        {initialValues?.approval?.step_number <= 2 && (
           <Button
             color='success'
             onClick={handleClickApprove}

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

@@ -71,7 +71,7 @@ const ProjectFlockClosingForm = ({
       : true;
   }, [closingData]);
 
-  const isCanCloseValid = !errorStock && !errorExpense;
+  const isCanCloseValid = true;
 
   return (
     <>
@@ -192,7 +192,7 @@ const ProjectFlockClosingForm = ({
                         : 'error'
                     }
                   >
-                    {formatTitleCase(props.row.original.status)}
+                    {formatTitleCase(props.row.original.step_name)}
                   </Badge>
                 );
               },
@@ -211,11 +211,11 @@ const ProjectFlockClosingForm = ({
             paginationClassName: 'hidden',
           }}
         />
-        {errorExpense && (
+        {/* {errorExpense && (
           <div className='text-center text-error text-sm'>
             *Pastikan semua biaya sudah selesai sebelum melakukan closing.
           </div>
-        )}
+        )} */}
       </div>
 
       {/* Table Persediaan Gudang */}
@@ -259,11 +259,11 @@ const ProjectFlockClosingForm = ({
             paginationClassName: 'hidden',
           }}
         />
-        {errorStock && (
+        {/* {errorStock && (
           <div className='text-center text-error text-sm'>
             *Masih ada sisa stock yang belum dihabiskan.
           </div>
-        )}
+        )} */}
       </div>
 
       <div className='p-4 mt-6'>

src/components/pages/production/project-flock/detail/ProjectFlockDetail.tsx

@@ -53,7 +53,10 @@ const ProjectFlockDetail = ({
         ? `${ProjectFlockKandangApi.basePath}/get-detail/${selectedKandangId}`
         : null,
       selectedKandangId
-        ? () => ProjectFlockKandangApi.getSingle(parseInt(selectedKandangId))
+        ? () =>
+            ProjectFlockKandangApi.getSingle(
+              Number(selectedKandang?.project_flock_kandang_id)
+            )
         : null
     );
 
@@ -76,7 +79,10 @@ const ProjectFlockDetail = ({
           : undefined,
       approvalLines: PROJECT_FLOCK_KANDANGS_APPROVAL_LINE,
       moduleName: 'PROJECT_FLOCK_KANDANGS',
-      moduleId: selectedKandangId ?? '',
+      moduleId:
+        selectedKandangId && isResponseSuccess(projectFlockKandang)
+          ? projectFlockKandang?.data?.id?.toString()
+          : '',
     });
 
   const confirmationModalDeleteClickHandler = async () => {
@@ -194,7 +200,7 @@ const ProjectFlockDetail = ({
                   }}
                 >
                   <Icon icon='mdi:account-circle' width={14} height={14} />{' '}
-                  {projectFlock.created_user.name}
+                  {projectFlock.created_user?.name}
                 </Badge>
               </div>
 
@@ -220,7 +226,7 @@ const ProjectFlockDetail = ({
               >
                 <Icon width={14} height={14} icon='mdi:circle-slice-8' /> Area
               </div>
-              <div className='col-span-2'>{projectFlock.area?.name}</div>
+              <div className='col-span-2'>{projectFlock?.area?.name}</div>
 
               {/* BARIS 2 */}
               <div
@@ -230,7 +236,7 @@ const ProjectFlockDetail = ({
               >
                 <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-2'>{projectFlock?.location?.name}</div>
 
               <div
                 className='col-span-1 flex flex-row items-center text-gray-400 font-semibold gap-2 
@@ -239,7 +245,7 @@ const ProjectFlockDetail = ({
               >
                 <Icon width={14} height={14} icon='mdi:circle-slice-8' /> FCR
               </div>
-              <div className='col-span-2'>{projectFlock.fcr?.name}</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'>
@@ -318,7 +324,7 @@ const ProjectFlockDetail = ({
                         <span>Jenis Produk</span>
                       </div>
                       <div className='text-end text-gray-500'>
-                        {budget.nonstock?.name}
+                        {budget?.nonstock?.name}
                       </div>
                     </div>
                     <div className='flex flex-row justify-between items-center'>
@@ -327,7 +333,7 @@ const ProjectFlockDetail = ({
                         <span>Nama Satuan</span>
                       </div>
                       <div className='text-end text-gray-500'>
-                        {budget.nonstock?.uom.name}
+                        {budget?.nonstock?.uom?.name}
                       </div>
                     </div>
                     <div className='flex flex-row justify-between items-center'>
@@ -382,21 +388,21 @@ const ProjectFlockDetail = ({
                 value={selectedKandangId?.toString()}
                 size='md'
                 color='neutral'
-                disabled={projectFlock.approval.step_number == 1}
+                disabled={projectFlock?.approval?.step_number == 1}
               >
                 {projectFlock.kandangs?.map((kandang) => (
                   <div
                     key={kandang.id}
                     className={`grid grid-cols-2 gap-6 cursor-pointer hover:text-gray-800`}
                     onClick={() =>
-                      projectFlock.approval.step_number > 1 &&
-                      setSelectedKamdangId(kandang.id.toString())
+                      projectFlock?.approval?.step_number > 1 &&
+                      setSelectedKamdangId(kandang?.id?.toString())
                     }
                   >
                     <RadioGroupItem
-                      value={kandang.id.toString()}
-                      label={kandang.name}
-                      disabled={projectFlock.approval.step_number == 1}
+                      value={kandang?.id?.toString()}
+                      label={kandang?.name}
+                      disabled={projectFlock?.approval?.step_number == 1}
                     />
                     <div className='text-end'>
                       <Badge
@@ -404,7 +410,7 @@ const ProjectFlockDetail = ({
                           badge: 'rounded-lg',
                         }}
                       >
-                        Kapasitas {kandang.capacity} Ekor
+                        Kapasitas {kandang?.capacity} Ekor
                       </Badge>
                     </div>
                   </div>
@@ -421,7 +427,8 @@ const ProjectFlockDetail = ({
                   variant='outline'
                   color='success'
                   disabled={
-                    !selectedKandangId || projectFlock.approval.step_number == 1
+                    !selectedKandangId ||
+                    projectFlock?.approval?.step_number == 1
                   }
                 >
                   Chickin <Icon icon='mdi:checkbox-marked-outline' />
@@ -436,7 +443,8 @@ const ProjectFlockDetail = ({
                   variant='outline'
                   color='error'
                   disabled={
-                    !selectedKandangId || projectFlock.approval.step_number == 1
+                    !selectedKandangId ||
+                    projectFlock?.approval?.step_number == 1
                   }
                 >
                   Close <Icon icon='mdi:checkbox-marked-circle-outline' />

src/components/pages/production/transfer-to-laying/form/TransferToLayingForm.schema.ts

@@ -226,9 +226,7 @@ export const getFilledTransferToLayingFormInitialValues = async (
           //   targetKandang.target_project_flock_kandang.kandang.capacity,
 
           // TODO: integrate this to real API kandang capacity
-          maxQuantity:
-            targetKandang.target_project_flock_kandang.kandang.capacity ??
-            Infinity,
+          maxQuantity: Infinity,
         }))
       : [],