From ead338fa0fe16cd3124dfa5c75999d7a435424b2 Mon Sep 17 00:00:00 2001 From: ValdiANS Date: Wed, 21 Jan 2026 09:31:21 +0700 Subject: [PATCH 1/3] chore: rename total_average_weight to average_weight_kg in SalesSummary --- src/components/pages/report/DailyMarketingsTable.tsx | 2 +- src/types/api/report/marketing.d.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/pages/report/DailyMarketingsTable.tsx b/src/components/pages/report/DailyMarketingsTable.tsx index b9906e53..2328c2be 100644 --- a/src/components/pages/report/DailyMarketingsTable.tsx +++ b/src/components/pages/report/DailyMarketingsTable.tsx @@ -125,7 +125,7 @@ const DailyMarketingsTable = ({ cell: (props) => formatNumber(props.row.original.average_weight_kg), footer: () => { const totalAverageWeightKg = isResponseSuccess(dailyMarketings) - ? dailyMarketings?.total?.total_average_weight + ? dailyMarketings?.total?.average_weight_kg : 0; return totalAverageWeightKg ? formatNumber(totalAverageWeightKg) : '-'; diff --git a/src/types/api/report/marketing.d.ts b/src/types/api/report/marketing.d.ts index 925707eb..302596ac 100644 --- a/src/types/api/report/marketing.d.ts +++ b/src/types/api/report/marketing.d.ts @@ -41,7 +41,7 @@ export type DailyMarketingRow = BaseMetadata & BaseDailyMarketingRow; export interface SalesSummary { total_qty: number; - total_average_weight: number; + average_weight_kg: number; total_weight_kg: number; total_sales_price: number; total_sales_amount: number; From c695afa1e730918a400c4a73c02afe0740d6b0b3 Mon Sep 17 00:00:00 2001 From: ValdiANS Date: Wed, 21 Jan 2026 09:40:22 +0700 Subject: [PATCH 2/3] chore: rename total_sales_price to average_sales_price in SalesSummary --- src/components/pages/report/DailyMarketingsTable.tsx | 2 +- src/types/api/report/marketing.d.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/pages/report/DailyMarketingsTable.tsx b/src/components/pages/report/DailyMarketingsTable.tsx index 2328c2be..67702035 100644 --- a/src/components/pages/report/DailyMarketingsTable.tsx +++ b/src/components/pages/report/DailyMarketingsTable.tsx @@ -149,7 +149,7 @@ const DailyMarketingsTable = ({ cell: (props) => formatCurrency(props.row.original.sales_price_per_kg), footer: () => { const totalSalesPrice = isResponseSuccess(dailyMarketings) - ? dailyMarketings?.total?.total_sales_price + ? dailyMarketings?.total?.average_sales_price : 0; return totalSalesPrice ? formatNumber(totalSalesPrice) : '-'; diff --git a/src/types/api/report/marketing.d.ts b/src/types/api/report/marketing.d.ts index 302596ac..20c60725 100644 --- a/src/types/api/report/marketing.d.ts +++ b/src/types/api/report/marketing.d.ts @@ -43,7 +43,7 @@ export interface SalesSummary { total_qty: number; average_weight_kg: number; total_weight_kg: number; - total_sales_price: number; + average_sales_price: number; total_sales_amount: number; total_hpp_amount: number; total_hpp_price_per_kg: number; From 6c4672e38e11421ea9cbf1d3e98894c0667e9be8 Mon Sep 17 00:00:00 2001 From: ValdiANS Date: Wed, 21 Jan 2026 09:43:13 +0700 Subject: [PATCH 3/3] chore: add flock name to ClosingsTable --- src/components/pages/closing/ClosingsTable.tsx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/components/pages/closing/ClosingsTable.tsx b/src/components/pages/closing/ClosingsTable.tsx index ec334104..dc9609ac 100644 --- a/src/components/pages/closing/ClosingsTable.tsx +++ b/src/components/pages/closing/ClosingsTable.tsx @@ -104,6 +104,10 @@ const ClosingsTable = () => { header: '#', cell: (props) => props.row.index + 1, }, + { + accessorKey: 'project_name', + header: 'Flock', + }, { accessorKey: 'location_name', header: 'Lokasi',