@@ -1744,9 +1742,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 +1766,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 +1788,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 +1807,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/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 = () => {
+
+
`${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');
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 (
-
+
{
+ 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 +272,10 @@ const createPDFDocument = (params: CustomerPaymentExportPDFParams) => {
No
- Tgl DO/Bayar
+ Tanggal DO
- Tgl Realisasi
+ Tanggal Realisasi
Aging
@@ -193,16 +284,16 @@ const createPDFDocument = (params: CustomerPaymentExportPDFParams) => {
Referensi
- No. Polisi
+ No Polisi
Qty
- Berat (Kg)
+ Berat
- AVG
+ Rata-Rata
Harga Awal
@@ -214,7 +305,7 @@ const createPDFDocument = (params: CustomerPaymentExportPDFParams) => {
Harga Akhir
- PPN (%)
+ Pajak
Total
@@ -223,10 +314,10 @@ const createPDFDocument = (params: CustomerPaymentExportPDFParams) => {
Pembayaran
- Saldo Piutang
+ Saldo
- Ket
+ Keterangan
Pengambilan
@@ -301,10 +392,29 @@ const createPDFDocument = (params: CustomerPaymentExportPDFParams) => {
{formatCurrency(item.payment)}
- {formatCurrency(item.accounts_receivable)}
+
+ {formatCurrency(item.accounts_receivable)}
+
- {item.notes || '-'}
+ {item.notes ? (
+ {item.notes}
+ ) : (
+
+
+ {item.accounts_receivable === 0
+ ? 'Lunas'
+ : 'Belum Lunas'}
+
+
+ )}
{item.pickup_info || '-'}
@@ -378,7 +488,7 @@ const createPDFDocument = (params: CustomerPaymentExportPDFParams) => {
-
+
{formatCurrency(
customerReport.summary.total_accounts_receivable
)}
diff --git a/src/components/pages/report/finance/tab/CustomerPaymentTab.tsx b/src/components/pages/report/finance/tab/CustomerPaymentTab.tsx
index 1d8d1993..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,
@@ -46,7 +47,6 @@ const CustomerPaymentTab = () => {
const [filterSales, setFilterSales] = useState([]);
const [filterStartDate, setFilterStartDate] = useState('');
const [filterEndDate, setFilterEndDate] = useState('');
- const [filterErrors, setFilterErrors] = useState>({});
const filterModal = useModal();
@@ -68,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);
@@ -75,27 +107,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 +236,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.');
@@ -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)}
+
+ );
},
},
{
@@ -538,15 +589,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 +601,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}
-
- )}
@@ -659,14 +698,13 @@ const CustomerPaymentTab = () => {
total_accounts_receivable: 0,
};
- const totalAccountsReceivable = summary.total_accounts_receivable;
const tableColumns = getTableColumns(summary);
return (
{
}
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',
});
diff --git a/src/services/api/report/marketing-sale.ts b/src/services/api/report/marketing-sale.ts
index bb9c1f49..92c59b2c 100644
--- a/src/services/api/report/marketing-sale.ts
+++ b/src/services/api/report/marketing-sale.ts
@@ -44,9 +44,7 @@ export class MarketingSaleReportService extends BaseApiService<
}
}
-export const SaleReportApi = new MarketingSaleReportService(
- 'reports/marketings'
-);
+export const SaleReportApi = new MarketingSaleReportService('reports');
// export const SaleReportApi = new MarketingSaleReportService(
// 'http://localhost:4010/api/reports/marketings'
diff --git a/src/types/api/production/recording.d.ts b/src/types/api/production/recording.d.ts
index 1728516a..e30abe4c 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[];
@@ -81,6 +101,7 @@ export type NextDayRecording = {
export type CreateGrowingRecordingPayload = {
project_flock_kandang_id: number;
+ record_date: string;
stocks?: {
product_warehouse_id: number;
qty: number;