fix(resolve): fix resolve MR

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

@@ -6,19 +6,55 @@ import {
 } from '@/types/api/api-general';
 import { ProductWarehouse } from '@/types/api/inventory/product-warehouse';
 import { Kandang } from '@/types/api/master-data/kandang';
+import { id } from 'react-day-picker/locale';
+import { Warehouse } from '../master-data/warehouse';
 
+/**
+ * Base Data Response
+ */
 export type BaseMarketing = {
   id: number;
   status?: string;
   so_number: string;
-  customer: Customer;
-  so_docs: string;
   so_date: string;
+  customer: Customer;
   sales_person: CreatedUser;
   notes: string;
-  grand_total: number;
-  approval: BaseApproval;
-  marketing_products?: MarketingProduct[];
+  latest_approval: BaseApproval;
+  sales_order: BaseSalesOrder[];
+  delivery_order: BaseDeliveryOrder[];
+};
+
+export type BaseSalesOrder = {
+  id: number;
+  marketing_id: number;
+  product_warehouse_id: number;
+  qty: number;
+  unit_price: number;
+  avg_weight: number;
+  total_weight: number;
+  total_price: number;
+  product_warehouse: ProductWarehouse;
+  vehicle_number: string;
+};
+
+export type BaseDeliveryOrder = {
+  id: number;
+  marketing_id: number;
+  do_number: string;
+  delivery_date: string;
+  warehouse: Warehouse;
+  deliveries: BaseDelivery[];
+};
+
+export type BaseDelivery = {
+  product_warehouse: ProductWarehouse;
+  qty: number;
+  unit_price: number;
+  total_weight: number;
+  avg_weight: number;
+  total_price: number;
+  vehicle_number: string;
 };
 
 export type MarketingProduct = {
@@ -29,7 +65,7 @@ export type MarketingProduct = {
   total_weight: number;
   total_price: number;
   product_warehouse: ProductWarehouse;
-  marketing_delivery_products?: MarketingDeliveryProducts;
+  delivery_product?: MarketingDeliveryProducts;
 };
 
 export type MarketingDeliveryProducts = {
@@ -39,34 +75,66 @@ export type MarketingDeliveryProducts = {
   avg_weight: number;
   total_weight: number;
   total_price: number;
-  delivery_date: string;
+  delivery_date: string | null;
   vehicle_number: string;
-  do_number?: string | undefined;
+  do_number?: string | undefined; // Uncertain
 };
 
 export type Marketing = BaseMetadata & BaseMarketing;
 
-export type CreateMarketingPayload = {
+/**
+ * Base Data Payload
+ */
+export type BaseCreateMarketingPayload = {
   customer_id: number;
+  sales_person_id: number;
   date: string;
   notes: string;
-  marketing_products: CreateMarketingProductPayload[];
 };
-export type UpdateMarketingPayload = CreateMarketingPayload;
 
-export type CreateMarketingProductPayload = {
-  id?: number;
+export type BaseCreateMarketingProductPayload = {
   vehicle_number: string;
   kandang_id: string | number | undefined;
-  kandang: Kandang | undefined;
   product_warehouse_id: string | number | undefined;
-  product_warehouse: ProductWarehouse | undefined;
   unit_price: string | number | undefined;
   total_weight: string | number | undefined;
   qty: string | number | undefined;
-  uom: string | undefined;
   avg_weight: string | number | undefined;
   total_price: string | number | undefined;
-  delivery_date?: string | null;
 };
-export type UpdateMarketingProductPayload = CreateMarketingProductPayload;
+
+/**
+ * Payload Data Types Sales Order
+ */
+
+export type CreateSalesOrderPayload = BaseCreateMarketingPayload & {
+  marketing_products: CreateSalesOrderProductPayload[];
+};
+
+export type CreateSalesOrderProductPayload =
+  BaseCreateMarketingProductPayload & {
+    id?: number;
+    kandang?: Kandang | undefined;
+    product_warehouse?: ProductWarehouse | undefined;
+  };
+
+export type CreateDeliveryOrderPayload = {
+  marketing_id?: number;
+  delivery_products: CreateDeliveryOrderProductPayload[];
+};
+
+export type CreateDeliveryOrderProductPayload =
+  BaseCreateMarketingProductPayload & {
+    id?: number;
+    marketing_product_id: number;
+    delivery_date: string;
+  };
+
+export type UpdateSalesOrderProductPayload = CreateSalesOrderProductPayload;
+
+export type UpdateDeliveryOrderProductPayload =
+  CreateDeliveryOrderProductPayload;
+
+export type UpdateSalesOrderPayload = CreateSalesOrderPayload;
+
+export type UpdateDeliveryOrderPayload = CreateDeliveryOrderPayload;

src/types/api/production/project-flock.d.ts

@@ -10,9 +10,6 @@ export type BaseProjectFlock = {
   name?: string;
   flock_name?: string;
   status: string;
-  flock?: Flock;
-  flock_i?: number;
-  flock_name: string;
   area: Area;
   area_id: number;
   category: string;
@@ -41,7 +38,6 @@ export type CreateProjectFlockPayload = {
   category: string;
   fcr_id: number;
   location_id: number;
-  period: number;
   kandang_ids: number[];
 };
 
@@ -71,3 +67,9 @@ export type ProjectFlockAvailableQuantity = {
     available_qty: number;
   }[];
 };
+
+export type ProjectFlockPeriods = {
+  id: number;
+  name: string;
+  period: number;
+}[];