Merge branch 'development' into fix/transfer-to-laying

src/types/api/closing.d.ts

@@ -11,6 +11,7 @@ import { Product } from '@type/api/master-data/product';
 import { Customer } from '@type/api/master-data/customer';
 import { BaseMetadata } from '@/types/api/api-general';
 import { ProjectFlock } from '@/types/api/production/project-flock';
+import { BaseUom } from '@/types/api/master-data/uom';
 
 export type BaseSales = {
   id: number;
@@ -104,8 +105,16 @@ export type ClosingIncomingSapronak = {
   notes: string;
 };
 
+export type ClosingIncomingSapronakSummary = {
+  category: string;
+  total_qty: number;
+  uom: BaseUom;
+};
+
 export type ClosingOutgoingSapronak = ClosingIncomingSapronak;
 
+export type ClosingOutgoingSapronakSummary = ClosingIncomingSapronakSummary;
+
 export type ClosingProductionData = {
   purchase: {
     initial_population: number;

src/types/api/expense.d.ts

@@ -34,7 +34,7 @@ export type BaseExpense = {
       nonstock_id: number;
       qty: number;
       price: number;
-      note?: string;
+      notes?: string;
       nonstock: Pick<BaseNonstock, 'id' | 'name' | 'flags'>;
       created_at: string;
     }[];
@@ -43,7 +43,7 @@ export type BaseExpense = {
       expense_nonstock_id: number;
       qty: number;
       price: number;
-      note?: string;
+      notes?: string;
       nonstock: Pick<BaseNonstock, 'id' | 'name' | 'flags'>;
       created_at: string;
     }[];

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

@@ -10,6 +10,7 @@ export type BaseProjectFlockKandang = {
   kandang_id: number;
   kandang: Kandang;
   project_flock: ProjectFlock;
+  name_with_period?: string;
   approval: BaseApproval;
   chickins?: Chickin[];
   available_qtys?: AvailableQty[];

src/types/api/production/recording.d.ts

@@ -1,6 +1,8 @@
 import { BaseApproval, BaseMetadata, User } from '@/types/api/api-general';
 import { ProductWarehouse } from '@/types/api/inventory/product-warehouse';
 import { Warehouse } from '@/types/api/master-data/warehouse';
+import { Kandang } from '@/types/api/master-data/kandang';
+import { Location } from '@/types/api/master-data/location';
 
 export type ProductionStandard = {
   id: number;
@@ -87,6 +89,8 @@ export type Recording = BaseMetadata &
     approval?: BaseApproval;
     created_user: User;
     warehouse?: Warehouse;
+    kandang?: Kandang;
+    location?: Location;
     product_category?: 'GROWING' | 'LAYING';
     depletions?: RecordingDepletion[];
     stocks?: RecordingStock[];
@@ -107,15 +111,15 @@ export type CreateGrowingRecordingPayload = {
     qty: number;
   }[];
   depletions?: {
-    product_warehouse_id: number;
-    qty: number;
+    product_warehouse_id?: number;
+    qty?: number;
   }[];
 };
 
 export type CreateEggPayload = {
-  product_warehouse_id: number;
-  qty: number;
-  weight: number;
+  product_warehouse_id?: number;
+  qty?: number;
+  weight?: number;
 };
 
 export type CreateLayingRecordingPayload = CreateGrowingRecordingPayload & {

src/types/api/report/customer-payment.d.ts

@@ -11,7 +11,7 @@ export type CustomerPaymentRow = {
   qty: number;
   weight: number;
   average_weight: number;
-  price: number;
+  unit_price: number;
   final_price: number;
   total_price: number;
   payment_amount: number;

src/types/api/report/hpp-per-kandang.d.ts

@@ -5,6 +5,7 @@ import { Kandang } from '@/types/api/master-data/kandang';
 export type HppPerKandangRow = {
   id: number;
   kandang: Kandang;
+  name_with_periode?: string;
   weight_range: {
     weight_min: number;
     weight_max: number;