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

resolve merge conflict

Browse Source
This commit is contained in:
Marshal
2026-07-09 03:46:31 +00:00
parent 305d35b2de
commit 14a5861ba3
2 changed files with 0 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/edr-freight-web/portal/src/pages/contracts/NewShipmentPage.tsx
View File

@@ -1151,14 +1151,9 @@ function ContainerLineEditor({
render={({ field, fieldState }) => ( render={({ field, fieldState }) => (
<TextInput <TextInput
{...field} {...field}
<<<<<<< HEAD
onChange={(e) => onChange={(e) =>
field.onChange(e.currentTarget.value.toUpperCase()) field.onChange(e.currentTarget.value.toUpperCase())
} }
=======
onChange={(e) => field.onChange(e.currentTarget.value.toUpperCase())}
maxLength={11}
>>>>>>> 1b9ac42ed3fc9bd6b8dea8d08b5c4c066d083feb
label={u === 0 ? "Container number *" : undefined} label={u === 0 ? "Container number *" : undefined}
placeholder="e.g. MSCU1234567" placeholder="e.g. MSCU1234567"
error={fieldState.error?.message} error={fieldState.error?.message}

15
apps/edr-freight-web/portal/src/pages/contracts/new-shipment-form/schema.ts
View File

@@ -26,31 +26,16 @@ export interface ShipmentValidationContext {
requiresDate?: boolean; requiresDate?: boolean;
} }
<<<<<<< HEAD
// ISO 6346: 3-letter owner code + category id (U/J/Z) + 6-digit serial + check digit. // ISO 6346: 3-letter owner code + category id (U/J/Z) + 6-digit serial + check digit.
const ISO_CONTAINER_NUMBER_REGEX = /^[A-Z]{4}\d{7}$/; const ISO_CONTAINER_NUMBER_REGEX = /^[A-Z]{4}\d{7}$/;
=======
// ISO 6346: 4 letters (owner + category) + 6 serial digits + 1 check digit.
// Enforced at booking input so the number stays a clean reference in the warehouse.
const ISO_CONTAINER_RE = /^[A-Z]{4}\d{7}$/;
>>>>>>> 1b9ac42ed3fc9bd6b8dea8d08b5c4c066d083feb
const containerUnitSchema = z.object({ const containerUnitSchema = z.object({
containerNumber: z containerNumber: z
.string() .string()
<<<<<<< HEAD
.min(1, "Container number is required.") .min(1, "Container number is required.")
.refine( .refine(
(v) => ISO_CONTAINER_NUMBER_REGEX.test(v.trim().toUpperCase()), (v) => ISO_CONTAINER_NUMBER_REGEX.test(v.trim().toUpperCase()),
"Enter a valid ISO container number (e.g. ABCD1234567).", "Enter a valid ISO container number (e.g. ABCD1234567).",
=======
.transform((v) => v.trim().toUpperCase())
.pipe(
z
.string()
.min(1, "Container number is required.")
.regex(ISO_CONTAINER_RE, "Use ISO format: 4 letters + 7 digits, e.g. ABCU1234567."),
>>>>>>> 1b9ac42ed3fc9bd6b8dea8d08b5c4c066d083feb
), ),
sealNumber: z.string().default(""), sealNumber: z.string().default(""),
vgmTons: z vgmTons: z