From a781431683b2484a3e615c114aafc52159b98847 Mon Sep 17 00:00:00 2001 From: rstubryan Date: Tue, 13 Jan 2026 13:35:56 +0700 Subject: [PATCH 01/14] refactor(FE): Rename Type column header to Jenis --- src/components/pages/closing/ClosingFinanceTable.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/pages/closing/ClosingFinanceTable.tsx b/src/components/pages/closing/ClosingFinanceTable.tsx index 8c39b3fb..7eb34369 100644 --- a/src/components/pages/closing/ClosingFinanceTable.tsx +++ b/src/components/pages/closing/ClosingFinanceTable.tsx @@ -299,7 +299,7 @@ const ClosingFinanceTable = ({ }, }, { - header: 'Type', + header: 'Jenis', enableSorting: false, accessorFn: (item) => formatTitleCase(item.type || '-'), }, From 502564da0a0d1e36623531d6eb9cc9f7def63ac9 Mon Sep 17 00:00:00 2001 From: rstubryan Date: Tue, 13 Jan 2026 13:43:34 +0700 Subject: [PATCH 02/14] refactor(FE): Exclude step 6 and include step 4 in edit check --- src/app/expense/detail/edit/page.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/app/expense/detail/edit/page.tsx b/src/app/expense/detail/edit/page.tsx index e254f01d..2fb33484 100644 --- a/src/app/expense/detail/edit/page.tsx +++ b/src/app/expense/detail/edit/page.tsx @@ -38,9 +38,11 @@ const ExpenseEditPage = () => { !isLoadingExpense && isResponseSuccess(expense) && expense.data.latest_approval.step_number !== 5 && + expense.data.latest_approval.step_number !== 6 && (expense.data.latest_approval.step_number === 1 || expense.data.latest_approval.step_number === 2 || - expense.data.latest_approval.step_number === 3); + expense.data.latest_approval.step_number === 3 || + expense.data.latest_approval.step_number === 4); if (!isLoadingExpense && !isExpenseCanBeEdited) { router.back(); From 92bfef850a9eb7f10888b549a7a0600e6184c3d6 Mon Sep 17 00:00:00 2001 From: rstubryan Date: Tue, 13 Jan 2026 14:31:30 +0700 Subject: [PATCH 03/14] refactor(FE): Enhance customer payment PDF export and filters --- .../export/CustomerPaymentExportPDF.tsx | 145 +++++++++++++++--- .../report/finance/tab/CustomerPaymentTab.tsx | 52 +++---- 2 files changed, 145 insertions(+), 52 deletions(-) diff --git a/src/components/pages/report/finance/export/CustomerPaymentExportPDF.tsx b/src/components/pages/report/finance/export/CustomerPaymentExportPDF.tsx index 88c556de..08efa409 100644 --- a/src/components/pages/report/finance/export/CustomerPaymentExportPDF.tsx +++ b/src/components/pages/report/finance/export/CustomerPaymentExportPDF.tsx @@ -136,41 +136,129 @@ const pdfStyles = StyleSheet.create({ backgroundColor: '#F0F0F0', fontWeight: 'bold', }, + badge: { + backgroundColor: '#1f74bf', + color: '#FFFFFF', + padding: 2, + borderRadius: 2, + fontSize: 7, + fontWeight: 'bold', + alignSelf: 'center', + marginRight: 4, + }, + badgeLunas: { + backgroundColor: '#1f74bf', + color: '#FFFFFF', + }, + badgeBelumLunas: { + backgroundColor: '#F97316', + color: '#FFFFFF', + }, + parameterBadge: { + backgroundColor: '#F5F5F5', + color: '#333333', + padding: 4, + borderRadius: 4, + fontSize: 8, + marginRight: 8, + marginBottom: 4, + }, + parameterContainer: { + flexDirection: 'row', + flexWrap: 'wrap', + marginBottom: 8, + }, }); interface CustomerPaymentExportPDFParams { data: CustomerPaymentReport[]; + params?: { + customer_name?: string; + sales?: string; + start_date?: string; + end_date?: string; + filter_by?: string; + }; } +const getParameterText = ( + params?: CustomerPaymentExportPDFParams['params'] +) => { + const paramsText = []; + + if (params?.customer_name) { + paramsText.push(`Customer: ${params.customer_name}`); + } else { + paramsText.push('Semua Customer'); + } + + if (params?.sales) { + paramsText.push(`Sales: ${params.sales}`); + } + + if (params?.start_date && params?.end_date) { + const startDate = formatDate(params.start_date, 'DD MMM YYYY'); + const endDate = formatDate(params.end_date, 'DD MMM YYYY'); + paramsText.push(`Periode: ${startDate} - ${endDate}`); + } else if (params?.start_date) { + const startDate = formatDate(params.start_date, 'DD MMM YYYY'); + paramsText.push(`Tanggal: ${startDate}`); + } + + const currentDate = formatDate(new Date(), 'DD MMM YYYY HH:mm'); + paramsText.push(`Dicetak: ${currentDate}`); + + return paramsText; +}; + const createPDFDocument = (params: CustomerPaymentExportPDFParams) => { return ( {params.data.map((customerReport, customerIndex) => ( - {/* Title and Customer Info */} + {/* Title and Parameters */} Laporan > Kontrol Pembayaran Customer + + + + Periode:{' '} + {params.params?.start_date + ? formatDate(params.params.start_date, 'DD MMM YYYY') + : '-'}{' '} + s.d{' '} + {params.params?.end_date + ? formatDate(params.params.end_date, 'DD MMM YYYY') + : '-'} + + + + Filter Tanggal: Tanggal DO + + + + Customer: {params.params?.customer_name || 'Semua Customer'} + + + + + Dicetak: {formatDate(new Date(), 'DD MMM YYYY HH:mm')} + + + {customerReport.customer.name} - {customerReport.customer.address || ''} + Alamat: {customerReport.customer.address || '-'} - {customerReport.summary && ( - - Total Saldo Piutang:{' '} - {formatCurrency( - customerReport.summary.total_accounts_receivable - )} - - )} {/* Table */} @@ -181,10 +269,10 @@ const createPDFDocument = (params: CustomerPaymentExportPDFParams) => { No - Tgl DO/Bayar + Tanggal DO - Tgl Realisasi + Tanggal Realisasi Aging @@ -193,16 +281,16 @@ const createPDFDocument = (params: CustomerPaymentExportPDFParams) => { Referensi - No. Polisi + No Polisi Qty - Berat (Kg) + Berat - AVG + Rata-Rata Harga Awal @@ -214,7 +302,7 @@ const createPDFDocument = (params: CustomerPaymentExportPDFParams) => { Harga Akhir - PPN (%) + Pajak Total @@ -223,10 +311,10 @@ const createPDFDocument = (params: CustomerPaymentExportPDFParams) => { Pembayaran - Saldo Piutang + Saldo - Ket + Keterangan Pengambilan @@ -304,7 +392,24 @@ const createPDFDocument = (params: CustomerPaymentExportPDFParams) => { {formatCurrency(item.accounts_receivable)} - {item.notes || '-'} + {item.notes ? ( + {item.notes} + ) : ( + + + {item.accounts_receivable === 0 + ? 'Lunas' + : 'Belum Lunas'} + + + )} {item.pickup_info || '-'} diff --git a/src/components/pages/report/finance/tab/CustomerPaymentTab.tsx b/src/components/pages/report/finance/tab/CustomerPaymentTab.tsx index 1d8d1993..6cd0ba3d 100644 --- a/src/components/pages/report/finance/tab/CustomerPaymentTab.tsx +++ b/src/components/pages/report/finance/tab/CustomerPaymentTab.tsx @@ -46,7 +46,6 @@ const CustomerPaymentTab = () => { const [filterSales, setFilterSales] = useState([]); const [filterStartDate, setFilterStartDate] = useState(''); const [filterEndDate, setFilterEndDate] = useState(''); - const [filterErrors, setFilterErrors] = useState>({}); const filterModal = useModal(); @@ -75,27 +74,13 @@ const CustomerPaymentTab = () => { setFilterSales([]); setFilterStartDate(''); setFilterEndDate(''); - setFilterErrors({}); }, []); const handleApplyFilters = useCallback(() => { - const errors: Record = {}; - - if (!filterStartDate) { - errors.start_date = 'Tanggal mulai wajib diisi'; - } - if (!filterEndDate) { - errors.end_date = 'Tanggal akhir wajib diisi'; - } - - setFilterErrors(errors); - - if (Object.keys(errors).length === 0) { - setIsSubmitted(true); - setCurrentPage(1); - filterModal.closeModal(); - } - }, [filterModal, filterStartDate, filterEndDate]); + setIsSubmitted(true); + setCurrentPage(1); + filterModal.closeModal(); + }, [filterModal]); // ===== DATA FETCHING ===== const { data: customerPayment, isLoading } = useSWR( @@ -218,7 +203,22 @@ const CustomerPaymentTab = () => { return; } - await generateCustomerPaymentPDF({ data: allDataForExport }); + await generateCustomerPaymentPDF({ + data: allDataForExport, + params: { + customer_name: + filterCustomer.length > 0 + ? filterCustomer.map((c) => c.label).join(', ') + : undefined, + sales: + filterSales.length > 0 + ? filterSales.map((s) => s.label).join(', ') + : undefined, + start_date: filterStartDate || undefined, + end_date: filterEndDate || undefined, + filter_by: 'do_date', + }, + }); toast.success('PDF berhasil dibuat dan diunduh.'); } catch { toast.error('Gagal membuat PDF. Silakan coba lagi.'); @@ -538,15 +538,9 @@ const CustomerPaymentTab = () => { value={filterStartDate} onChange={(e) => { setFilterStartDate(e.target.value); - setFilterErrors((prev) => ({ ...prev, start_date: '' })); }} className={{ wrapper: 'w-full' }} /> - {filterErrors.start_date && ( -

- {filterErrors.start_date} -

- )}
@@ -556,15 +550,9 @@ const CustomerPaymentTab = () => { value={filterEndDate} onChange={(e) => { setFilterEndDate(e.target.value); - setFilterErrors((prev) => ({ ...prev, end_date: '' })); }} className={{ wrapper: 'w-full' }} /> - {filterErrors.end_date && ( -

- {filterErrors.end_date} -

- )}
From 60eaec261d8851ec3c40daab8b250eb85b7380ec Mon Sep 17 00:00:00 2001 From: rstubryan Date: Tue, 13 Jan 2026 15:20:27 +0700 Subject: [PATCH 04/14] refactor(FE): Render payment notes as Badge and highlight balance --- .../report/finance/tab/CustomerPaymentTab.tsx | 58 +++++++++++++++++-- 1 file changed, 54 insertions(+), 4 deletions(-) diff --git a/src/components/pages/report/finance/tab/CustomerPaymentTab.tsx b/src/components/pages/report/finance/tab/CustomerPaymentTab.tsx index 6cd0ba3d..2b2c09a2 100644 --- a/src/components/pages/report/finance/tab/CustomerPaymentTab.tsx +++ b/src/components/pages/report/finance/tab/CustomerPaymentTab.tsx @@ -2,6 +2,7 @@ import { useState, useMemo, useCallback } from 'react'; import useSWR from 'swr'; import { Icon } from '@iconify/react'; import Card from '@/components/Card'; +import Badge from '@/components/Badge'; import SelectInput, { useSelect, OptionType, @@ -67,6 +68,38 @@ const CustomerPaymentTab = () => { [] ); + const getPaymentStatusColor = (notes: string) => { + const normalizedValue = notes.toLowerCase(); + + if (normalizedValue === 'lunas') { + return 'bg-info/10 text-info border-info'; + } + + if (normalizedValue.includes('belum')) { + return 'bg-warning/10 text-warning border-warning'; + } + + return 'bg-gray-100 text-gray-600 border-gray-300'; + }; + + const getPaymentStatusIndicatorColor = (notes: string) => { + const normalizedValue = notes.toLowerCase(); + + if (normalizedValue === 'lunas') { + return 'bg-info'; + } + + if (normalizedValue.includes('belum')) { + return 'bg-warning'; + } + + return 'bg-gray-400'; + }; + + const getPaymentStatusText = (notes: string) => { + return notes; + }; + // ===== FILTER HANDLERS ===== const handleResetFilters = useCallback(() => { setIsSubmitted(false); @@ -435,7 +468,9 @@ const CustomerPaymentTab = () => { accessorKey: 'accounts_receivable', cell: (props) => { const value = props.row.original.accounts_receivable; - return
{formatCurrency(value)}
; + return ( +
{formatCurrency(value)}
+ ); }, footer: () => (
@@ -449,7 +484,23 @@ const CustomerPaymentTab = () => { accessorKey: 'notes', cell: (props) => { const value = props.row.original.notes; - return value || '-'; + + if (!value) { + return '-'; + } + + return ( + + {getPaymentStatusText(value)} + + ); }, }, { @@ -647,14 +698,13 @@ const CustomerPaymentTab = () => { total_accounts_receivable: 0, }; - const totalAccountsReceivable = summary.total_accounts_receivable; const tableColumns = getTableColumns(summary); return ( Date: Tue, 13 Jan 2026 15:20:36 +0700 Subject: [PATCH 05/14] feat(FE): closing report overhead per kandang --- .../pages/closing/ClosingOverheadTable.tsx | 15 +++++++++++---- src/services/api/closing.ts | 5 +++-- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/components/pages/closing/ClosingOverheadTable.tsx b/src/components/pages/closing/ClosingOverheadTable.tsx index 3df0844d..ed74ca66 100644 --- a/src/components/pages/closing/ClosingOverheadTable.tsx +++ b/src/components/pages/closing/ClosingOverheadTable.tsx @@ -5,21 +5,27 @@ import { cn, formatCurrency, formatDate, formatNumber } from '@/lib/helper'; import { ClosingApi } from '@/services/api/closing'; import { Overhead, OverheadTotal } from '@/types/api/closing'; import { ColumnDef } from '@tanstack/react-table'; +import { useSearchParams } from 'next/navigation'; import { useMemo } from 'react'; import useSWR from 'swr'; interface ClosingOverheadTableProps { - type?: 'detail'; projectFlockId: number; } const ClosingOverheadTable = ({ - type, projectFlockId, }: ClosingOverheadTableProps) => { + const searchParams = useSearchParams(); + const kandangId = searchParams.get('kandangId'); + const { data: overhead, isLoading: isLoadingOverhead } = useSWR( - `${ClosingApi.basePath}/${projectFlockId}/overhead`, - () => ClosingApi.getOverhead(projectFlockId), + `${ClosingApi.basePath}/${projectFlockId}${kandangId ? `/${kandangId}` : ''}/overhead`, + () => + ClosingApi.getOverhead( + projectFlockId, + kandangId ? Number(kandangId) : undefined + ), { keepPreviousData: true, } @@ -148,6 +154,7 @@ const ClosingOverheadTable = ({ 'whitespace-nowrap' ), }} + isLoading={isLoadingOverhead} renderFooter={ isResponseSuccess(overhead) ? overhead.data?.overheads.length > 0 diff --git a/src/services/api/closing.ts b/src/services/api/closing.ts index 892fc88e..ff6a0bcb 100644 --- a/src/services/api/closing.ts +++ b/src/services/api/closing.ts @@ -131,10 +131,11 @@ export class ClosingApiService extends BaseApiService { } async getOverhead( - id: number + id: number, + kandangId?: number ): Promise | undefined> { try { - const path = `${this.basePath}/${id}/overhead`; + const path = `${this.basePath}/${id}${kandangId ? `/${kandangId}` : ''}/overhead`; return await httpClient>(path, { method: 'GET', }); From 34d7310cc928192b9e2e857865c115ff1f907880 Mon Sep 17 00:00:00 2001 From: rstubryan Date: Tue, 13 Jan 2026 15:32:39 +0700 Subject: [PATCH 06/14] refactor(FE): Style accounts receivable in red and adjust badge --- .../report/finance/export/CustomerPaymentExportPDF.tsx | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/components/pages/report/finance/export/CustomerPaymentExportPDF.tsx b/src/components/pages/report/finance/export/CustomerPaymentExportPDF.tsx index 08efa409..5adcb694 100644 --- a/src/components/pages/report/finance/export/CustomerPaymentExportPDF.tsx +++ b/src/components/pages/report/finance/export/CustomerPaymentExportPDF.tsx @@ -154,6 +154,9 @@ const pdfStyles = StyleSheet.create({ backgroundColor: '#F97316', color: '#FFFFFF', }, + textError: { + color: '#DC2626', + }, parameterBadge: { backgroundColor: '#F5F5F5', color: '#333333', @@ -389,7 +392,9 @@ const createPDFDocument = (params: CustomerPaymentExportPDFParams) => { {formatCurrency(item.payment)} - {formatCurrency(item.accounts_receivable)} + + {formatCurrency(item.accounts_receivable)} + {item.notes ? ( @@ -483,7 +488,7 @@ const createPDFDocument = (params: CustomerPaymentExportPDFParams) => { - + {formatCurrency( customerReport.summary.total_accounts_receivable )} From e77a43300a5a42663b32d1852c7956a1a9103739 Mon Sep 17 00:00:00 2001 From: rstubryan Date: Tue, 13 Jan 2026 16:01:30 +0700 Subject: [PATCH 07/14] refactor(FE): Nest project_flock in Recording and update UI --- .../production/recording/RecordingTable.tsx | 8 +- .../recording/form/RecordingForm.tsx | 92 ++++++++++++------- src/types/api/production/recording.d.ts | 44 ++++++--- 3 files changed, 98 insertions(+), 46 deletions(-) diff --git a/src/components/pages/production/recording/RecordingTable.tsx b/src/components/pages/production/recording/RecordingTable.tsx index 39b17ef7..6b10b26e 100644 --- a/src/components/pages/production/recording/RecordingTable.tsx +++ b/src/components/pages/production/recording/RecordingTable.tsx @@ -678,12 +678,13 @@ const RecordingTable = () => { { header: 'Nama Project', cell: (props) => - `Project ${props.row.original.project_flock_kandang_id}`, + props.row.original.project_flock?.flock_name || '-', }, { header: 'Kategori', cell: (props) => { - const category = props.row.original.project_flock_category; + const category = + props.row.original.project_flock?.project_flock_category; if (!category) return '-'; const color = category === 'LAYING' ? 'info' : 'warning'; return ( @@ -706,7 +707,8 @@ const RecordingTable = () => { { header: 'Populasi Awal', cell: (props) => - props.row.original.total_chick_qty?.toLocaleString() || '-', + props.row.original.project_flock?.total_chick_qty?.toLocaleString() || + '-', }, { header: 'Status Approval', diff --git a/src/components/pages/production/recording/form/RecordingForm.tsx b/src/components/pages/production/recording/form/RecordingForm.tsx index 4966172c..5097fe27 100644 --- a/src/components/pages/production/recording/form/RecordingForm.tsx +++ b/src/components/pages/production/recording/form/RecordingForm.tsx @@ -252,9 +252,13 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => { : undefined; const projectFlockKandangDetailUrl = useMemo(() => { - if (type === 'add' || !initialValues?.project_flock_kandang_id) return null; - return `${ProjectFlockKandangApi.basePath}/${initialValues.project_flock_kandang_id}`; - }, [type, initialValues?.project_flock_kandang_id]); + if ( + type === 'add' || + !initialValues?.project_flock?.project_flock_kandang_id + ) + return null; + return `${ProjectFlockKandangApi.basePath}/${initialValues.project_flock.project_flock_kandang_id}`; + }, [type, initialValues?.project_flock?.project_flock_kandang_id]); const { data: projectFlockKandangDetailData } = useSWR( projectFlockKandangDetailUrl, @@ -404,12 +408,12 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => { }, [approvedProjectFlockKandangsData]); const isLayingCategory = - initialValues?.project_flock_category === 'LAYING' || + initialValues?.project_flock?.project_flock_category === 'LAYING' || projectFlockKandangLookup?.project_flock?.category === 'LAYING' || projectFlockKandangDetail?.project_flock?.category === 'LAYING'; const isGrowingCategory = - initialValues?.project_flock_category === 'GROWING' || + initialValues?.project_flock?.project_flock_category === 'GROWING' || projectFlockKandangLookup?.project_flock?.category === 'GROWING' || projectFlockKandangDetail?.project_flock?.category === 'GROWING'; @@ -555,7 +559,7 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => { todayRecordings.forEach((recording) => { const recordingDate = recording.record_datetime?.split('T')[0]; if (recordingDate === today) { - recordedIds.add(recording.project_flock_kandang_id); + recordedIds.add(recording.project_flock.project_flock_kandang_id); } }); @@ -1005,7 +1009,7 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => { const hasSameDayRecording = isResponseSuccess(existingRecordings) ? existingRecordings.data?.some( (recording: Recording) => - recording.project_flock_kandang_id === + recording.project_flock.project_flock_kandang_id === projectFlockKandangId && recording.day === nextDayRecording.next_day ) @@ -1543,13 +1547,14 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => { - {initialValues.project_flock_category} + {initialValues.project_flock?.project_flock_category}

@@ -1579,7 +1584,7 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => { {type === 'detail' && initialValues && (
{ - {initialValues.fcr_std && initialValues.fcr_std > 0 - ? formatNumber(initialValues.fcr_std) + {initialValues.project_flock?.fcr?.fcr_std && + initialValues.project_flock?.fcr?.fcr_std > 0 + ? formatNumber( + initialValues.project_flock?.fcr?.fcr_std + ) : '-'} @@ -1630,9 +1638,14 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => { - {initialValues.feed_intake_std && - initialValues.feed_intake_std > 0 - ? formatNumber(initialValues.feed_intake_std) + {initialValues.project_flock?.production_standart + ?.feed_intake_std && + initialValues.project_flock?.production_standart + ?.feed_intake_std > 0 + ? formatNumber( + initialValues.project_flock?.production_standart + ?.feed_intake_std + ) : '-'} @@ -1698,9 +1711,11 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => { colSpan={2} className='text-center py-3 font-semibold' > - {initialValues.total_chick_qty && - initialValues.total_chick_qty > 0 - ? formatNumber(initialValues.total_chick_qty) + {initialValues.project_flock?.total_chick_qty && + initialValues.project_flock?.total_chick_qty > 0 + ? formatNumber( + initialValues.project_flock?.total_chick_qty + ) : '-'} @@ -1712,7 +1727,8 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => { {/* Egg Production Section - Only for LAYING category */} {type === 'detail' && initialValues && - initialValues.project_flock_category === 'LAYING' && ( + initialValues.project_flock?.project_flock_category === + 'LAYING' && (
@@ -1744,9 +1760,14 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => { - {initialValues.egg_mass_std && - initialValues.egg_mass_std > 0 - ? formatNumber(initialValues.egg_mass_std) + {initialValues.project_flock?.production_standart + ?.egg_mass_std && + initialValues.project_flock?.production_standart + ?.egg_mass_std > 0 + ? formatNumber( + initialValues.project_flock + ?.production_standart?.egg_mass_std + ) : '-'} @@ -1763,9 +1784,14 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => { - {initialValues.egg_weight_std && - initialValues.egg_weight_std > 0 - ? formatNumber(initialValues.egg_weight_std) + {initialValues.project_flock?.production_standart + ?.egg_weight_std && + initialValues.project_flock?.production_standart + ?.egg_weight_std > 0 + ? formatNumber( + initialValues.project_flock + ?.production_standart?.egg_weight_std + ) : '-'} @@ -1780,9 +1806,11 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => { - {initialValues.hen_day_std !== undefined && - initialValues.hen_day_std > 0 - ? `${initialValues.hen_day_std}%` + {initialValues.project_flock?.production_standart + ?.hen_day_std !== undefined && + initialValues.project_flock?.production_standart + ?.hen_day_std > 0 + ? `${initialValues.project_flock?.production_standart?.hen_day_std}%` : '-'} @@ -1797,9 +1825,11 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => { - {initialValues.hen_house_std !== undefined && - initialValues.hen_house_std > 0 - ? `${initialValues.hen_house_std}%` + {initialValues.project_flock?.production_standart + ?.hen_house_std !== undefined && + initialValues.project_flock?.production_standart + ?.hen_house_std > 0 + ? `${initialValues.project_flock?.production_standart?.hen_house_std}%` : '-'} diff --git a/src/types/api/production/recording.d.ts b/src/types/api/production/recording.d.ts index 1728516a..079bf045 100644 --- a/src/types/api/production/recording.d.ts +++ b/src/types/api/production/recording.d.ts @@ -1,34 +1,52 @@ import { BaseApproval, BaseMetadata, User } from '@/types/api/api-general'; import { ProductWarehouse } from '@/types/api/inventory/product-warehouse'; +import { Warehouse } from '@/types/api/master-data/warehouse'; + +export type ProductionStandard = { + id: number; + week: number; + name: string; + hen_day_std: number; + hen_house_std: number; + feed_intake_std: number; + max_depletion_std: number; + egg_mass_std: number; + egg_weight_std: number; +}; + +export type FCR = { + id: number; + name: string; + fcr_std: number; +}; + +export type ProjectFlock = { + project_flock_kandang_id: number; + flock_name: string; + project_flock_category: 'GROWING' | 'LAYING'; + period: number; + production_standart: ProductionStandard; + fcr: FCR; + total_chick_qty: number; +}; export type ProductionMetrics = { total_depletion_qty: number; cum_depletion_rate: number; cum_intake: number; fcr_value: number; - fcr_std?: number; - total_chick_qty: number; hen_day?: number; hen_house?: number; feed_intake?: number; - feed_intake_std?: number; egg_mass?: number; egg_weight?: number; - hen_day_std?: number; - hen_house_std?: number; - egg_mass_std?: number; - egg_weight_std?: number; - daily_gain?: number; - avg_daily_gain?: number; - cum_depletion?: number; }; export type BaseRecording = { id: number; - project_flock_kandang_id: number; + project_flock: ProjectFlock; record_datetime: string; day: number; - project_flock_category?: 'GROWING' | 'LAYING'; } & ProductionMetrics; export type RecordingDepletion = { @@ -68,6 +86,8 @@ export type Recording = BaseMetadata & BaseRecording & { approval?: BaseApproval; created_user: User; + warehouse?: Warehouse; + product_category?: 'GROWING' | 'LAYING'; depletions?: RecordingDepletion[]; stocks?: RecordingStock[]; eggs?: RecordingEgg[]; From 8481b77c90d38b061440a9a602e519b7d1d35fd3 Mon Sep 17 00:00:00 2001 From: rstubryan Date: Tue, 13 Jan 2026 16:21:41 +0700 Subject: [PATCH 08/14] refactor(FE): Adjust cumulative depletion table layout --- .../recording/form/RecordingForm.tsx | 56 ++++++------------- 1 file changed, 17 insertions(+), 39 deletions(-) diff --git a/src/components/pages/production/recording/form/RecordingForm.tsx b/src/components/pages/production/recording/form/RecordingForm.tsx index 5097fe27..c279bde7 100644 --- a/src/components/pages/production/recording/form/RecordingForm.tsx +++ b/src/components/pages/production/recording/form/RecordingForm.tsx @@ -1663,54 +1663,31 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
- - - - - - - - - - + - + + + + - - - - - + + +
- DEPLESI KUMULATIF -
- Total - - (%) -
+ Deplesi Kumulatif - {initialValues.total_depletion_qty && - initialValues.total_depletion_qty > 0 - ? formatNumber(initialValues.total_depletion_qty) + {initialValues.cum_depletion_rate && + initialValues.cum_depletion_rate > 0 + ? `${initialValues.cum_depletion_rate.toFixed(2)}%` : '-'} - {initialValues.cum_depletion_rate && - initialValues.cum_depletion_rate > 0 - ? initialValues.cum_depletion_rate.toFixed(2) +
Total Depletion + {initialValues.total_depletion_qty && + initialValues.total_depletion_qty > 0 + ? formatNumber(initialValues.total_depletion_qty) : '-'}
- Total Ayam -
+
Total Ayam {initialValues.project_flock?.total_chick_qty && initialValues.project_flock?.total_chick_qty > 0 ? formatNumber( @@ -1718,6 +1695,7 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => { ) : '-'}
From 582b971c09b6aa394ba5dbbc3ed6db435ad6d5ce Mon Sep 17 00:00:00 2001 From: rstubryan Date: Tue, 13 Jan 2026 16:47:58 +0700 Subject: [PATCH 09/14] refactor(FE): Change endpoint path to reports --- src/components/pages/report/MarketingReportContent.tsx | 2 +- src/services/api/report/marketing-sale.ts | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/components/pages/report/MarketingReportContent.tsx b/src/components/pages/report/MarketingReportContent.tsx index d54c935a..3ebacecb 100644 --- a/src/components/pages/report/MarketingReportContent.tsx +++ b/src/components/pages/report/MarketingReportContent.tsx @@ -33,7 +33,7 @@ const MarketingReportContent = () => { const [activeTab, setActiveTab] = useState('daily'); return ( -
+
Date: Wed, 14 Jan 2026 00:02:44 +0700 Subject: [PATCH 10/14] refactor(FE): Add record_date to recording payloads --- .../pages/production/recording/form/RecordingForm.tsx | 4 ++++ src/types/api/production/recording.d.ts | 1 + 2 files changed, 5 insertions(+) diff --git a/src/components/pages/production/recording/form/RecordingForm.tsx b/src/components/pages/production/recording/form/RecordingForm.tsx index c279bde7..4f9018fc 100644 --- a/src/components/pages/production/recording/form/RecordingForm.tsx +++ b/src/components/pages/production/recording/form/RecordingForm.tsx @@ -117,8 +117,10 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => { // ===== PAYLOAD CREATION HELPERS ===== const createGrowingPayload = useCallback( (values: RecordingGrowingFormValues) => { + const today = new Date().toISOString().split('T')[0]; return { project_flock_kandang_id: values.project_flock_kandang_id, + record_date: today, stocks: (values.stocks ?? []).map((stock) => ({ product_warehouse_id: stock.product_warehouse_id, qty: Number(stock.qty) || 0, @@ -134,8 +136,10 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => { const createLayingPayload = useCallback( (values: RecordingLayingFormValues) => { + const today = new Date().toISOString().split('T')[0]; return { project_flock_kandang_id: values.project_flock_kandang_id, + record_date: today, stocks: (values.stocks ?? []).map((stock) => ({ product_warehouse_id: stock.product_warehouse_id, qty: Number(stock.qty) || 0, diff --git a/src/types/api/production/recording.d.ts b/src/types/api/production/recording.d.ts index 079bf045..e30abe4c 100644 --- a/src/types/api/production/recording.d.ts +++ b/src/types/api/production/recording.d.ts @@ -101,6 +101,7 @@ export type NextDayRecording = { export type CreateGrowingRecordingPayload = { project_flock_kandang_id: number; + record_date: string; stocks?: { product_warehouse_id: number; qty: number; From a5d2d855725b704cc606b5264ab696d0dc72e051 Mon Sep 17 00:00:00 2001 From: ValdiANS Date: Wed, 14 Jan 2026 09:28:16 +0700 Subject: [PATCH 11/14] chore: hide AWG std and AWG act --- .../pages/closing/ClosingProductionDataTabContent.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/pages/closing/ClosingProductionDataTabContent.tsx b/src/components/pages/closing/ClosingProductionDataTabContent.tsx index aabf48de..0f15d5b9 100644 --- a/src/components/pages/closing/ClosingProductionDataTabContent.tsx +++ b/src/components/pages/closing/ClosingProductionDataTabContent.tsx @@ -197,7 +197,7 @@ const ClosingProductionDataTabContent = ({ value={formatNumber(performance.mor_diff)} unitClassName='hidden' /> - + /> */} Date: Wed, 14 Jan 2026 09:28:47 +0700 Subject: [PATCH 12/14] feat: date filter type --- .../report/DailyMarketingReportContent.tsx | 45 ++++++++++++++++++- 1 file changed, 43 insertions(+), 2 deletions(-) diff --git a/src/components/pages/report/DailyMarketingReportContent.tsx b/src/components/pages/report/DailyMarketingReportContent.tsx index 3ddbd6cf..d17df01e 100644 --- a/src/components/pages/report/DailyMarketingReportContent.tsx +++ b/src/components/pages/report/DailyMarketingReportContent.tsx @@ -1,6 +1,6 @@ 'use client'; -import { ChangeEventHandler, useState } from 'react'; +import { ChangeEventHandler, useEffect, useState } from 'react'; import { pdf } from '@react-pdf/renderer'; import toast from 'react-hot-toast'; @@ -28,7 +28,10 @@ import { import { Warehouse } from '@/types/api/master-data/warehouse'; import { Customer } from '@/types/api/master-data/customer'; import { MarketingReportApi } from '@/services/api/report/marketing-report'; -import { MARKETING_TYPE_OPTIONS } from '@/config/constant'; +import { + MARKETING_DATE_FILTER_TYPE_OPTIONS, + MARKETING_TYPE_OPTIONS, +} from '@/config/constant'; import { httpClient } from '@/services/http/client'; import { BaseApiResponse } from '@/types/api/api-general'; import { @@ -150,6 +153,15 @@ const DailyMarketingReportContent = () => { updateFilter('end_date', e.target.value ? e.target.value : ''); }; + const [selectedMarketingDateFilterType, setSelectedMarketingDateFilterType] = + useState(null); + const marketingDateFilterTypeChangeHandler = ( + val: OptionType | OptionType[] | null + ) => { + setSelectedMarketingDateFilterType(val as OptionType); + updateFilter('filter_by', val ? ((val as OptionType).value as string) : ''); + }; + const [selectedMarketingType, setSelectedMarketingType] = useState(null); const marketingTypeChangeHandler = ( @@ -252,6 +264,23 @@ const DailyMarketingReportContent = () => { resetFilter(); }; + useEffect(() => { + if ( + tableFilterState.filter_by === 'realization_date' || + tableFilterState.filter_by === 'so_date' + ) { + setSelectedMarketingDateFilterType({ + label: + tableFilterState.filter_by === 'realization_date' + ? 'Tanggal Realisasi' + : 'Tanggal SO', + value: tableFilterState.filter_by, + }); + } else { + setSelectedMarketingDateFilterType(null); + } + }, [tableFilterState.filter_by]); + return (
@@ -341,6 +370,18 @@ const DailyMarketingReportContent = () => {
+ + Date: Wed, 14 Jan 2026 09:29:15 +0700 Subject: [PATCH 13/14] chore: adjust table columns accessorKey for filter --- .../pages/report/DailyMarketingsTable.tsx | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/src/components/pages/report/DailyMarketingsTable.tsx b/src/components/pages/report/DailyMarketingsTable.tsx index 94da96f8..2dba0309 100644 --- a/src/components/pages/report/DailyMarketingsTable.tsx +++ b/src/components/pages/report/DailyMarketingsTable.tsx @@ -71,19 +71,22 @@ const DailyMarketingsTable = ({ cell: (props) => `${props.row.original.aging_days} hari`, }, { - accessorKey: 'warehouse.name', + accessorKey: 'warehouse', header: 'Gudang', + cell: ({ row }) => row.original.warehouse.name, }, { - accessorKey: 'customer.name', + accessorKey: 'customer', header: 'Pelanggan', + cell: ({ row }) => row.original.customer.name, }, { accessorKey: 'do_number', header: 'No. DO', + enableSorting: false, }, { - accessorKey: 'sales', + accessorKey: 'sales_person', header: 'Sales/Marketing', cell: (props) => props.row.original.sales.name, }, @@ -97,10 +100,12 @@ const DailyMarketingsTable = ({ { accessorKey: 'marketing_type', header: 'Marketing Type', + enableSorting: false, }, { - accessorKey: 'product.name', + accessorKey: 'product', header: 'Produk', + cell: ({ row }) => row.original.product.name, }, { accessorKey: 'qty', @@ -115,12 +120,12 @@ const DailyMarketingsTable = ({ }, }, { - accessorKey: 'average_weight_kg', + accessorKey: 'average_weight', header: 'Bobot Rata-Rata (Kg)', cell: (props) => formatNumber(props.row.original.average_weight_kg), }, { - accessorKey: 'total_weight_kg', + accessorKey: 'total_weight', header: 'Bobot Total (Kg)', cell: (props) => formatNumber(props.row.original.total_weight_kg), footer: () => { @@ -132,12 +137,12 @@ const DailyMarketingsTable = ({ }, }, { - accessorKey: 'sales_price_per_kg', + accessorKey: 'sales_price', header: 'Harga Jual (Rp)', cell: (props) => formatCurrency(props.row.original.sales_price_per_kg), }, { - accessorKey: 'hpp_price_per_kg', + accessorKey: 'hpp_price', header: 'HPP (Rp)', cell: (props) => formatCurrency(props.row.original.hpp_price_per_kg), footer: () => { @@ -163,6 +168,8 @@ const DailyMarketingsTable = ({ ]; useEffect(() => { + console.log({ sorting }); + if (sorting.length === 1) { onFilterByChange(sorting[0].id); onSortByChange(sorting[0].desc ? 'desc' : 'asc'); From c4b505047cd656456c6bc62bd0245afc0859a20e Mon Sep 17 00:00:00 2001 From: ValdiANS Date: Wed, 14 Jan 2026 09:29:27 +0700 Subject: [PATCH 14/14] chore: add MARKETING_DATE_FILTER_TYPE_OPTIONS constant --- src/config/constant.ts | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/config/constant.ts b/src/config/constant.ts index 364f1824..d3832613 100644 --- a/src/config/constant.ts +++ b/src/config/constant.ts @@ -457,3 +457,14 @@ export const MARKETING_TYPE_OPTIONS = [ value: 'trading', }, ]; + +export const MARKETING_DATE_FILTER_TYPE_OPTIONS = [ + { + label: 'Tanggal Realisasi', + value: 'realization_date', + }, + { + label: 'Tanggal SO', + value: 'so_date', + }, +];