fix(FE): resolve merge conflict

src/components/pages/report/production-result/ProductionResultContent.tsx

@@ -24,6 +24,7 @@ import {
 import { ProjectFlockKandang } from '@/types/api/production/project-flock-kandang';
 import { isResponseError } from '@/lib/api-helper';
 import Pagination from '@/components/Pagination';
+import { ProductionResultReportApi } from '@/services/api/report/production-result';
 
 const ProductionResultContent = () => {
   const [projectFlockKandangs, setProjectFlockKandangs] = useState<
@@ -145,8 +146,11 @@ const ProductionResultContent = () => {
 
   const exportToExcelHandler = async () => {
     setIsLoadingExportingToExcel(true);
-    // TODO: Implement export functionality in API service first if needed
-    toast.error('Fitur export belum tersedia');
+
+    await ProductionResultReportApi.exportProductionResultToExcel(
+      projectFlockKandangs
+    );
+
     setIsLoadingExportingToExcel(false);
   };
 
@@ -319,7 +323,13 @@ const ProductionResultContent = () => {
                 align='end'
                 direction='bottom'
                 trigger={
-                  <Button>
+                  <Button
+                    disabled={
+                      !selectedArea ||
+                      !selectedLocation ||
+                      !selectedProjectFlock
+                    }
+                  >
                     Export{' '}
                     <Icon
                       icon='heroicons-outline:download'

src/components/pages/report/production-result/ProductionResultProjectFlockKandangTable.tsx

@@ -352,7 +352,7 @@ const ProductionResultProjectFlockKandangTable = ({
                   productionResults?.data?.length === 0,
               }),
               headerColumnClassName:
-                'px-4 py-3 border-base-content/10 text-base-content/50',
+                'px-4 py-3 border-x border-base-content/10 text-base-content/50',
             }}
           />
         </div>