Tria/edr-platform
1
0
Fork 0
mirror of https://github.com/Tria-plc/edr-platform.git synced 2026-08-26 18:42:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
yaschalew
2026-06-24 16:18:35 +03:00
parent aa59d80937 fc4647e642
commit cefcaa7184
67 changed files with 4312 additions and 2744 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/types/src/freight/index.ts
View File

@@ -23,7 +23,7 @@ export const GOVERNMENT_PRIORITY_BONUS = 50_000;
export interface GovernmentBookingFields {
isGovernment: boolean;
governmentInstitution?: string | null;
governmentInstitution?: string | null;
}
export enum ExceededAction {
@@ -173,6 +173,8 @@ export enum TrainSetWagonStatus {
export enum WagonStatus {
Available = "AVAILABLE",
Assigned = "ASSIGNED",
ImportReady = "IMPORT_READY",
ExportReady = "EXPORT_READY",
Maintenance = "MAINTENANCE",
Retired = "RETIRED",
}
@@ -505,7 +507,7 @@ export interface IInvoice extends BaseEntity {
dueAt: string;
}
// ── Reference Data (booking form catalog) ──────────────────────────────────────
// ── Reference Data (booking form catalog) ──────────────────────────────────────
export interface BookingReferenceYard {
id: string;