Merge branch 'development' of gitlab.com:mbugroup/lti-web-client into feat/FE/US-278/TASK-311-adjustment-purchase-and-expense

src/types/api/closing.d.ts

@@ -0,0 +1,55 @@
+import { Area } from '@/types/api/master-data/area';
+import { Fcr } from '@/types/api/master-data/fcr';
+import { Flock } from '@/types/api/master-data/flock';
+import { Kandang } from '@/types/api/master-data/kandang';
+import { Location } from '@/types/api/master-data/location';
+import { BaseApproval, BaseMetadata } from '@/types/api/api-general';
+
+export type BaseClosing = {
+  id: number;
+  location_id: number;
+  location_name: string;
+  project_category: 'GROWING' | 'LAYING';
+  period: number;
+  closing_date?: string;
+  shed_label: string;
+  shed_count: number;
+  sales_paid_amount: number;
+  sales_remaining_amount: number;
+  sales_payment_status: string;
+  project_status: 'Pengajuan' | 'Aktif' | 'Selesai';
+};
+
+export type Closing = BaseMetadata & BaseClosing;
+
+export type BaseClosingGeneralInformation = BaseClosing & {
+  flock_id: number;
+  period: number;
+  project_type: 'GROWING' | 'LAYING';
+  population: number;
+  active_house_count: number;
+  sales_payment_status: string;
+  project_status: 'Pengajuan' | 'Aktif' | 'Selesai';
+  closing_status: string;
+};
+
+export type ClosingGeneralInformation = BaseMetadata &
+  BaseClosingGeneralInformation;
+
+export type ClosingIncomingSapronak = {
+  id: number;
+  date: string;
+  reference_number: string;
+  transaction_type: string;
+  product_name: string;
+  product_category: string;
+  product_sub_category: string;
+  source_warehouse: string;
+  destination_warehouse: string;
+  quantity: number;
+  unit: string;
+  formatted_quantity: string;
+  notes: string;
+};
+
+export type ClosingOutgoingSapronak = ClosingIncomingSapronak;

src/types/api/expense.d.ts

@@ -18,7 +18,7 @@ export type BaseExpense = {
     id: number;
     path: string;
   }[];
-  expense_date: string;
+  transaction_date: string;
   realization_date?: string;
   grand_total: number;
   location: BaseLocation;
@@ -29,28 +29,23 @@ export type BaseExpense = {
     name: string;
     pengajuans?: {
       id: number;
+      expense_id: number;
+      kandang_id: number;
+      nonstock_id: number;
       qty: number;
-      unit_price: number;
-      total_price: number;
+      price: number;
       note?: string;
       nonstock: Pick<BaseNonstock, 'id' | 'name' | 'flags'>;
-      project_flock_kandang: {
-        id: number;
-        kandang_id: number;
-      };
+      created_at: string;
     }[];
     realisasi?: {
       id: number;
+      expense_nonstock_id: number;
       qty: number;
-      unit_price: number;
-      total_price: number;
-      date: string;
+      price: number;
       note?: string;
       nonstock: Pick<BaseNonstock, 'id' | 'name' | 'flags'>;
-      project_flock_kandang: {
-        id: number;
-        kandang_id: number;
-      };
+      created_at: string;
     }[];
   }[];
   total_pengajuan: number;
@@ -65,12 +60,12 @@ export type CreateExpensePayload = {
   transaction_date: string;
   supplier_id: number;
   documents: File[];
-  cost_per_kandangs: {
+  expense_nonstocks: {
     kandang_id: number;
     cost_items: {
       nonstock_id: number;
       quantity: number;
-      total_cost: number;
+      price: number;
       notes: string;
     }[];
   }[];
@@ -81,12 +76,12 @@ export type UpdateExpensePayload = {
   transaction_date: string;
   supplier_id: number;
   documents: File[];
-  cost_per_kandang: {
+  expense_nonstocks: {
     kandang_id: number;
     cost_items: {
       nonstock_id: number;
       quantity: number;
-      total_cost: number;
+      price: number;
       notes: string;
     }[];
   }[];
@@ -98,8 +93,7 @@ export type CreateExpenseRealizationPayload = {
   realizations: {
     expense_nonstock_id: number;
     qty: number;
-    unit_price: number;
-    total_price: number;
+    price: number;
     notes: string;
   }[];
 };