gitea-admin/lti-web-client
1
0
Fork 0
mirror of https://gitlab.com/mbugroup/lti-web-client.git synced 2026-05-25 07:45:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/daily-marketing-report' into 'development'

Browse Source 
[FIX/FE] Daily Marketing Report

See merge request mbugroup/lti-web-client!220
This commit is contained in:
Rivaldi A N S
2026-01-21 02:45:11 +00:00
parent afbb007309 6c4672e38e
commit 9bd4df3f4c
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/pages/closing/ClosingsTable.tsx
+4
View File
@@ -104,6 +104,10 @@ const ClosingsTable = () => {
header: '#', header: '#',
cell: (props) => props.row.index + 1, cell: (props) => props.row.index + 1,
}, },
{
accessorKey: 'project_name',
header: 'Flock',
},
{ {
accessorKey: 'location_name', accessorKey: 'location_name',
header: 'Lokasi', header: 'Lokasi',
src/components/pages/report/DailyMarketingsTable.tsx
+2 -2
View File
@@ -125,7 +125,7 @@ const DailyMarketingsTable = ({
cell: (props) => formatNumber(props.row.original.average_weight_kg), cell: (props) => formatNumber(props.row.original.average_weight_kg),
footer: () => { footer: () => {
const totalAverageWeightKg = isResponseSuccess(dailyMarketings) const totalAverageWeightKg = isResponseSuccess(dailyMarketings)
? dailyMarketings?.total?.total_average_weight ? dailyMarketings?.total?.average_weight_kg
: 0; : 0;
return totalAverageWeightKg ? formatNumber(totalAverageWeightKg) : '-'; return totalAverageWeightKg ? formatNumber(totalAverageWeightKg) : '-';
@@ -149,7 +149,7 @@ const DailyMarketingsTable = ({
cell: (props) => formatCurrency(props.row.original.sales_price_per_kg), cell: (props) => formatCurrency(props.row.original.sales_price_per_kg),
footer: () => { footer: () => {
const totalSalesPrice = isResponseSuccess(dailyMarketings) const totalSalesPrice = isResponseSuccess(dailyMarketings)
? dailyMarketings?.total?.total_sales_price ? dailyMarketings?.total?.average_sales_price
: 0; : 0;
return totalSalesPrice ? formatNumber(totalSalesPrice) : '-'; return totalSalesPrice ? formatNumber(totalSalesPrice) : '-';
src/types/api/report/marketing.d.ts
Vendored
+2 -2
View File
@@ -41,9 +41,9 @@ export type DailyMarketingRow = BaseMetadata & BaseDailyMarketingRow;
export interface SalesSummary { export interface SalesSummary {
total_qty: number; total_qty: number;
total_average_weight: number; average_weight_kg: number;
total_weight_kg: number; total_weight_kg: number;
total_sales_price: number; average_sales_price: number;
total_sales_amount: number; total_sales_amount: number;
total_hpp_amount: number; total_hpp_amount: number;
total_hpp_price_per_kg: number; total_hpp_price_per_kg: number;