fix(FE): resolve conflict with branch development

src/types/api/closing.d.ts

@@ -23,6 +23,33 @@ export type BaseSales = {
   payment_status: string;
 };
 
+export type BaseClosingSales = {
+  project_type: string;
+  flock_id: number;
+  period: number;
+  sales: BaseSales[];
+};
+import { Kandang } from '@/types/api/master-data/kandang';
+import { Product } from '@type/api/master-data/product';
+import { Customer } from '@type/api/master-data/customer';
+import { BaseMetadata } from '@/types/api/api-general';
+
+export type BaseSales = {
+  id: number;
+  realization_date: string;
+  age: number;
+  do_number: string;
+  product: Product;
+  customer: Customer;
+  qty: number;
+  weight: number;
+  avg_weight: number;
+  price: number;
+  total_price: number;
+  kandang: Kandang;
+  payment_status: string;
+};
+
 export type BaseClosingSales = {
   project_type: string;
   flock_id: number;
@@ -79,6 +106,44 @@ export type ClosingIncomingSapronak = {
 
 export type ClosingOutgoingSapronak = ClosingIncomingSapronak;
 
+export type ClosingProductionData = {
+  purchase: {
+    initial_population: number;
+    claim_culling: number;
+    final_population: number;
+    feed_in: number;
+    feed_used: number;
+    feed_used_per_head: number;
+  };
+
+  sales: {
+    chicken: {
+      sales_population: number;
+      sales_weight: number;
+      average_weight: number;
+      chicken_average_selling_price: number;
+    };
+    egg?: {
+      egg_pieces: number;
+      egg_mass_kg: number;
+      average_egg_weight_kg: number;
+      egg_average_selling_price: number;
+    };
+  };
+
+  performance: {
+    depletion: number;
+    age_day: number;
+    mortality_std: number;
+    mortality_act: number;
+    deff_mortality: number;
+    fcr_std: number;
+    fcr_act: number;
+    deff_fcr: number;
+    awg: number;
+  };
+};
+
 // ====== PERHITUNGAN SAPRONAK ======
 
 export type RowSapronakCalculation = {
@@ -141,6 +206,7 @@ export type OverheadTotal = {
   actual_total_amount: number;
   cost_per_bird: number;
 };
+
 export type ClosingSales = BaseMetadata & BaseClosingSales;
 
 // ====== FINANCE ======

src/types/api/master-data/kandang.d.ts

@@ -10,7 +10,6 @@ export type BaseKandang = {
   capacity: number;
   pic: BaseUser;
   project_flock_kandang_id?: number;
-  capacity: number;
 };
 
 export type Kandang = BaseMetadata & BaseKandang;

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

@@ -0,0 +1,61 @@
+import { BaseMetadata } from '@/types/api/api-general';
+import { BaseCustomer, Customer } from '@/types/api/master-data/customer';
+import {
+  BaseWarehouseArea,
+  BaseWarehouseKandang,
+  BaseWarehouseLocation,
+  Warehouse,
+} from '@/types/api/master-data/warehouse';
+import { Location } from '@/types/api/master-data/location';
+import { Area } from '@/types/api/master-data/area';
+import { BaseProduct } from '@/types/api/master-data/product';
+
+export type BaseDailyMarketingRow = {
+  no: number;
+  so_date: string; // e.g. "01-Dec-2025"
+  do_date: string; // e.g. "08-Dec-2025"
+  aging_days: number;
+
+  warehouse: BaseWarehouseArea | BaseWarehouseLocation | BaseWarehouseKandang;
+  customer: BaseCustomer;
+  sales: string;
+  product: BaseProduct;
+
+  do_number: string;
+  vehicle_number: string;
+  marketing_type: string;
+
+  qty: number;
+  average_weight_kg: number;
+  total_weight_kg: number;
+
+  sales_price_per_kg: number;
+  hpp_price_per_kg: number;
+
+  sales_amount: number;
+  hpp_amount: number;
+};
+
+export type DailyMarketingRow = BaseMetadata & BaseDailyMarketingRow;
+
+export interface SalesSummary {
+  total_qty: number;
+  total_weight_kg: number;
+  total_sales_amount: number;
+  total_hpp_amount: number;
+}
+
+export type DailyMarketingReport = {
+  rows: DailyMarketingRow[];
+  summary: SalesSummary;
+};
+
+export type MarketingReportFilters = {
+  area_id?: number;
+  location_id?: number;
+  warehouse_id?: number;
+  customer_id?: number;
+  start_date?: string;
+  end_date?: string;
+  date_type?: 'realized' | 'transaction';
+};