train gate pass, Telebirr and Wafi

2026-08-29 18:48:11 +00:00 · 2026-07-01 16:23:52 +03:00
parent 38db9a4177
commit 14a00af341
41 changed files with 2807 additions and 151 deletions
--- a/apps/edr-freight-web/backoffice/src/components/warehouses/FeePreviewModal.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/warehouses/FeePreviewModal.tsx
@@ -72,6 +72,13 @@ function FeeCard({ fee }: { fee: FeePreview }) {
          <Row label="Chargeable days" value={`${fee.chargeableDays} (after ${fee.freeDays} free)`} />
          <Row label="Containers" value={String(fee.containerCount ?? 1)} />
          <Row label="Billable units" value={`${fee.billableUnits ?? fee.chargeableDays} container-day(s)`} />
+          {(fee.tiers ?? []).map((tier) => (
+            <Row
+              key={`${tier.appliedFromDay}-${tier.appliedToDay}-${tier.ratePerDay}`}
+              label={`Days ${tier.appliedFromDay}-${tier.appliedToDay}`}
+              value={`${tier.days} x ${money(tier.ratePerDay, fee.currency)} = ${money(tier.amount, fee.currency)}`}
+            />
+          ))}
        </Stack>
      )}
    </Card>
--- a/apps/edr-freight-web/backoffice/src/components/warehouses/ReceiveInventoryModal.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/warehouses/ReceiveInventoryModal.tsx
@@ -142,6 +142,7 @@ interface TruckEntranceFormState {
  packagingType: string;
  unitCount: number | '';
  grossWeightKg: number | '';
+  weighingRequired: boolean | null;
  netWeightKg: number | '';
  volumeDimensions: string;
  conditionAtReceipt: string;
@@ -163,11 +164,17 @@ interface LockedTruckEntranceFields {
  tin?: boolean;
  edrDigitalBookingId?: boolean;
  customerPhone?: boolean;
+  truckPlateNumber?: boolean;
+  trailerPlateNumber?: boolean;
  assignedEquipmentNumber?: boolean;
  itemDescription?: boolean;
  packagingType?: boolean;
  unitCount?: boolean;
  grossWeightKg?: boolean;
+  driverName?: boolean;
+  driverPhone?: boolean;
+  driverLicenseNumber?: boolean;
+  truckType?: boolean;
 }

 type PackagingFreightType = 'CONTAINER' | 'BULK' | 'MIXED';
@@ -190,6 +197,7 @@ const emptyTruckEntrance = (): TruckEntranceFormState => ({
  packagingType: '',
  unitCount: '',
  grossWeightKg: '',
+  weighingRequired: null,
  netWeightKg: '',
  volumeDimensions: '',
  conditionAtReceipt: '',
@@ -206,13 +214,24 @@ const emptyTruckEntrance = (): TruckEntranceFormState => ({
 });

 const toTruckEntrancePayload = (form: TruckEntranceFormState): TruckEntrancePayload => ({
+  ownerName: form.ownerName.trim() || undefined,
+  consigneeDetails: form.consigneeDetails.trim() || undefined,
+  edrDigitalBookingId: form.edrDigitalBookingId.trim() || undefined,
+  tin: form.tin.trim() || undefined,
+  customerPhone: form.customerPhone.trim() || undefined,
  truckPlateNumber: form.truckPlateNumber.trim(),
  trailerPlateNumber: form.trailerPlateNumber.trim() || undefined,
+  assignedEquipmentNumber: form.assignedEquipmentNumber.trim() || undefined,
  customsSealNumber: form.customsSealNumber.trim() || undefined,
  declarationNumber: form.declarationNumber.trim() || undefined,
  incoterms: form.incoterms.trim() || undefined,
  hsCodes: form.hsCodes.trim() || undefined,
  itemCode: form.itemCode.trim() || undefined,
+  itemDescription: form.itemDescription.trim() || undefined,
+  packagingType: form.packagingType.trim() || undefined,
+  unitCount: form.unitCount === '' ? undefined : Number(form.unitCount),
+  weighingRequired: form.weighingRequired ?? undefined,
+  grossWeightKg: form.weighingRequired && form.grossWeightKg !== '' ? Number(form.grossWeightKg) : undefined,
  netWeightKg: form.netWeightKg === '' ? undefined : Number(form.netWeightKg),
  volumeDimensions: form.volumeDimensions.trim() || undefined,
  conditionAtReceipt: form.conditionAtReceipt.trim() || undefined,
@@ -222,8 +241,11 @@ const toTruckEntrancePayload = (form: TruckEntranceFormState): TruckEntrancePayl
  driverPhone: form.driverPhone.trim(),
  driverLicenseNumber: form.driverLicenseNumber.trim() || undefined,
  truckType: form.truckType.trim() || undefined,
-  entranceTareWeightKg: Number(form.entranceTareWeightKg),
-  exitTareWeightKg: form.exitTareWeightKg === '' ? undefined : Number(form.exitTareWeightKg),
+  entranceTareWeightKg:
+    form.entranceTareWeightKg === ''
+      ? undefined
+      : Number(form.entranceTareWeightKg),
+  exitTareWeightKg: form.weighingRequired && form.exitTareWeightKg !== '' ? Number(form.exitTareWeightKg) : undefined,
  driverSignatoryName: form.driverSignatoryName.trim() || undefined,
  warehouseManagerName: form.warehouseManagerName.trim() || undefined,
 });
@@ -242,22 +264,31 @@ const truckEntranceFromBookings = (bookings: EligibleBooking[]): {
  const tin = commonNonEmptyValue(bookings.map((booking) => booking.customerTin));
  const customerPhone = commonNonEmptyValue(bookings.map((booking) => booking.customerPhone));
  const consigneeDetails = commonNonEmptyValue(bookings.map((booking) => booking.customer));
-  const assignedEquipmentNumber = commonNonEmptyValue(bookings.map((booking) => booking.containerNumber));
+  const assignedEquipmentNumber = commonNonEmptyValue(
+    bookings.map((booking) => booking.customerTruckContainerNumber || booking.containerNumber),
+  );
  const itemDescription = commonNonEmptyValue(bookings.map((booking) => booking.cargoDescription ?? booking.cargo));
  const packagingType = commonNonEmptyValue(bookings.map((booking) => booking.containerPackagingType));
+  const truckPlateNumber = commonNonEmptyValue(
+    bookings.map((booking) => booking.firstMileTruckPlateNumber || booking.customerTruckPlateNumber),
+  );
+  const trailerPlateNumber = commonNonEmptyValue(bookings.map((booking) => booking.firstMileTrailerPlateNumber));
+  const driverName = commonNonEmptyValue(
+    bookings.map((booking) => booking.firstMileDriverName || booking.customerTruckDriverName),
+  );
+  const driverPhone = commonNonEmptyValue(bookings.map((booking) => booking.firstMileDriverPhone));
+  const driverLicenseNumber = commonNonEmptyValue(bookings.map((booking) => booking.firstMileDriverLicenseNumber));
+  const truckType = commonNonEmptyValue(
+    bookings.map((booking) => booking.firstMileTruckType || booking.customerTruckType),
+  );
  const edrDigitalBookingId =
    bookings.length === 1
      ? bookings[0]?.reference ?? bookings[0]?.id ?? ''
      : commonNonEmptyValue(bookings.map((booking) => booking.reference));
-  const firstMileBooking = bookings.length === 1 ? bookings[0] : null;
  const unitCount =
    bookings.length === 1 && bookings[0]?.containerQuantity != null
      ? Number(bookings[0].containerQuantity)
      : '';
-  const grossWeightKg =
-    bookings.length === 1 && bookings[0]?.weight != null
-      ? Number(bookings[0].weight)
-      : '';
  const freightTypes = [...new Set(bookings.map((booking) => booking.freightType).filter(Boolean))];
  const packagingFreightType =
    freightTypes.length === 1 && freightTypes[0] === 'CONTAINER'
@@ -278,13 +309,13 @@ const truckEntranceFromBookings = (bookings: EligibleBooking[]): {
      itemDescription,
      packagingType,
      unitCount,
-      grossWeightKg,
-      truckPlateNumber: firstMileBooking?.firstMileTruckPlateNumber ?? '',
-      trailerPlateNumber: firstMileBooking?.firstMileTrailerPlateNumber ?? '',
-      driverName: firstMileBooking?.firstMileDriverName ?? '',
-      driverPhone: firstMileBooking?.firstMileDriverPhone ?? '',
-      driverLicenseNumber: firstMileBooking?.firstMileDriverLicenseNumber ?? '',
-      truckType: firstMileBooking?.firstMileTruckType ?? '',
+      grossWeightKg: '',
+      truckPlateNumber,
+      trailerPlateNumber,
+      driverName,
+      driverPhone,
+      driverLicenseNumber,
+      truckType,
    },
    lockedFields: {
      ownerName: Boolean(ownerName),
@@ -296,7 +327,13 @@ const truckEntranceFromBookings = (bookings: EligibleBooking[]): {
      itemDescription: Boolean(itemDescription),
      packagingType: Boolean(packagingType),
      unitCount: unitCount !== '',
-      grossWeightKg: grossWeightKg !== '',
+      grossWeightKg: false,
+      truckPlateNumber: Boolean(truckPlateNumber),
+      trailerPlateNumber: Boolean(trailerPlateNumber),
+      driverName: Boolean(driverName),
+      driverPhone: Boolean(driverPhone),
+      driverLicenseNumber: Boolean(driverLicenseNumber),
+      truckType: Boolean(truckType),
    },
    packagingFreightType,
  };
@@ -338,11 +375,13 @@ function TruckEntranceFields({
  onChange,
  lockedFields,
  packagingFreightType = 'MIXED',
+  allowTruckWeighing = true,
 }: {
  value: TruckEntranceFormState;
  onChange: (next: TruckEntranceFormState) => void;
  lockedFields?: LockedTruckEntranceFields;
  packagingFreightType?: PackagingFreightType;
+  allowTruckWeighing?: boolean;
 }) {
  const packagingOptions = packagingOptionsFor(packagingFreightType);
  const quantityLabel =
@@ -396,11 +435,13 @@ function TruckEntranceFields({
          label="Truck plate number"
          required
          value={value.truckPlateNumber}
+          readOnly={lockedFields?.truckPlateNumber}
          onChange={(e) => onChange({ ...value, truckPlateNumber: e.currentTarget.value })}
        />
        <TextInput
          label="Trailer plate number"
          value={value.trailerPlateNumber}
+          readOnly={lockedFields?.trailerPlateNumber}
          onChange={(e) => onChange({ ...value, trailerPlateNumber: e.currentTarget.value })}
        />
      </Group>
@@ -422,12 +463,14 @@ function TruckEntranceFields({
          label="Driver name"
          required
          value={value.driverName}
+          readOnly={lockedFields?.driverName}
          onChange={(e) => onChange({ ...value, driverName: e.currentTarget.value })}
        />
        <TextInput
          label="Driver phone"
          required
          value={value.driverPhone}
+          readOnly={lockedFields?.driverPhone}
          onChange={(e) => onChange({ ...value, driverPhone: e.currentTarget.value })}
        />
      </Group>
@@ -435,29 +478,61 @@ function TruckEntranceFields({
        <TextInput
          label="Driver license number"
          value={value.driverLicenseNumber}
+          readOnly={lockedFields?.driverLicenseNumber}
          onChange={(e) => onChange({ ...value, driverLicenseNumber: e.currentTarget.value })}
        />
        <TextInput
          label="Truck type"
          value={value.truckType}
+          readOnly={lockedFields?.truckType}
          onChange={(e) => onChange({ ...value, truckType: e.currentTarget.value })}
        />
      </Group>
-      <Group grow>
-        <NumberInput
-          label="Entrance tare weight (kg)"
-          required
-          min={0}
-          value={value.entranceTareWeightKg}
-          onChange={(v) => onChange({ ...value, entranceTareWeightKg: v === '' ? '' : Number(v) })}
-        />
-        <NumberInput
-          label="Exit tare weight (kg)"
-          min={0}
-          value={value.exitTareWeightKg}
-          onChange={(v) => onChange({ ...value, exitTareWeightKg: v === '' ? '' : Number(v) })}
-        />
-      </Group>
+      {allowTruckWeighing ? (
+        <>
+          <Select
+            label="Weighing"
+            required
+            data={[
+              { value: 'YES', label: 'Yes' },
+              { value: 'NO', label: 'No' },
+            ]}
+            value={value.weighingRequired == null ? null : value.weighingRequired ? 'YES' : 'NO'}
+            onChange={(next) =>
+              onChange({
+                ...value,
+                weighingRequired: next === 'YES' ? true : next === 'NO' ? false : null,
+                grossWeightKg: next === 'YES' ? value.grossWeightKg : '',
+                exitTareWeightKg: next === 'YES' ? value.exitTareWeightKg : '',
+              })
+            }
+          />
+          {value.weighingRequired && (
+            <Group grow>
+              <NumberInput
+                label="Gross weight (kg)"
+                required
+                min={0}
+                value={value.grossWeightKg}
+                onChange={(v) => onChange({ ...value, grossWeightKg: v === '' ? '' : Number(v) })}
+              />
+              <NumberInput
+                label="Exit tare weight (kg)"
+                required
+                min={0}
+                value={value.exitTareWeightKg}
+                onChange={(v) => onChange({ ...value, exitTareWeightKg: v === '' ? '' : Number(v) })}
+              />
+            </Group>
+          )}
+        </>
+      ) : (
+        <Alert icon={<Info size={16} />} color="green" variant="light">
+          <Text size="sm">
+            Truck weighing is not required for a received first-mile arrival. The GRN uses the booking weight.
+          </Text>
+        </Alert>
+      )}

      <Text size="sm" fw={600} mt="xs">Customs and compliance</Text>
      <Group grow>
@@ -510,21 +585,12 @@ function TruckEntranceFields({
          onChange={(v) => onChange({ ...value, unitCount: v === '' ? '' : Number(v) })}
        />
      </Group>
-      <Group grow>
-        <NumberInput
-          label="Gross weight (kg)"
-          min={0}
-          value={value.grossWeightKg}
-          readOnly={lockedFields?.grossWeightKg}
-          onChange={(v) => onChange({ ...value, grossWeightKg: v === '' ? '' : Number(v) })}
-        />
-        <NumberInput
-          label="Net weight (kg)"
-          min={0}
-          value={value.netWeightKg}
-          onChange={(v) => onChange({ ...value, netWeightKg: v === '' ? '' : Number(v) })}
-        />
-      </Group>
+      <NumberInput
+        label="Net weight (kg)"
+        min={0}
+        value={value.netWeightKg}
+        onChange={(v) => onChange({ ...value, netWeightKg: v === '' ? '' : Number(v) })}
+      />
      <TextInput
        label="Volume / dimensions"
        value={value.volumeDimensions}
@@ -766,6 +832,8 @@ function EligibleTab({
    [pendingReceiveIds, rows],
  );
  const pendingHasFirstMile = pendingReceiveRows.some((row) => row.hasFirstMile);
+  const pendingUsesFirstMile =
+    pendingReceiveRows.length > 0 && pendingReceiveRows.every((row) => row.hasFirstMile);

  const toggleAll = () =>
    setSelected(allSelected ? new Set() : new Set(selectableRows.map((r) => r.id)));
@@ -822,32 +890,65 @@ function EligibleTab({
      void receiveBookings(filteredIds);
      return;
    }
+    const hasFirstMileRows = selectedRows.some((row) => row.hasFirstMile);
+    const hasCustomerTruckRows = selectedRows.some((row) => !row.hasFirstMile);
+    if (hasFirstMileRows && hasCustomerTruckRows) {
+      toast({
+        variant: 'destructive',
+        title: 'Receive separately',
+        description: 'First-mile arrivals and customer-truck arrivals use different truck evidence. Select one group at a time.',
+      });
+      return;
+    }
    const { form, lockedFields, packagingFreightType: nextPackagingFreightType } = truckEntranceFromBookings(selectedRows);
    const totalContainerQuantity = selectedRows.reduce(
      (sum, row) => sum + Number(row.containerQuantity ?? 0),
      0,
    );
+    const usesFirstMile = selectedRows.length > 0 && selectedRows.every((row) => row.hasFirstMile);
+    const usesCustomerAssignedTruck =
+      selectedRows.length > 0 &&
+      selectedRows.every((row) => !row.hasFirstMile && Boolean(row.customerTruckAssignedAt));
    const normalizedForm =
      nextPackagingFreightType === 'CONTAINER' && totalContainerQuantity > 0
        ? {
            ...form,
            unitCount: totalContainerQuantity,
          }
-        : form;
+        : {
+            ...form,
+          };
    setPendingReceiveIds(filteredIds);
    setReceivedAt(new Date().toISOString());
    setTruckForm(normalizedForm);
    setLockedTruckFields({
      ...lockedFields,
      unitCount: nextPackagingFreightType === 'CONTAINER' && totalContainerQuantity > 0,
+      assignedEquipmentNumber: usesCustomerAssignedTruck
+        ? lockedFields.assignedEquipmentNumber
+        : lockedFields.assignedEquipmentNumber,
+      truckPlateNumber: (usesFirstMile || usesCustomerAssignedTruck) && lockedFields.truckPlateNumber,
+      trailerPlateNumber: usesFirstMile && lockedFields.trailerPlateNumber,
+      driverName: (usesFirstMile || usesCustomerAssignedTruck) && lockedFields.driverName,
+      driverPhone: usesFirstMile && lockedFields.driverPhone,
+      driverLicenseNumber: usesFirstMile && lockedFields.driverLicenseNumber,
+      truckType: (usesFirstMile || usesCustomerAssignedTruck) && lockedFields.truckType,
    });
    setPackagingFreightType(nextPackagingFreightType);
    setTruckOpen(true);
  };

  const receive = async () => {
-    if (!truckForm.truckPlateNumber.trim() || !truckForm.driverName.trim() || !truckForm.driverPhone.trim() || truckForm.entranceTareWeightKg === '') {
-      toast({ variant: 'destructive', title: 'Truck, driver and entrance tare weight are required' });
+    if (!truckForm.truckPlateNumber.trim() || !truckForm.driverName.trim() || !truckForm.driverPhone.trim()) {
+      toast({ variant: 'destructive', title: 'Truck and driver information are required' });
+      return;
+    }
+    if (!pendingUsesFirstMile && truckForm.weighingRequired == null) {
+      toast({ variant: 'destructive', title: 'Select whether customer truck weighing is required' });
+      return;
+    }
+    if (truckForm.weighingRequired && (truckForm.grossWeightKg === '' || truckForm.exitTareWeightKg === '')) {
+      toast({ variant: 'destructive', title: 'Gross weight and exit tare weight are required when weighing is Yes' });
      return;
    }
    await receiveBookings(pendingReceiveIds, toTruckEntrancePayload(truckForm));
@@ -1053,8 +1154,8 @@ function EligibleTab({
        <Stack gap="md">
          <Alert icon={<Truck size={16} />} color={pendingHasFirstMile ? 'green' : 'blue'} variant="light">
            <Text size="sm">
-              {pendingHasFirstMile
-                ? 'Assigned first-mile truck and driver details are prefilled. Confirm or update the actual arrival details before GRN.'
+              {pendingUsesFirstMile
+                ? 'Received first-mile truck and driver details are pulled from the first-mile record. GRN uses booking cargo, quantity and weight.'
                : 'Register the customer or third-party truck and driver before export receiving and GRN.'}
            </Text>
          </Alert>
@@ -1109,6 +1210,7 @@ function EligibleTab({
            onChange={setTruckForm}
            lockedFields={lockedTruckFields}
            packagingFreightType={packagingFreightType}
+            allowTruckWeighing={!pendingUsesFirstMile}
          />
          <Group justify="flex-end">
            <Button variant="default" onClick={() => setTruckOpen(false)} disabled={bulkReceive.isPending}>
@@ -1934,6 +2036,11 @@ function ImportUnloadedQueueTab({ enabled }: { enabled: boolean }) {
            reference: row.bookingReference ?? row.bookingId,
            tradeDirection: 'IMPORT',
            lastMileDeliveryAddress: row.lastMileRequested ? row.pickupOption : null,
+            customerTruckPlateNumber: row.customerTruckPlateNumber,
+            customerTruckDriverName: row.customerTruckDriverName,
+            customerTruckType: row.customerTruckType,
+            customerTruckContainerNumber: row.customerTruckContainerNumber,
+            customerTruckAssignedAt: row.customerTruckAssignedAt,
          }
        : null,
    }) as unknown as WarehouseInventoryItem;
--- a/apps/edr-freight-web/backoffice/src/components/warehouses/ReleaseOrderModal.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/warehouses/ReleaseOrderModal.tsx
@@ -82,6 +82,9 @@ const splitContainerNumbers = (value: string | null | undefined) =>
 const getItemContainerNumber = (item: WarehouseInventoryItem | null) =>
  (item as (WarehouseInventoryItem & { containerNumber?: string | null }) | null)?.containerNumber ?? '';

+const assignedTruckValue = (item: WarehouseInventoryItem | null, key: keyof NonNullable<WarehouseInventoryItem['booking']>) =>
+  item?.booking?.[key] == null ? '' : String(item.booking[key]);
+
 const isContainerInventory = (item: WarehouseInventoryItem | null, containerCount: number) => {
  const freightType = (item as (WarehouseInventoryItem & { booking?: { freightType?: string | null } | null }) | null)
    ?.booking?.freightType;
@@ -138,14 +141,18 @@ export function ReleaseOrderModal({ opened, onClose, item }: ReleaseOrderModalPr
  useEffect(() => {
    if (opened) {
      const inspection = parseInspectionNote(item?.notes);
+      const assignedTruckPlate = assignedTruckValue(item, 'customerTruckPlateNumber');
+      const assignedDriverName = assignedTruckValue(item, 'customerTruckDriverName');
+      const assignedTruckType = assignedTruckValue(item, 'customerTruckType');
+      const assignedContainerNumber = assignedTruckValue(item, 'customerTruckContainerNumber');
      setReference(item?.releaseOrderReference ?? generateReleaseReference(item));
-      setTruckPlateNumber(inspection.truckPlateNumber);
+      setTruckPlateNumber(inspection.truckPlateNumber || assignedTruckPlate);
      setTrailerPlateNumber(inspection.trailerPlateNumber);
-      setDriverName(inspection.driverName);
+      setDriverName(inspection.driverName || assignedDriverName);
      setDriverLicense(inspection.driverLicense);
      setDriverPhone(inspection.driverPhone);
-      setTruckType(inspection.truckType);
-      setContainerNumbers(initialContainerNumbers(item, inspection.containerNumber));
+      setTruckType(inspection.truckType || assignedTruckType);
+      setContainerNumbers(initialContainerNumbers(item, inspection.containerNumber || assignedContainerNumber));
      setGateInTime(inspection.gateInTime);
      setTareWeight(inspection.tareWeight);
      setGrossWeight(inspection.grossWeight);
@@ -157,6 +164,8 @@ export function ReleaseOrderModal({ opened, onClose, item }: ReleaseOrderModalPr
  const savedInspection = parseInspectionNote(item?.notes);
  const isExitStep = savedInspection.tareWeight !== '';
  const isEntranceLocked = isExitStep;
+  const isCustomerAssignedTruck = Boolean(item?.booking?.customerTruckAssignedAt);
+  const isTruckIdentityLocked = isEntranceLocked || isCustomerAssignedTruck;
  const systemNetWeight = item?.weight == null ? netWeight : Number(item.weight);
  const computedNetWeight =
    tareWeight !== '' && grossWeight !== '' ? Number((Number(grossWeight) - Number(tareWeight)).toFixed(3)) : null;
@@ -269,7 +278,7 @@ export function ReleaseOrderModal({ opened, onClose, item }: ReleaseOrderModalPr
          searchable
          clearable
          data={REGISTERED_FIRST_LAST_MILE_TRUCKS}
-          disabled={isEntranceLocked}
+          disabled={isTruckIdentityLocked}
          value={REGISTERED_FIRST_LAST_MILE_TRUCKS.some((truck) => truck.value === truckPlateNumber) ? truckPlateNumber : null}
          onChange={(value) => {
            const truck = REGISTERED_FIRST_LAST_MILE_TRUCKS.find((row) => row.value === value);
@@ -283,7 +292,7 @@ export function ReleaseOrderModal({ opened, onClose, item }: ReleaseOrderModalPr
            required
            value={truckPlateNumber}
            onChange={(e) => setTruckPlateNumber(e.currentTarget.value)}
-            readOnly={isEntranceLocked}
+            readOnly={isTruckIdentityLocked}
          />
          <TextInput
            label="Trailer plate number"
@@ -293,12 +302,12 @@ export function ReleaseOrderModal({ opened, onClose, item }: ReleaseOrderModalPr
          />
        </Group>
        <Group grow>
-          <TextInput label="Driver name" required value={driverName} onChange={(e) => setDriverName(e.currentTarget.value)} readOnly={isEntranceLocked} />
+          <TextInput label="Driver name" required value={driverName} onChange={(e) => setDriverName(e.currentTarget.value)} readOnly={isTruckIdentityLocked} />
          <TextInput label="Driver license" value={driverLicense} onChange={(e) => setDriverLicense(e.currentTarget.value)} readOnly={isEntranceLocked} />
        </Group>
        <Group grow>
          <TextInput label="Driver phone" value={driverPhone} onChange={(e) => setDriverPhone(e.currentTarget.value)} readOnly={isEntranceLocked} />
-          <TextInput label="Truck type" value={truckType} onChange={(e) => setTruckType(e.currentTarget.value)} readOnly={isEntranceLocked} />
+          <TextInput label="Truck type" value={truckType} onChange={(e) => setTruckType(e.currentTarget.value)} readOnly={isTruckIdentityLocked} />
        </Group>
        <Group grow>
          <Stack gap={6}>
@@ -313,7 +322,7 @@ export function ReleaseOrderModal({ opened, onClose, item }: ReleaseOrderModalPr
                      numbers.map((number, numberIndex) => (numberIndex === index ? e.currentTarget.value : number)),
                    )
                  }
-                  readOnly={isEntranceLocked}
+                  readOnly={isTruckIdentityLocked}
                />
              ))}
            </SimpleGrid>