fix(FE) resolve merge conflict

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

@@ -24,6 +24,36 @@ export type LogoutResponse = BaseApiResponse;
 
 export type GetMeResponse = BaseApiResponse<UserWithRoles>;
 
+export type Client = {
+  id: number;
+  name: stirng;
+  alias: string;
+  created_at: string;
+  updated_at: string;
+};
+
+export type Permission = {
+  id: number;
+  name: string;
+  action: string;
+  client: Omit<Client, 'created_at' | 'updated_at'>;
+  created_at: string;
+  updated_at: string;
+};
+
+export type Role = {
+  id: number;
+  key: string;
+  name: string;
+  client: Omit<Client, 'created_at' | 'updated_at'>;
+  created_at: string;
+  updated_at: string;
+};
+
+export type RoleWithPermissions = Omit<Role, 'created_at' | 'updated_at'> & {
+  permissions: Omit<Permission, 'created_at' | 'updated_at'>[];
+};
+
 export type User = {
   id: number;
   email: string;
@@ -66,3 +96,11 @@ export type flags =
   | 'STARTER'
   | 'FINISHER'
   | 'OVK';
+
+export type ApprovalsLine = {
+  action_by?: string;
+  date?: string;
+  notes?: string;
+  role?: string;
+  status: 'approved' | 'rejected' | 'waiting';
+}[];

src/types/api/inventory/movement.d.ts

@@ -0,0 +1,75 @@
+import { BaseMetadata } from '@/types/api/api-general';
+import { Supplier } from '@/types/api/master-data/supplier';
+
+type MovementWarehouse = {
+  id: number;
+  name: string;
+  location: {
+    id: number;
+    name: string;
+  } | null;
+  area: {
+    id: number;
+    name: string;
+  };
+};
+
+export type BaseMovement = {
+  id: number;
+  transfer_reason: string;
+  transfer_date: string;
+  source_warehouse: MovementWarehouse;
+  destination_warehouse: MovementWarehouse;
+  details: {
+    id: number;
+    product: {
+      id: number;
+      name: string;
+    };
+    quantity: number;
+    before_quantity: number;
+    after_quantity: number;
+  }[];
+  deliveries: {
+    id: number;
+    supplier: Supplier;
+    vehicle_plate: string;
+    driver_name: string;
+    document_number: string;
+    document_path: string;
+    shipping_cost_item: number;
+    shipping_cost_total: number;
+    items: {
+      id: number;
+      stock_transfer_detail_id: number;
+      quantity: number;
+    }[];
+  }[];
+};
+
+export type Movement = BaseMetadata & BaseMovement;
+
+export type CreateMovementPayload = {
+  transfer_reason: string;
+  transfer_date: string;
+  source_warehouse_id: number;
+  destination_warehouse_id: number;
+  products: {
+    product_id: number;
+    product_qty: number;
+  }[];
+  deliveries: {
+    delivery_cost: number;
+    delivery_cost_per_item: number;
+    document_index?: number;
+    driver_name: string;
+    vehicle_plate: string;
+    supplier_id: number;
+    products: {
+      product_id: number;
+      product_qty: number;
+    }[];
+  }[];
+};
+
+export type UpdateMovementPayload = CreateMovementPayload;

src/types/api/inventory/product-warehouse.d.ts

@@ -0,0 +1,22 @@
+import { BaseMetadata } from '@/types/api/api-general';
+import { Warehouse } from '@/types/api/master-data/warehouse';
+import { Product } from '@/types/api/master-data/product';
+
+export type BaseProductWarehouse = {
+  id: number;
+  product_id: number;
+  warehouse_id: number;
+  quantity: number;
+  product: Product;
+  warehouse: Warehouse;
+};
+
+export type ProductWarehouse = BaseMetadata & BaseProductWarehouse;
+
+export type CreateProductWarehousePayload = {
+  product_id: number;
+  warehouse_id: number;
+  quantity: number;
+};
+
+export type UpdateProductWarehousePayload = CreateProductWarehousePayload;