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

[FIX/FE] Daily Marketing Report

See merge request mbugroup/lti-web-client!220

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',

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) : '-';
@@ -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) : '-';

src/types/api/report/marketing.d.ts

@@ -41,9 +41,9 @@ 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;
+  average_sales_price: number;
   total_sales_amount: number;
   total_hpp_amount: number;
   total_hpp_price_per_kg: number;