fix(FE-33): fix conflict git

src/types/api/api-general.d.ts

@@ -53,3 +53,16 @@ export type BaseMetadata = {
 
 export type Override<BaseType, Overrides> = Omit<BaseType, keyof Overrides> &
   Overrides;
+
+export type flags =
+  | 'PAKAN'
+  | 'OBAT'
+  | 'VITAMIN'
+  | 'KIMIA'
+  | 'EKSPEDISI'
+  | 'IS_ACTIVE'
+  | 'DOC'
+  | 'PRE-STARTER'
+  | 'STARTER'
+  | 'FINISHER'
+  | 'OVK';

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

@@ -0,0 +1,20 @@
+import { BaseMetadata } from '@/types/api/api-general';
+
+export type BaseBank = {
+  id: number;
+  name: string;
+  alias: string;
+  owner?: string;
+  account_number: string;
+};
+
+export type Bank = BaseMetadata & BaseBank;
+
+export type CreateBankPayload = {
+  name: string;
+  alias: string;
+  account_number: string;
+  owner?: string;
+};
+
+export type UpdateBankPayload = CreateBankPayload;

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

@@ -0,0 +1,30 @@
+import { BaseMetadata } from '@/types/api/api-general';
+
+export type BaseFcr = {
+  id: number;
+  name: string;
+};
+
+export type FcrStandard = {
+  id: number;
+  weight: number;
+  fcr_number: number;
+  mortality: number;
+};
+
+export type Fcr = BaseMetadata & BaseFcr;
+
+export type FcrWithStandards = Fcr & {
+  fcr_standards: FcrStandard[];
+};
+
+export type CreateFcrPayload = {
+  name: string;
+  fcr_standards: {
+    weight: number;
+    fcr_number: number;
+    mortality: number;
+  }[];
+};
+
+export type UpdateFcrPayload = CreateFcrPayload;

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

@@ -1,18 +1,23 @@
-import { BaseApiResponse } from '@/types/api/api-general';
+import { BaseApiResponse, BaseMetadata, flags } from '@/types/api/api-general';
+import { BaseUom } from '@/types/api/master-data/uom';
+import { BaseSupplier } from '@/types/api/master-data/supplier';
 
-export type Nonstock = {
+export type BaseNonstock = {
   id: number;
   name: string;
+  uom_id: number;
+  uom: BaseUom;
+  suppliers: BaseSupplier[];
+  flags: flags[];
 };
 
+export type Nonstock = BaseMetadata & BaseNonstock;
+
 export type CreateNonstockPayload = {
   name: string;
+  uom_id: number;
+  supplier_ids: number[];
+  flags: flags[];
 };
 
 export type UpdateNonstockPayload = CreateNonstockPayload;
-
-export type NonstockResponse = BaseApiResponse<Nonstock>;
-
-export type NonstocksResponse = BaseApiResponse<Nonstock[]>;
-
-export type DeleteNonstockResponse = BaseApiResponse;

src/types/api/master-data/product-category.d.ts

@@ -0,0 +1,16 @@
+import { BaseMetadata } from '@/types/api/api-general';
+
+export type BaseProductCategory = {
+  id: number;
+  code: string;
+  name: string;
+};
+
+export type ProductCategory = BaseMetadata & BaseProductCategory;
+
+export type CreateProductCategoryPayload = {
+  code: string;
+  name: string;
+};
+
+export type UpdateProductCategoryPayload = CreateProductCategoryPayload;

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

@@ -0,0 +1,37 @@
+import { BaseMetadata } from '@/types/api/api-general';
+import { Uom } from '@/types/api/master-data/uom';
+import { ProductCategory } from '@/types/api/master-data/product-category';
+import { Supplier } from '@/types/api/master-data/supplier';
+
+export type BaseProduct = {
+  id: number;
+  name: string;
+  brand: string;
+  sku: string;
+  product_price: number;
+  selling_price?: number;
+  tax?: number;
+  expiry_period: number;
+  uom: Uom;
+  product_category: ProductCategory;
+  suppliers: Supplier[];
+  flags: string[];
+};
+
+export type Product = BaseMetadata & BaseProduct;
+
+export type CreateProductPayload = {
+  name: string;
+  brand: string;
+  sku: string;
+  uom_id: number;
+  product_category_id: number;
+  product_price: number;
+  selling_price: number;
+  tax: number;
+  expiry_period: number;
+  supplier_ids: number[];
+  flags: string[];
+};
+
+export type UpdateProductPayload = CreateProductPayload;

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

@@ -1,21 +1,4 @@
-// {
-//   // "name": "PT CHAROEN POKPHAND INDONESIA Tbk",
-//   "name": "BOP Vendor",
-//   // "alias": "CPI",
-//   "alias": "BOP",
-//   "pic": "Super Admin",
-//   "type": "BISNIS", // "BISNIS" | "INDIVIDUAL"
-//   // "category": "SAPRONAK", // "BOP" | "SAPRONAK"
-//   "category": "BOP", // "BOP" | "SAPRONAK"
-//   "hatchery": "Kopo,Tasik", // Comma Separated // nullable
-//   "phone": "086172527361",
-//   "email": "abdulazis@gmail.com",
-//   "address": "Banten",
-//   "npwp": "0197239080712", // nullable
-//   "account_number": "192039801283", // nullable
-//   "due_date": 1 // day
-// }
-import { BaseMetadata, CreatedUser } from "@/types/api/api-general";
+import { BaseMetadata } from '@/types/api/api-general';
 
 export type BaseSupplier = {
     id: number;
@@ -31,6 +14,7 @@ export type BaseSupplier = {
     npwp: string;
     account_number: string;
     due_date: number;
+    balance?: number;
 }
 
 export type Supplier = BaseMetadata & BaseSupplier;
@@ -48,6 +32,7 @@ export type CreateSupplierPayload = {
     npwp: string;
     account_number: string;
     due_date: number;
+    balance?: number;
 }
 
 export type UpdateSupplierPayload = CreateSupplierPayload;