booking flow,summtion, approval, contract, mock payemnt and integration to back office, and also add permissions

apps/edr-freight-web/backoffice/src/App.tsx

@@ -8,6 +8,7 @@ import {
   Paperclip,
   Settings,
   SlidersHorizontal,
+  TrainTrack,
 } from "lucide-react";
 
 import { FreightDashboardLayout, type SidebarItem, type SidebarSection } from "@/components/layout";
@@ -34,6 +35,7 @@ import DropdownSettingsPage from "./pages/dropdown_settings/DropdownSettingsPage
 import FileUploadSettingsPage from "./pages/documents/FileUploadSettingsPage";
 import RuleEngineLegacyRedirect from "./pages/ruleEngine/RuleEngineLegacyRedirect";
 import RuleEngineResourcePage from "./pages/ruleEngine/RuleEngineResourcePage";
+<<<<<<< HEAD
 import {
   getCategorySidebarChildren,
   RULE_ENGINE_RESOURCES,
@@ -42,6 +44,97 @@ import {
 import type { RuleEngineResourceSlug } from "./types/rule-engine";
 
 const filterRuleEngineChildren = (
+=======
+import TrainsPage from "./pages/trains/TrainsPage";
+import { getCategorySidebarChildren } from "./pages/ruleEngine/config/resources";
+
+const buildSidebarSections = (demoItems: SidebarItem[]): SidebarSection[] => [
+  {
+    title: "Main menu",
+    mutedTitle: true,
+    items: [
+      {
+        label: "Overview",
+        href: "/dashboard/overview",
+        icon: <LayoutDashboard />,
+      },
+      {
+        label: "Booking requests",
+        href: "/dashboard/booking-requests",
+        icon: <FileText />,
+      },
+      {
+        label: "Train scheduling",
+        href: "/dashboard/operations/train-scheduling",
+        icon: <TrainTrack />,
+      },
+      ...demoItems,
+    ],
+  },
+  {
+    title: "Administration",
+    items: [
+      {
+        label: "User management",
+        href: "/dashboard/user-management",
+        icon: <Network />,
+        children: [
+          {
+            label: "Users",
+            href: "/dashboard/user-management/users",
+          },
+          {
+            label: "Employees",
+            href: "/dashboard/user-management/employees",
+          },
+          {
+            label: "Position Types",
+            href: "/dashboard/user-management/position-types",
+          },
+          {
+            label: "Permissions",
+            href: "/dashboard/user-management/permissions",
+          },
+          {
+            label: "Roles",
+            href: "/dashboard/user-management/roles",
+          },
+        ],
+      },
+      {
+        label: "File settings",
+        href: "/dashboard/file-settings",
+        icon: <Paperclip />,
+      },
+      {
+        label: "Dropdown settings",
+        href: "/dashboard/dropdown-settings",
+        icon: <Settings />,
+      },
+    ],
+  },
+  {
+    title: "Freight configuration",
+    mutedTitle: true,
+    items: [
+      {
+        label: "Configuration",
+        href: "/dashboard/configuration",
+        icon: <Boxes />,
+        children: getCategorySidebarChildren("configuration"),
+      },
+      {
+        label: "Rules",
+        href: "/dashboard/rules",
+        icon: <SlidersHorizontal />,
+        children: getCategorySidebarChildren("rules"),
+      },
+    ],
+  },
+];
+
+const hasPermission = (
+>>>>>>> bd6ad54eea229305a214d06081e0ffd27fe163b8
   user: ReturnType<typeof useAuth>["user"],
   category: RuleEngineNavCategory,
 ): SidebarItem[] =>
@@ -202,6 +295,7 @@ const App = () => {
       <Route path="/dashboard" element={<DashboardShell />}>
         <Route path="overview" element={<OverviewPage />} />
 
+<<<<<<< HEAD
         <Route
           path="booking-requests"
           element={
@@ -226,6 +320,15 @@ const App = () => {
             </PermissionRoute>
           }
         />
+=======
+          <Route path="booking-requests" element={<BookingRequestsPage />} />
+          <Route path="booking-requests/:id" element={<BookingRequestDetailPage />} />
+          <Route
+            path="booking-requests/:id/contract"
+            element={<BookingContractPage />}
+          />
+          <Route path="operations/train-scheduling" element={<TrainsPage />} />
+>>>>>>> bd6ad54eea229305a214d06081e0ffd27fe163b8
 
         <Route path="user-management" element={<UserManagementPage />} />
         <Route path="user-management/users" element={<UsersPage />} />

apps/edr-freight-web/backoffice/src/constants/QUERY_KEYS.ts

@@ -1,5 +1,6 @@
 import type { BookingListFilter } from "@/services/bookings.service";
 import type { RuleEngineListParams } from "@/services/ruleEngine/ruleEngine.service";
+import type { TrainScheduleFilters } from "@/types/trainScheduling";
 import type { RuleEngineResourceSlug } from "@/types/rule-engine";
 
 export const QUERY_KEYS = {
@@ -37,6 +38,16 @@ export const QUERY_KEYS = {
     byId: (id: string) => ["bookings", "detail", id] as const,
   },
 
+  TRAIN_SCHEDULING: {
+    ROOT: ["train-scheduling"] as const,
+    eligible: (filters?: TrainScheduleFilters) =>
+      ["train-scheduling", "eligible-bookings", filters ?? {}] as const,
+    locomotives: () => ["train-scheduling", "locomotives"] as const,
+    stations: () => ["train-scheduling", "stations"] as const,
+    schedules: () => ["train-scheduling", "schedules"] as const,
+    scheduleById: (id: string) => ["train-scheduling", "schedule", id] as const,
+  },
+
   RULE_ENGINE: {
     ROOT: ["rule-engine"] as const,
     list: (resource: RuleEngineResourceSlug | string, params?: RuleEngineListParams) =>

apps/edr-freight-web/backoffice/src/constants/URLS.ts

@@ -108,6 +108,19 @@ export const URL_CONSTANTS = {
     VERIFY: "/api/otp/verify",
   },
 
+  LOCOMOTIVES: {
+    BASE: "/locomotives",
+  },
+
+  TRAIN_SCHEDULING: {
+    ELIGIBLE_BOOKINGS: "/train-scheduling/container/eligible-bookings",
+    PREVIEW: "/train-scheduling/container/preview",
+    SCHEDULES: "/train-scheduling/container/schedules",
+    SCHEDULE_BY_ID: (id: string) => `/train-scheduling/container/schedules/${id}`,
+    CANCEL_SCHEDULE: (id: string) =>
+      `/train-scheduling/container/schedules/${id}/cancel`,
+  },
+
   RULE_ENGINE: {
     CARGO_TYPES: "/cargo-types",
     CARGO_TYPE_BY_ID: (id: string) => `/cargo-types/${id}`,

apps/edr-freight-web/backoffice/src/hooks/rule-engine/useRuleEngine.ts

@@ -76,7 +76,9 @@ export const useContainerTypeOptions = (
   enabled = true,
 ) =>
   useQuery({
-    queryKey: QUERY_KEYS.RULE_ENGINE.selectOptions("container-types", {
+    queryKey: QUERY_KEYS.RULE_ENGINE.selectOptions('container-types', {
+      page: 1,
+      pageSize: CONTAINER_TYPE_OPTIONS_PAGE_SIZE,
       includeNone,
     }),
     queryFn: () =>

apps/edr-freight-web/backoffice/src/pages/trains/TrainsPage.tsx

@@ -1,11 +1,760 @@
-import FeaturePlaceholder from "@/components/FeaturePlaceholder";
+import { useMemo, useState } from 'react';
+import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+import { isAxiosError } from 'axios';
+import toast from 'react-hot-toast';
+import { Calendar, RefreshCw, TrainTrack } from 'lucide-react';
+import {
+  Button,
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogHeader,
+  DialogTitle,
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from '@edr/ui-common';
+
+import Breadcrumbs from '@/components/ui/Breadcrumbs';
+import { QUERY_KEYS } from '@/constants/QUERY_KEYS';
+import { trainSchedulingService } from '@/services/trainScheduling.service';
+import type {
+  EligibleContainerBooking,
+  TrainScheduleFilters,
+  TrainSchedulePreviewResponse,
+  YardOption,
+} from '@/types/trainScheduling';
+
+const inputClassName =
+  'w-full rounded-xl border border-border bg-background px-3 py-2.5 text-sm text-foreground outline-none transition focus:border-emerald-500 focus:ring-2 focus:ring-emerald-100 dark:focus:ring-emerald-950';
+
+const formatDate = (value?: string | null) => {
+  if (!value) return '-';
+  const date = new Date(value);
+  if (Number.isNaN(date.getTime())) return '-';
+  return new Intl.DateTimeFormat('en', {
+    year: 'numeric',
+    month: 'short',
+    day: '2-digit',
+    hour: '2-digit',
+    minute: '2-digit',
+  }).format(date);
+};
+
+const formatDayInput = (value?: string | null) => {
+  if (!value) return '';
+  return value.slice(0, 10);
+};
+
+const parseError = (error: unknown, fallback: string) => {
+  if (isAxiosError(error)) {
+    const message = error.response?.data?.message;
+    if (Array.isArray(message)) return message.join(', ');
+    if (typeof message === 'string') return message;
+    const violations = error.response?.data?.violations;
+    if (Array.isArray(violations)) return violations.join(', ');
+  }
+  return fallback;
+};
+
+const deriveFromBooking = (
+  booking: EligibleContainerBooking | undefined,
+  stations: YardOption[],
+) => {
+  if (!booking) {
+    return { originStationId: '', destinationStationId: '', scheduleDate: '' };
+  }
+
+  const originStationId = stations.find((station) => station.name === booking.origin)?.id ?? '';
+  const destinationStationId =
+    stations.find((station) => station.name === booking.destination)?.id ?? '';
+
+  return {
+    originStationId,
+    destinationStationId,
+    scheduleDate: formatDayInput(booking.preferredDepartureDate),
+  };
+};
 
 const TrainsPage = () => {
+  const qc = useQueryClient();
+  const [filters, setFilters] = useState<TrainScheduleFilters>({});
+  const [selectedBookingIds, setSelectedBookingIds] = useState<string[]>([]);
+  const [preview, setPreview] = useState<TrainSchedulePreviewResponse | null>(null);
+  const [selectedLocomotiveId, setSelectedLocomotiveId] = useState('');
+  const [detailId, setDetailId] = useState<string | null>(null);
+  const [scheduleSearch, setScheduleSearch] = useState('');
+  const [scheduleStatusFilter, setScheduleStatusFilter] = useState('ALL');
+
+  const stationsQuery = useQuery({
+    queryKey: QUERY_KEYS.TRAIN_SCHEDULING.stations(),
+    queryFn: () => trainSchedulingService.getStations(),
+  });
+
+  const eligibleQuery = useQuery({
+    queryKey: QUERY_KEYS.TRAIN_SCHEDULING.eligible(filters),
+    queryFn: () => trainSchedulingService.getEligibleBookings(filters),
+  });
+
+  const locomotivesQuery = useQuery({
+    queryKey: QUERY_KEYS.TRAIN_SCHEDULING.locomotives(),
+    queryFn: () => trainSchedulingService.getAvailableLocomotives(),
+  });
+
+  const schedulesQuery = useQuery({
+    queryKey: QUERY_KEYS.TRAIN_SCHEDULING.schedules(),
+    queryFn: () => trainSchedulingService.listSchedules(),
+  });
+
+  const detailQuery = useQuery({
+    queryKey: QUERY_KEYS.TRAIN_SCHEDULING.scheduleById(detailId ?? ''),
+    queryFn: () => trainSchedulingService.getScheduleById(detailId!),
+    enabled: Boolean(detailId),
+  });
+
+  const eligibleItems = eligibleQuery.data?.items ?? [];
+  const filteredSchedules = useMemo(() => {
+    const query = scheduleSearch.trim().toLowerCase();
+
+    return (schedulesQuery.data ?? []).filter((schedule) => {
+      const matchesStatus =
+        scheduleStatusFilter === 'ALL' || schedule.status === scheduleStatusFilter;
+
+      if (!matchesStatus) {
+        return false;
+      }
+
+      if (!query) {
+        return true;
+      }
+
+      const haystack = [
+        schedule.id,
+        schedule.origin ?? '',
+        schedule.destination ?? '',
+        schedule.locomotive?.code ?? '',
+        schedule.status,
+      ]
+        .join(' ')
+        .toLowerCase();
+
+      return haystack.includes(query);
+    });
+  }, [scheduleSearch, scheduleStatusFilter, schedulesQuery.data]);
+  const selectedBookings = useMemo(
+    () => eligibleItems.filter((booking) => selectedBookingIds.includes(booking.id)),
+    [eligibleItems, selectedBookingIds],
+  );
+
+  const summary = useMemo(() => {
+    const totalWeightTons = selectedBookings.reduce((sum, booking) => sum + booking.weightTons, 0);
+    const wagonsNeeded = Math.ceil(totalWeightTons / 70);
+    const totalLengthMeters = wagonsNeeded * 14;
+    const routeSet = new Set(selectedBookings.map((booking) => `${booking.origin} -> ${booking.destination}`));
+    const dateSet = new Set(selectedBookings.map((booking) => formatDayInput(booking.preferredDepartureDate)));
+
+    return {
+      count: selectedBookings.length,
+      totalWeightTons,
+      wagonsNeeded: Number.isFinite(wagonsNeeded) ? wagonsNeeded : 0,
+      totalLengthMeters: Number.isFinite(totalLengthMeters) ? totalLengthMeters : 0,
+      route: routeSet.size === 1 ? [...routeSet][0] : selectedBookings.length ? 'Mixed route' : '-',
+      scheduleDate: dateSet.size === 1 ? [...dateSet][0] : selectedBookings.length ? 'Mixed date' : '-',
+    };
+  }, [selectedBookings]);
+
+  const previewMutation = useMutation({
+    mutationFn: () => {
+      if (!filters.originStationId || !filters.destinationStationId || !filters.scheduleDate) {
+        throw new Error('Please select origin, destination, and schedule date');
+      }
+      return trainSchedulingService.preview({
+        bookingIds: selectedBookingIds,
+        scheduleDate: new Date(`${filters.scheduleDate}T08:00:00.000Z`).toISOString(),
+        originStationId: filters.originStationId,
+        destinationStationId: filters.destinationStationId,
+      });
+    },
+    onSuccess: (data) => {
+      setPreview(data);
+      toast.success(data.valid ? 'Preview generated' : 'Preview has validation issues');
+    },
+    onError: (error) => {
+      toast.error(parseError(error, 'Failed to preview train schedule'));
+    },
+  });
+
+  const createMutation = useMutation({
+    mutationFn: () => {
+      if (!selectedLocomotiveId) {
+        throw new Error('Please select a locomotive');
+      }
+      if (!filters.originStationId || !filters.destinationStationId || !filters.scheduleDate) {
+        throw new Error('Please select origin, destination, and schedule date');
+      }
+      return trainSchedulingService.createSchedule({
+        bookingIds: selectedBookingIds,
+        scheduleDate: new Date(`${filters.scheduleDate}T08:00:00.000Z`).toISOString(),
+        originStationId: filters.originStationId,
+        destinationStationId: filters.destinationStationId,
+        locomotiveId: selectedLocomotiveId,
+      });
+    },
+    onSuccess: (data) => {
+      toast.success('Train schedule created');
+      setSelectedBookingIds([]);
+      setSelectedLocomotiveId('');
+      setPreview(null);
+      void qc.invalidateQueries({ queryKey: QUERY_KEYS.TRAIN_SCHEDULING.ROOT });
+      void qc.invalidateQueries({ queryKey: QUERY_KEYS.TRAIN_SCHEDULING.schedules() });
+      void qc.invalidateQueries({ queryKey: QUERY_KEYS.TRAIN_SCHEDULING.locomotives() });
+      setDetailId(data.id);
+    },
+    onError: (error) => {
+      toast.error(parseError(error, 'Failed to create train schedule'));
+    },
+  });
+
+  const cancelMutation = useMutation({
+    mutationFn: (id: string) => trainSchedulingService.cancelSchedule(id),
+    onSuccess: (data) => {
+      toast.success('Train schedule cancelled');
+      void qc.invalidateQueries({ queryKey: QUERY_KEYS.TRAIN_SCHEDULING.schedules() });
+      void qc.invalidateQueries({ queryKey: QUERY_KEYS.TRAIN_SCHEDULING.locomotives() });
+      void qc.invalidateQueries({ queryKey: QUERY_KEYS.TRAIN_SCHEDULING.ROOT });
+      void qc.invalidateQueries({ queryKey: QUERY_KEYS.TRAIN_SCHEDULING.scheduleById(data.id) });
+      setDetailId(data.id);
+    },
+    onError: (error) => {
+      toast.error(parseError(error, 'Failed to cancel train schedule'));
+    },
+  });
+
+  const toggleBooking = (booking: EligibleContainerBooking, checked: boolean) => {
+    setSelectedBookingIds((current) => {
+      if (checked) {
+        const next = [...new Set([...current, booking.id])];
+        if (next.length === 1) {
+          const defaults = deriveFromBooking(booking, stationsQuery.data ?? []);
+          setFilters((prev) => ({
+            ...prev,
+            originStationId: prev.originStationId || defaults.originStationId,
+            destinationStationId: prev.destinationStationId || defaults.destinationStationId,
+            scheduleDate: prev.scheduleDate || defaults.scheduleDate,
+          }));
+        }
+        return next;
+      }
+      return current.filter((id) => id !== booking.id);
+    });
+    setPreview(null);
+  };
+
+  const detail = detailQuery.data;
+  const isBusy = previewMutation.isPending || createMutation.isPending;
+
   return (
-    <FeaturePlaceholder
-      title="Trains"
-      description="Coordinate train assignments, scheduling visibility, and operational readiness."
-    />
+    <div className="space-y-6 p-6">
+      <Breadcrumbs items={[{ label: 'Operations' }, { label: 'Train scheduling' }]} />
+
+      <section className="overflow-hidden rounded-3xl border border-border bg-card shadow-sm">
+        <div className="flex flex-col gap-5 border-b border-border px-6 py-6 lg:flex-row lg:items-center lg:justify-between">
+          <div className="flex items-start gap-4">
+            <div className="flex size-14 items-center justify-center rounded-2xl bg-primary text-primary-foreground">
+              <TrainTrack className="size-7" />
+            </div>
+            <div>
+              <h1 className="text-2xl font-bold tracking-tight">Train Scheduling</h1>
+              <p className="mt-1 text-sm text-muted-foreground">
+                Build container train schedules from compatible bookings, preview wagon plans, and assign locomotives.
+              </p>
+            </div>
+          </div>
+          <Button
+            variant="outline"
+            className="gap-2"
+            onClick={() => {
+              void eligibleQuery.refetch();
+              void schedulesQuery.refetch();
+              void locomotivesQuery.refetch();
+            }}
+          >
+            <RefreshCw className="size-4" />
+            Refresh
+          </Button>
+        </div>
+
+        <div className="grid gap-6 p-6 xl:grid-cols-[1.8fr,1fr]">
+          <div className="space-y-6">
+            <section className="rounded-2xl border border-border bg-background/60 p-5">
+              <div className="mb-4 flex items-center gap-2">
+                <Calendar className="size-4 text-muted-foreground" />
+                <h2 className="text-sm font-semibold uppercase tracking-wide text-muted-foreground">
+                  Filters
+                </h2>
+              </div>
+              <div className="grid gap-4 md:grid-cols-2 xl:grid-cols-4">
+                <div className="space-y-2">
+                  <label className="text-sm font-medium">Origin station</label>
+                  <Select
+                    value={filters.originStationId ?? ''}
+                    onValueChange={(value) =>
+                      setFilters((current) => ({
+                        ...current,
+                        originStationId: value === '__all__' ? undefined : value,
+                      }))
+                    }
+                  >
+                    <SelectTrigger>
+                      <SelectValue placeholder="All origins" />
+                    </SelectTrigger>
+                    <SelectContent>
+                      <SelectItem value="__all__">All origins</SelectItem>
+                      {(stationsQuery.data ?? []).map((station) => (
+                        <SelectItem key={station.id} value={station.id}>
+                          {station.name}
+                        </SelectItem>
+                      ))}
+                    </SelectContent>
+                  </Select>
+                </div>
+                <div className="space-y-2">
+                  <label className="text-sm font-medium">Destination station</label>
+                  <Select
+                    value={filters.destinationStationId ?? ''}
+                    onValueChange={(value) =>
+                      setFilters((current) => ({
+                        ...current,
+                        destinationStationId: value === '__all__' ? undefined : value,
+                      }))
+                    }
+                  >
+                    <SelectTrigger>
+                      <SelectValue placeholder="All destinations" />
+                    </SelectTrigger>
+                    <SelectContent>
+                      <SelectItem value="__all__">All destinations</SelectItem>
+                      {(stationsQuery.data ?? []).map((station) => (
+                        <SelectItem key={station.id} value={station.id}>
+                          {station.name}
+                        </SelectItem>
+                      ))}
+                    </SelectContent>
+                  </Select>
+                </div>
+                <div className="space-y-2">
+                  <label className="text-sm font-medium">Schedule date</label>
+                  <input
+                    className={inputClassName}
+                    type="date"
+                    value={filters.scheduleDate ?? ''}
+                    onChange={(event) =>
+                      setFilters((current) => ({
+                        ...current,
+                        scheduleDate: event.target.value || undefined,
+                      }))
+                    }
+                  />
+                </div>
+                <div className="space-y-2">
+                  <label className="text-sm font-medium">Booking status</label>
+                  <input
+                    className={inputClassName}
+                    placeholder="APPROVED"
+                    value={filters.status ?? ''}
+                    onChange={(event) =>
+                      setFilters((current) => ({
+                        ...current,
+                        status: event.target.value || undefined,
+                      }))
+                    }
+                  />
+                </div>
+              </div>
+            </section>
+
+            <section className="rounded-2xl border border-border bg-background/60 p-5">
+              <div className="mb-4 flex items-center justify-between">
+                <div>
+                  <h2 className="text-lg font-semibold">Eligible container bookings</h2>
+                  <p className="text-sm text-muted-foreground">
+                    Only container bookings not already assigned to a schedule appear here.
+                  </p>
+                </div>
+                <span className="rounded-full bg-muted px-3 py-1 text-xs font-medium text-muted-foreground">
+                  {eligibleQuery.data?.count ?? 0} bookings
+                </span>
+              </div>
+
+              <div className="overflow-x-auto rounded-2xl border border-border">
+                <table className="min-w-full divide-y divide-border text-sm">
+                  <thead className="bg-muted/40 text-left text-xs uppercase tracking-wide text-muted-foreground">
+                    <tr>
+                      <th className="px-3 py-3">Select</th>
+                      <th className="px-3 py-3">Booking</th>
+                      <th className="px-3 py-3">Customer</th>
+                      <th className="px-3 py-3">Container</th>
+                      <th className="px-3 py-3">Qty</th>
+                      <th className="px-3 py-3">Weight</th>
+                      <th className="px-3 py-3">Origin</th>
+                      <th className="px-3 py-3">Destination</th>
+                      <th className="px-3 py-3">Departure</th>
+                      <th className="px-3 py-3">Status</th>
+                    </tr>
+                  </thead>
+                  <tbody className="divide-y divide-border bg-card">
+                    {eligibleItems.map((booking) => (
+                      <tr key={booking.id} className="hover:bg-muted/20">
+                        <td className="px-3 py-3">
+                          <input
+                            type="checkbox"
+                            checked={selectedBookingIds.includes(booking.id)}
+                            onChange={(event) => toggleBooking(booking, event.target.checked)}
+                          />
+                        </td>
+                        <td className="px-3 py-3 font-medium">{booking.reference}</td>
+                        <td className="px-3 py-3">{booking.customer}</td>
+                        <td className="px-3 py-3">{booking.containerType}</td>
+                        <td className="px-3 py-3">{booking.quantity}</td>
+                        <td className="px-3 py-3">{booking.weightTons.toLocaleString()} T</td>
+                        <td className="px-3 py-3">{booking.origin}</td>
+                        <td className="px-3 py-3">{booking.destination}</td>
+                        <td className="px-3 py-3">{formatDate(booking.preferredDepartureDate)}</td>
+                        <td className="px-3 py-3">{booking.status}</td>
+                      </tr>
+                    ))}
+                    {!eligibleQuery.isLoading && eligibleItems.length === 0 ? (
+                      <tr>
+                        <td className="px-3 py-8 text-center text-sm text-muted-foreground" colSpan={10}>
+                          No eligible container bookings matched the current filters.
+                        </td>
+                      </tr>
+                    ) : null}
+                  </tbody>
+                </table>
+              </div>
+            </section>
+          </div>
+
+          <div className="space-y-6">
+            <section className="rounded-2xl border border-border bg-background/60 p-5">
+              <h2 className="text-lg font-semibold">Schedule builder</h2>
+              <div className="mt-4 grid gap-3 sm:grid-cols-2 xl:grid-cols-1">
+                <div className="rounded-xl border border-border bg-card p-4">
+                  <p className="text-xs uppercase tracking-wide text-muted-foreground">Selected bookings</p>
+                  <p className="mt-2 text-2xl font-semibold">{summary.count}</p>
+                </div>
+                <div className="rounded-xl border border-border bg-card p-4">
+                  <p className="text-xs uppercase tracking-wide text-muted-foreground">Total weight</p>
+                  <p className="mt-2 text-2xl font-semibold">{summary.totalWeightTons.toLocaleString()} T</p>
+                </div>
+                <div className="rounded-xl border border-border bg-card p-4">
+                  <p className="text-xs uppercase tracking-wide text-muted-foreground">Route</p>
+                  <p className="mt-2 text-sm font-medium">{summary.route}</p>
+                </div>
+                <div className="rounded-xl border border-border bg-card p-4">
+                  <p className="text-xs uppercase tracking-wide text-muted-foreground">Schedule date</p>
+                  <p className="mt-2 text-sm font-medium">{summary.scheduleDate}</p>
+                </div>
+                <div className="rounded-xl border border-border bg-card p-4">
+                  <p className="text-xs uppercase tracking-wide text-muted-foreground">Estimated wagon type</p>
+                  <p className="mt-2 text-sm font-medium">NW5</p>
+                </div>
+                <div className="rounded-xl border border-border bg-card p-4">
+                  <p className="text-xs uppercase tracking-wide text-muted-foreground">Estimated wagons / length</p>
+                  <p className="mt-2 text-sm font-medium">
+                    {summary.wagonsNeeded} wagons / {summary.totalLengthMeters} m
+                  </p>
+                </div>
+              </div>
+
+              <div className="mt-5 flex flex-col gap-3">
+                <Button
+                  className="w-full"
+                  disabled={!selectedBookingIds.length || isBusy}
+                  onClick={() => previewMutation.mutate()}
+                >
+                  Preview schedule
+                </Button>
+
+                <div className="space-y-2">
+                  <label className="text-sm font-medium">Locomotive</label>
+                  <Select value={selectedLocomotiveId} onValueChange={setSelectedLocomotiveId}>
+                    <SelectTrigger>
+                      <SelectValue placeholder="Select available locomotive" />
+                    </SelectTrigger>
+                    <SelectContent>
+                      {(locomotivesQuery.data ?? []).map((locomotive) => (
+                        <SelectItem key={locomotive.id} value={locomotive.id}>
+                          {locomotive.code} - {locomotive.maxPullWeightTons}T
+                        </SelectItem>
+                      ))}
+                    </SelectContent>
+                  </Select>
+                </div>
+
+                <Button
+                  className="w-full"
+                  disabled={!preview?.valid || !selectedLocomotiveId || isBusy}
+                  onClick={() => createMutation.mutate()}
+                >
+                  Create schedule
+                </Button>
+              </div>
+
+              {preview ? (
+                <div className="mt-5 space-y-4 rounded-2xl border border-border bg-card p-4">
+                  <div className="flex items-center justify-between">
+                    <h3 className="font-semibold">Preview result</h3>
+                    <span
+                      className={`rounded-full px-3 py-1 text-xs font-medium ${
+                        preview.valid
+                          ? 'bg-emerald-100 text-emerald-700 dark:bg-emerald-950 dark:text-emerald-300'
+                          : 'bg-rose-100 text-rose-700 dark:bg-rose-950 dark:text-rose-300'
+                      }`}
+                    >
+                      {preview.valid ? 'Valid' : 'Invalid'}
+                    </span>
+                  </div>
+
+                  <div className="grid gap-3 sm:grid-cols-3">
+                    <div className="rounded-xl border border-border p-3">
+                      <p className="text-xs uppercase tracking-wide text-muted-foreground">Wagons</p>
+                      <p className="mt-1 font-semibold">{preview.summary.wagonsNeeded}</p>
+                    </div>
+                    <div className="rounded-xl border border-border p-3">
+                      <p className="text-xs uppercase tracking-wide text-muted-foreground">Weight</p>
+                      <p className="mt-1 font-semibold">{preview.summary.totalWeightTons} T</p>
+                    </div>
+                    <div className="rounded-xl border border-border p-3">
+                      <p className="text-xs uppercase tracking-wide text-muted-foreground">Length</p>
+                      <p className="mt-1 font-semibold">{preview.summary.totalLengthMeters} m</p>
+                    </div>
+                  </div>
+
+                  {preview.violations.length > 0 ? (
+                    <div className="rounded-xl border border-rose-200 bg-rose-50 p-3 text-sm text-rose-700 dark:border-rose-950 dark:bg-rose-950/30 dark:text-rose-300">
+                      <ul className="list-disc space-y-1 pl-5">
+                        {preview.violations.map((violation) => (
+                          <li key={violation}>{violation}</li>
+                        ))}
+                      </ul>
+                    </div>
+                  ) : null}
+                </div>
+              ) : null}
+            </section>
+
+            <section className="rounded-2xl border border-border bg-background/60 p-5">
+              <div className="mb-4 flex items-center justify-between">
+                <div>
+                  <h2 className="text-lg font-semibold">Created schedules</h2>
+                  <p className="text-sm text-muted-foreground">Open a schedule to inspect wagons and allocations.</p>
+                </div>
+                <span className="rounded-full bg-muted px-3 py-1 text-xs font-medium text-muted-foreground">
+                  {filteredSchedules.length} schedules
+                </span>
+              </div>
+
+              <div className="mb-4 grid gap-3 md:grid-cols-[1fr,220px]">
+                <input
+                  className={inputClassName}
+                  placeholder="Search by schedule, route, locomotive, or status"
+                  value={scheduleSearch}
+                  onChange={(event) => setScheduleSearch(event.target.value)}
+                />
+                <Select value={scheduleStatusFilter} onValueChange={setScheduleStatusFilter}>
+                  <SelectTrigger>
+                    <SelectValue placeholder="All statuses" />
+                  </SelectTrigger>
+                  <SelectContent>
+                    <SelectItem value="ALL">All statuses</SelectItem>
+                    <SelectItem value="DRAFT">DRAFT</SelectItem>
+                    <SelectItem value="SCHEDULED">SCHEDULED</SelectItem>
+                    <SelectItem value="DISPATCHED">DISPATCHED</SelectItem>
+                    <SelectItem value="ARRIVED">ARRIVED</SelectItem>
+                    <SelectItem value="CANCELLED">CANCELLED</SelectItem>
+                  </SelectContent>
+                </Select>
+              </div>
+
+              <div className="overflow-x-auto rounded-2xl border border-border">
+                <table className="min-w-full divide-y divide-border text-sm">
+                  <thead className="bg-muted/40 text-left text-xs uppercase tracking-wide text-muted-foreground">
+                    <tr>
+                      <th className="px-3 py-3">Schedule</th>
+                      <th className="px-3 py-3">Departure</th>
+                      <th className="px-3 py-3">Route</th>
+                      <th className="px-3 py-3">Locomotive</th>
+                      <th className="px-3 py-3">Bookings</th>
+                      <th className="px-3 py-3">Wagons</th>
+                      <th className="px-3 py-3">Weight</th>
+                      <th className="px-3 py-3">Length</th>
+                      <th className="px-3 py-3">Status</th>
+                      <th className="px-3 py-3">Actions</th>
+                    </tr>
+                  </thead>
+                  <tbody className="divide-y divide-border bg-card">
+                    {filteredSchedules.map((schedule) => (
+                      <tr key={schedule.id} className="hover:bg-muted/20">
+                        <td className="px-3 py-3 font-mono text-xs">{schedule.id}</td>
+                        <td className="px-3 py-3">{formatDate(schedule.scheduleDate)}</td>
+                        <td className="px-3 py-3">
+                          {schedule.origin} to {schedule.destination}
+                        </td>
+                        <td className="px-3 py-3">{schedule.locomotive?.code ?? '-'}</td>
+                        <td className="px-3 py-3">{schedule.bookingsCount}</td>
+                        <td className="px-3 py-3">{schedule.wagonCount}</td>
+                        <td className="px-3 py-3">{schedule.totalWeightTons} T</td>
+                        <td className="px-3 py-3">{schedule.totalLengthMeters} m</td>
+                        <td className="px-3 py-3">{schedule.status}</td>
+                        <td className="px-3 py-3">
+                          <div className="flex gap-2">
+                            <Button variant="outline" size="sm" onClick={() => setDetailId(schedule.id)}>
+                              View
+                            </Button>
+                            {schedule.status !== 'CANCELLED' ? (
+                              <Button
+                                variant="outline"
+                                size="sm"
+                                onClick={() => cancelMutation.mutate(schedule.id)}
+                              >
+                                Cancel
+                              </Button>
+                            ) : null}
+                          </div>
+                        </td>
+                      </tr>
+                    ))}
+                    {!schedulesQuery.isLoading && filteredSchedules.length === 0 ? (
+                      <tr>
+                        <td className="px-3 py-8 text-center text-sm text-muted-foreground" colSpan={10}>
+                          No train schedules matched the current filters.
+                        </td>
+                      </tr>
+                    ) : null}
+                  </tbody>
+                </table>
+              </div>
+            </section>
+          </div>
+        </div>
+      </section>
+
+      <Dialog open={Boolean(detailId)} onOpenChange={(open) => (!open ? setDetailId(null) : null)}>
+        <DialogContent className="max-h-[90vh] max-w-5xl overflow-y-auto">
+          <DialogHeader>
+            <DialogTitle>Train schedule detail</DialogTitle>
+            <DialogDescription>
+              Inspect the selected schedule, locomotive, wagons, and booking allocations.
+            </DialogDescription>
+          </DialogHeader>
+
+          {detail ? (
+            <div className="space-y-6">
+              <div className="grid gap-4 md:grid-cols-2 xl:grid-cols-4">
+                <div className="rounded-xl border border-border p-4">
+                  <p className="text-xs uppercase tracking-wide text-muted-foreground">Schedule</p>
+                  <p className="mt-2 break-all font-mono text-xs">{detail.id}</p>
+                </div>
+                <div className="rounded-xl border border-border p-4">
+                  <p className="text-xs uppercase tracking-wide text-muted-foreground">Departure</p>
+                  <p className="mt-2 text-sm font-medium">{formatDate(detail.scheduledDepartureDate)}</p>
+                </div>
+                <div className="rounded-xl border border-border p-4">
+                  <p className="text-xs uppercase tracking-wide text-muted-foreground">Route</p>
+                  <p className="mt-2 text-sm font-medium">
+                    {detail.originStation?.label ?? detail.originStation?.code ?? '-'} to{' '}
+                    {detail.destinationStation?.label ?? detail.destinationStation?.code ?? '-'}
+                  </p>
+                </div>
+                <div className="rounded-xl border border-border p-4">
+                  <p className="text-xs uppercase tracking-wide text-muted-foreground">Status</p>
+                  <p className="mt-2 text-sm font-medium">{detail.status}</p>
+                </div>
+              </div>
+
+              <div className="rounded-2xl border border-border p-4">
+                <h3 className="text-lg font-semibold">Locomotive</h3>
+                <p className="mt-2 text-sm text-muted-foreground">
+                  {detail.trainSet?.locomotive
+                    ? `${detail.trainSet.locomotive.code} (${detail.trainSet.locomotive.maxPullWeightTons}T pull capacity)`
+                    : 'No locomotive attached'}
+                </p>
+              </div>
+
+              <div className="rounded-2xl border border-border p-4">
+                <h3 className="text-lg font-semibold">Wagons and allocations</h3>
+                <div className="mt-4 space-y-4">
+                  {(detail.trainSet?.wagons ?? []).map((wagon) => (
+                    <div key={wagon.id} className="rounded-xl border border-border p-4">
+                      <div className="flex flex-col gap-2 sm:flex-row sm:items-center sm:justify-between">
+                        <div>
+                          <p className="font-semibold">
+                            Wagon {wagon.sequenceNo} - {wagon.wagonType?.code ?? 'NW5'}
+                          </p>
+                          <p className="text-sm text-muted-foreground">
+                            {wagon.assignedWeightTons}T assigned / {wagon.capacityTons}T capacity / {wagon.lengthMeters}m
+                          </p>
+                        </div>
+                      </div>
+                      <div className="mt-3 overflow-x-auto rounded-xl border border-border">
+                        <table className="min-w-full divide-y divide-border text-sm">
+                          <thead className="bg-muted/40 text-left text-xs uppercase tracking-wide text-muted-foreground">
+                            <tr>
+                              <th className="px-3 py-2">Booking</th>
+                              <th className="px-3 py-2">Allocated weight</th>
+                            </tr>
+                          </thead>
+                          <tbody className="divide-y divide-border bg-card">
+                            {wagon.allocations.map((allocation) => (
+                              <tr key={allocation.id}>
+                                <td className="px-3 py-2">{allocation.bookingReference ?? allocation.bookingId}</td>
+                                <td className="px-3 py-2">{allocation.allocatedWeightTons} T</td>
+                              </tr>
+                            ))}
+                          </tbody>
+                        </table>
+                      </div>
+                    </div>
+                  ))}
+                </div>
+              </div>
+
+              <div className="rounded-2xl border border-border p-4">
+                <h3 className="text-lg font-semibold">Bookings in schedule</h3>
+                <div className="mt-4 overflow-x-auto rounded-xl border border-border">
+                  <table className="min-w-full divide-y divide-border text-sm">
+                    <thead className="bg-muted/40 text-left text-xs uppercase tracking-wide text-muted-foreground">
+                      <tr>
+                        <th className="px-3 py-2">Reference</th>
+                        <th className="px-3 py-2">Customer</th>
+                        <th className="px-3 py-2">Weight</th>
+                        <th className="px-3 py-2">Status</th>
+                      </tr>
+                    </thead>
+                    <tbody className="divide-y divide-border bg-card">
+                      {detail.bookings.map((booking) => (
+                        <tr key={booking.id}>
+                          <td className="px-3 py-2">{booking.reference ?? booking.id}</td>
+                          <td className="px-3 py-2">{booking.customer ?? '-'}</td>
+                          <td className="px-3 py-2">{booking.weightTons} T</td>
+                          <td className="px-3 py-2">{booking.status ?? '-'}</td>
+                        </tr>
+                      ))}
+                    </tbody>
+                  </table>
+                </div>
+              </div>
+            </div>
+          ) : (
+            <p className="text-sm text-muted-foreground">Loading schedule detail...</p>
+          )}
+        </DialogContent>
+      </Dialog>
+    </div>
   );
 };
 

apps/edr-freight-web/backoffice/src/services/trainScheduling.service.ts

@@ -0,0 +1,87 @@
+import { api as client } from '../auth/http';
+import { unwrap } from '@/utils/endpoint';
+import { URL_CONSTANTS } from '@/constants/URLS';
+import type {
+  CreateTrainSchedulePayload,
+  EligibleContainerBookingsResponse,
+  LocomotiveRecord,
+  TrainScheduleDetail,
+  TrainScheduleFilters,
+  TrainScheduleListItem,
+  TrainSchedulePreviewPayload,
+  TrainSchedulePreviewResponse,
+  YardOption,
+} from '@/types/trainScheduling';
+
+interface BookingReferenceDataResponse {
+  yard?: YardOption[];
+}
+
+export const trainSchedulingService = {
+  getEligibleBookings: async (
+    filters?: TrainScheduleFilters,
+  ): Promise<EligibleContainerBookingsResponse> => {
+    const response = await client.get<EligibleContainerBookingsResponse>(
+      URL_CONSTANTS.TRAIN_SCHEDULING.ELIGIBLE_BOOKINGS,
+      { params: filters },
+    );
+    return unwrap(response.data);
+  },
+
+  preview: async (
+    payload: TrainSchedulePreviewPayload,
+  ): Promise<TrainSchedulePreviewResponse> => {
+    const response = await client.post<TrainSchedulePreviewResponse>(
+      URL_CONSTANTS.TRAIN_SCHEDULING.PREVIEW,
+      payload,
+    );
+    return unwrap(response.data);
+  },
+
+  createSchedule: async (
+    payload: CreateTrainSchedulePayload,
+  ): Promise<TrainScheduleDetail> => {
+    const response = await client.post<TrainScheduleDetail>(
+      URL_CONSTANTS.TRAIN_SCHEDULING.SCHEDULES,
+      payload,
+    );
+    return unwrap(response.data);
+  },
+
+  listSchedules: async (): Promise<TrainScheduleListItem[]> => {
+    const response = await client.get<TrainScheduleListItem[]>(
+      URL_CONSTANTS.TRAIN_SCHEDULING.SCHEDULES,
+    );
+    return unwrap(response.data);
+  },
+
+  getScheduleById: async (id: string): Promise<TrainScheduleDetail> => {
+    const response = await client.get<TrainScheduleDetail>(
+      URL_CONSTANTS.TRAIN_SCHEDULING.SCHEDULE_BY_ID(id),
+    );
+    return unwrap(response.data);
+  },
+
+  cancelSchedule: async (id: string): Promise<TrainScheduleDetail> => {
+    const response = await client.post<TrainScheduleDetail>(
+      URL_CONSTANTS.TRAIN_SCHEDULING.CANCEL_SCHEDULE(id),
+      {},
+    );
+    return unwrap(response.data);
+  },
+
+  getAvailableLocomotives: async (): Promise<LocomotiveRecord[]> => {
+    const response = await client.get<LocomotiveRecord[]>(URL_CONSTANTS.LOCOMOTIVES.BASE, {
+      params: { status: 'AVAILABLE' },
+    });
+    return unwrap(response.data);
+  },
+
+  getStations: async (): Promise<YardOption[]> => {
+    const response = await client.get<BookingReferenceDataResponse>(
+      URL_CONSTANTS.BOOKINGS.REFERENCE_DATA,
+    );
+    const data = unwrap(response.data);
+    return data.yard ?? [];
+  },
+};

apps/edr-freight-web/backoffice/src/types/trainScheduling.ts

@@ -0,0 +1,154 @@
+export interface YardOption {
+  id: string;
+  name: string;
+  code: string;
+  country?: string;
+}
+
+export interface EligibleContainerBooking {
+  id: string;
+  reference: string;
+  customer: string;
+  containerType: string;
+  quantity: number;
+  weightTons: number;
+  origin: string;
+  destination: string;
+  preferredDepartureDate: string;
+  status: string;
+}
+
+export interface EligibleContainerBookingsResponse {
+  count: number;
+  items: EligibleContainerBooking[];
+}
+
+export interface WagonPlanAllocation {
+  bookingId: string;
+  bookingReference: string;
+  allocatedWeightTons: number;
+}
+
+export interface WagonPlanRow {
+  sequenceNo: number;
+  capacityTons: number;
+  lengthMeters: number;
+  assignedWeightTons: number;
+  allocations: WagonPlanAllocation[];
+}
+
+export interface TrainSchedulePreviewResponse {
+  valid: boolean;
+  violations: string[];
+  summary: {
+    totalBookings: number;
+    totalWeightTons: number;
+    wagonType: string;
+    wagonsNeeded: number;
+    totalLengthMeters: number;
+  };
+  bookingIds: string[];
+  wagonPlan: WagonPlanRow[];
+}
+
+export interface LocomotiveRecord {
+  id: string;
+  code: string;
+  name?: string | null;
+  maxPullWeightTons: number;
+  status: 'AVAILABLE' | 'ASSIGNED' | 'MAINTENANCE' | 'INACTIVE';
+  availableFrom?: string | null;
+}
+
+export interface TrainScheduleListItem {
+  id: string;
+  scheduleDate: string;
+  origin: string | null;
+  destination: string | null;
+  locomotive:
+    | {
+        id: string;
+        code: string;
+        name?: string | null;
+      }
+    | null;
+  wagonCount: number;
+  totalWeightTons: number;
+  totalLengthMeters: number;
+  bookingsCount: number;
+  status: string;
+}
+
+export interface TrainScheduleDetail {
+  id: string;
+  status: string;
+  scheduledDepartureDate: string;
+  scheduledArrivalDate?: string | null;
+  originStation?: {
+    id: string;
+    label?: string;
+    code?: string;
+  } | null;
+  destinationStation?: {
+    id: string;
+    label?: string;
+    code?: string;
+  } | null;
+  trainSet?: {
+    id: string;
+    status: string;
+    wagonCount: number;
+    totalWeightTons: number;
+    totalLengthMeters: number;
+    locomotive?: {
+      id: string;
+      code: string;
+      name?: string | null;
+      status: string;
+      maxPullWeightTons: number;
+    } | null;
+    wagons: Array<{
+      id: string;
+      sequenceNo: number;
+      capacityTons: number;
+      lengthMeters: number;
+      assignedWeightTons: number;
+      wagonType?: {
+        id: string;
+        code: string;
+        name: string;
+      } | null;
+      allocations: Array<{
+        id: string;
+        bookingId: string;
+        bookingReference: string | null;
+        allocatedWeightTons: number;
+      }>;
+    }>;
+  } | null;
+  bookings: Array<{
+    id: string;
+    reference: string | null;
+    customer: string | null;
+    weightTons: number;
+    status: string | null;
+  }>;
+}
+
+export interface TrainScheduleFilters {
+  originStationId?: string;
+  destinationStationId?: string;
+  scheduleDate?: string;
+  status?: string;
+}
+
+export interface TrainSchedulePreviewPayload {
+  bookingIds: string[];
+  scheduleDate: string;
+  originStationId: string;
+  destinationStationId: string;
+}
+
+export interface CreateTrainSchedulePayload extends TrainSchedulePreviewPayload {
+  locomotiveId: string;
+}

apps/edr-freight-web/backoffice/src/utils/endpoint.ts

@@ -50,9 +50,6 @@ export function endpoint<TInput, TResponse>(
     if (queryKeyBuilder && input !== undefined) {
       return queryKeyBuilder(input as TInput);
     }
-    if (queryKeyBuilder && input === undefined) {
-      return queryKeyBuilder(undefined as TInput);
-    }
     return input === undefined
       ? [service, action]
       : [service, action, input];
@@ -124,4 +121,4 @@ export function unwrap<T>(response: { data: T } | T): T {
   }
 
   return response as T;
-}
+}

apps/edr-freight-web/portal/package.json

@@ -25,6 +25,7 @@
     "react": "19.2.6",
     "react-dom": "19.2.6",
     "react-hook-form": "^7.76.0",
+    "react-hot-toast": "^2.6.0",
     "react-router-dom": "^6.27.0",
     "recharts": "^3.8.1",
     "tailwind-merge": "^3.6.0",

apps/edr-freight-web/portal/src/App.tsx

@@ -14,11 +14,13 @@ import {
   Home,
   Loader2,
   User,
+  Settings,
 } from "lucide-react";
 
 import useAuth from "./hooks/useAuth";
 
 import ProfilePage from "./pages/ProfilePage";
+import SettingsPage from "./pages/SettingsPage";
 import MyPortalPage from "./pages/MyPortalPage";
 import EDRFreightLandingPage from "./pages/EDRFreightLandingPage";
 import SignupPage from "./pages/accounts/SignupPage";
@@ -40,12 +42,14 @@ const sidebarItems: SidebarItem[] = [
   { label: "Tracking", href: "/tracking", icon: <MapPin /> },
   { label: "Billing", href: "/billing", icon: <Receipt /> },
   { label: "Profile", href: "/profile", icon: <User /> },
+  { label: "Settings", href: "/settings", icon: <Settings /> },
 ];
 
 const App = () => {
   const navigate = useNavigate();
   const location = useLocation();
   const { user, isPending, logout, customer, customerQuery } = useAuth();
+
   useEffect(() => {
     if (isPending) return;
     const isInProtectedRoutes = sidebarItems.find((item) =>
@@ -107,6 +111,7 @@ const App = () => {
         <Route path="/tracking" element={<TrackingPage />} />
         <Route path="/billing" element={<BillingPage />} />
         <Route path="/profile" element={<ProfilePage />} />
+        <Route path="/settings" element={<SettingsPage />} />
       </Route>
       <Route path="*" element={<Navigate to="/" replace />} />
     </Routes>

apps/edr-freight-web/portal/src/constants/URLS.ts

@@ -82,6 +82,8 @@ export const URL_CONSTANTS = {
   COMPANIES_API: {
     GET_INFO: "/api/companies/getInfo",
     CREATE: "/api/companies/create",
+    PROFILE: "/api/companies/profile",
+    DOCUMENTS: (id: string) => `/api/companies/${id}/documents`,
   },
 
   BOOKINGS: {

apps/edr-freight-web/portal/src/hooks/useAuth.ts

@@ -29,7 +29,6 @@ const useAuth = () => {
 
   const authQuery = useQuery(
     api.auth.getMyInfo.queryOptions({
-      enabled: !!getCookie("auth-token"),
       retry: false,
       staleTime: 10 * 60 * 1000,
     }),

apps/edr-freight-web/portal/src/pages/MyPortalPage.tsx

@@ -1,4 +1,4 @@
-import { useMemo } from "react";
+import { useMemo, useState } from "react";
 import { Link } from "react-router-dom";
 import {
   ArrowRight,
@@ -14,6 +14,8 @@ import {
   Plus,
   Receipt,
   Truck,
+  UploadCloud,
+  X,
 } from "lucide-react";
 
 import {
@@ -48,6 +50,7 @@ export default function MyPortalPage() {
   const outstandingInvoices = myInvoices.filter(
     (inv) => inv.status === "Sent" || inv.status === "Overdue",
   );
+  const [dismissed, setDismissed] = useState(false);
   const totalOutstanding = outstandingInvoices
     .filter((inv) => inv.currency === "USD")
     .reduce((sum, inv) => sum + inv.amount, 0);
@@ -61,6 +64,34 @@ export default function MyPortalPage() {
   return (
     <div className="min-h-screen bg-background p-6">
       <div className="mx-auto max-w-7xl space-y-6">
+        {/* Documents banner */}
+        {!me.documentsComplete && !dismissed && (
+          <div className="flex items-start gap-3 rounded-2xl border border-amber-200 bg-amber-50 p-4 text-sm text-amber-800">
+            <UploadCloud className="mt-0.5 h-5 w-5 shrink-0 text-amber-500" />
+            <div className="flex-1">
+              <p className="font-semibold">Upload your documents</p>
+              <p className="mt-0.5 text-amber-700">
+                To enable all account features, please upload your Business
+                License, TIN Certificate, and National ID / Passport.
+              </p>
+              <Link
+                to="/settings?tab=documents"
+                className="mt-2 inline-flex items-center gap-1 font-medium text-amber-900 underline underline-offset-2 transition hover:text-amber-700"
+              >
+                Upload now
+              </Link>
+            </div>
+            <button
+              type="button"
+              onClick={() => setDismissed(true)}
+              className="shrink-0 rounded-lg p-1 text-amber-400 transition hover:bg-amber-100 hover:text-amber-600"
+              aria-label="Dismiss"
+            >
+              <X className="h-4 w-4" />
+            </button>
+          </div>
+        )}
+
         {/* Welcome banner */}
         <div className="overflow-hidden rounded-3xl bg-gradient-to-r from-[#059669] to-[#10B981] p-6 text-white shadow-sm">
           <div className="flex flex-col gap-4 md:flex-row md:items-center md:justify-between">

apps/edr-freight-web/portal/src/pages/ProfilePage.tsx

@@ -1,135 +1,46 @@
-import { useMemo } from "react";
-import {
-  User,
-  Building2,
-  Phone,
-  Mail,
-  MapPin,
-  ShieldCheck,
-  Briefcase,
-  UserCheck,
-  Building,
-  Globe,
-  Fingerprint,
-  FileCheck,
-  Settings2,
-  ExternalLink,
-} from "lucide-react";
-import useAuth from "@/hooks/useAuth";
-import {
-  Card,
-  CardHeader,
-  CardTitle,
-  CardDescription,
-  CardContent,
-  CardAction,
-  Badge,
-  Separator,
-  SmartFileInput,
-  Button,
-} from "@edr/ui-common";
-import type { IFileUploadSetting } from "@edr/types/freight";
-import { cn } from "@/lib/utils";
+import { User, Building2, Phone, Mail, MapPin, ShieldCheck, Briefcase, UserCheck, Fingerprint, FileCheck, Globe, Building } from "lucide-react";
+import { useQuery } from "@tanstack/react-query";
+import { api } from "@/services/api";
+import { Card, CardHeader, CardTitle, CardDescription, CardContent, Badge, Separator } from "@edr/ui-common";
+
+function InfoItem({ icon, label, value }: { icon?: React.ReactNode; label: string; value?: string | null }) {
+  return (
+    <div className="flex items-start gap-3">
+      {icon && <div className="mt-1 text-muted-foreground [&_svg]:size-4">{icon}</div>}
+      <div className="flex flex-col gap-0.5">
+        <p className="text-[10px] font-bold uppercase tracking-tight text-muted-foreground">{label}</p>
+        <p className="text-sm font-bold text-foreground">{value || "—"}</p>
+      </div>
+    </div>
+  );
+}
 
 export default function ProfilePage() {
-  const { user, customer, isPending } = useAuth();
-
-  const documentSettings = useMemo<IFileUploadSetting>(() => ({
-    id: "profile-docs",
-    code: "customer_documents",
-    label: "Customer Documents",
-    entity: "customer",
-    createdAt: new Date(),
-    updatedAt: new Date(),
-    fields: [
-      {
-        id: "doc-tin",
-        settingId: "profile-docs",
-        fileKey: "tin_certificate",
-        fileLabel: "TIN Certificate",
-        isRequired: true,
-        isMultiple: false,
-        maxFiles: 1,
-        allowedExtensions: [".pdf", ".jpg", ".jpeg", ".png"],
-        maxSizeMb: 5,
-        order: 1,
-        createdAt: new Date(),
-        updatedAt: new Date(),
-      },
-      {
-        id: "doc-license",
-        settingId: "profile-docs",
-        fileKey: "business_license",
-        fileLabel: "Business/Investment License",
-        isRequired: true,
-        isMultiple: false,
-        maxFiles: 1,
-        allowedExtensions: [".pdf", ".jpg", ".jpeg", ".png"],
-        maxSizeMb: 5,
-        order: 2,
-        createdAt: new Date(),
-        updatedAt: new Date(),
-      },
-      {
-        id: "doc-reg",
-        settingId: "profile-docs",
-        fileKey: "registration_certificate",
-        fileLabel: "Business Registration Certificate",
-        isRequired: true,
-        isMultiple: false,
-        maxFiles: 1,
-        allowedExtensions: [".pdf", ".jpg", ".jpeg", ".png"],
-        maxSizeMb: 5,
-        order: 3,
-        createdAt: new Date(),
-        updatedAt: new Date(),
-      },
-      {
-        id: "doc-id",
-        settingId: "profile-docs",
-        fileKey: "national_id",
-        fileLabel: "National ID",
-        isRequired: true,
-        isMultiple: false,
-        maxFiles: 1,
-        allowedExtensions: [".pdf", ".jpg", ".jpeg", ".png"],
-        maxSizeMb: 5,
-        order: 4,
-        createdAt: new Date(),
-        updatedAt: new Date(),
-      },
-      {
-        id: "doc-poa",
-        settingId: "profile-docs",
-        fileKey: "power_of_attorney",
-        fileLabel: "Power of Attorney",
-        isRequired: false,
-        isMultiple: false,
-        maxFiles: 1,
-        allowedExtensions: [".pdf", ".jpg", ".jpeg", ".png"],
-        maxSizeMb: 5,
-        order: 5,
-        createdAt: new Date(),
-        updatedAt: new Date(),
-      },
-    ],
-  }), []);
+  const { data: profile, isPending } = useQuery(
+    api.companies.getProfile.queryOptions(),
+  );
 
   if (isPending) {
     return (
       <div className="flex h-full items-center justify-center">
-        <div className="h-8 w-8 animate-spin rounded-full border-b-2 border-primary"></div>
+        <div className="h-8 w-8 animate-spin rounded-full border-b-2 border-primary" />
       </div>
     );
   }
 
-  const displayName = user?.name?.en || user?.username || user?.email || "User";
+  if (!profile) {
+    return (
+      <div className="flex h-full items-center justify-center">
+        <p className="text-muted-foreground">No company profile found.</p>
+      </div>
+    );
+  }
 
   return (
-    <div className="container mx-auto max-w-7xl px-4 py-8">
-      <div className="flex flex-col gap-8">
-        {/* Header Section */}
-        <div className="flex flex-col gap-6 md:flex-row md:items-center md:justify-between">
+    <div className="px-4 py-8">
+      <div className="mx-auto max-w-7xl">
+        <div className="flex flex-col gap-8">
+          {/* Header */}
           <div className="flex items-center gap-6">
             <div className="flex size-24 items-center justify-center rounded-2xl bg-primary/10 text-primary shadow-inner">
               <User className="size-12" />
@@ -137,7 +48,7 @@ export default function ProfilePage() {
             <div className="flex flex-col gap-1">
               <div className="flex items-center gap-3">
                 <h1 className="text-3xl font-black tracking-tight text-foreground">
-                  {displayName}
+                  {profile.companyName}
                 </h1>
                 <Badge variant="secondary" className="font-bold uppercase tracking-wider">
                   Verified
@@ -145,182 +56,129 @@ export default function ProfilePage() {
               </div>
               <p className="flex items-center gap-2 font-medium text-muted-foreground">
                 <Building className="size-4" />
-                {customer?.companyName || "No Company Linked"}
+                {profile.companyName}
               </p>
             </div>
           </div>
-          <div className="flex items-center gap-3">
-             <Button variant="outline">
-               <Settings2 data-icon="inline-start" />
-               Account Settings
-             </Button>
-          </div>
-        </div>
 
-        <Separator />
+          <Separator />
 
-        <div className="grid grid-cols-1 gap-8 lg:grid-cols-3">
-          {/* Left Column - Personal & Company Info */}
-          <div className="flex flex-col gap-8 lg:col-span-2">
-            <div className="grid grid-cols-1 gap-8 md:grid-cols-2">
-              {/* Personal Details Card */}
+          <div className="grid grid-cols-1 gap-8 lg:grid-cols-3">
+            {/* Left Column */}
+            <div className="flex flex-col gap-8 lg:col-span-2">
+              <div className="grid grid-cols-1 gap-8 md:grid-cols-2">
+                {/* Company Details */}
+                <Card>
+                  <CardHeader>
+                    <CardTitle className="flex items-center gap-2">
+                      <Building2 className="size-5 text-primary" />
+                      Company Details
+                    </CardTitle>
+                    <CardDescription>Business registration information</CardDescription>
+                  </CardHeader>
+                  <CardContent className="flex flex-col gap-4">
+                    <InfoItem icon={<Globe />} label="Location" value={profile.companyLocation} />
+                    <InfoItem icon={<MapPin />} label="Address" value={profile.companyAddress} />
+                    <InfoItem icon={<FileCheck />} label="TIN Number" value={profile.tinNumber} />
+                    <InfoItem icon={<ShieldCheck />} label="FAN Number" value={profile.fanNumber} />
+                    <InfoItem icon={<Mail />} label="Email" value={profile.companyEmail} />
+                    <InfoItem icon={<Phone />} label="Phone" value={profile.companyPhone} />
+                  </CardContent>
+                </Card>
+
+                {/* Personal Details (from ExternalProfile) */}
+                <Card>
+                  <CardHeader>
+                    <CardTitle className="flex items-center gap-2">
+                      <Fingerprint className="size-5 text-primary" />
+                      Profile Details
+                    </CardTitle>
+                    <CardDescription>Your linked user profile</CardDescription>
+                  </CardHeader>
+                  <CardContent className="flex flex-col gap-4">
+                    <InfoItem icon={<User />} label="Profile" value="Primary Contact" />
+                  </CardContent>
+                </Card>
+              </div>
+
+              {/* Personnel Card */}
               <Card>
                 <CardHeader>
                   <CardTitle className="flex items-center gap-2">
-                    <Fingerprint className="size-5 text-primary" />
-                    Personal Details
+                    <Briefcase className="size-5 text-primary" />
+                    Key Personnel
                   </CardTitle>
-                  <CardDescription>Your account contact information</CardDescription>
-                  <CardAction>
-                    <Button variant="ghost" size="icon">
-                      <ExternalLink />
-                    </Button>
-                  </CardAction>
+                  <CardDescription>Management and contact persons</CardDescription>
                 </CardHeader>
-                <CardContent className="flex flex-col gap-4">
-                  <InfoItem icon={<Mail />} label="Email Address" value={user?.email} />
-                  <InfoItem icon={<Phone />} label="Phone Number" value={user?.phoneNumber} />
-                  <InfoItem icon={<UserCheck />} label="Username" value={user?.username} />
+                <CardContent className="grid grid-cols-1 gap-8 md:grid-cols-2">
+                  <div className="flex flex-col gap-4">
+                    <h3 className="border-l-4 border-primary pl-3 text-sm font-bold uppercase tracking-wide text-foreground">
+                      Contact Person
+                    </h3>
+                    <div className="flex flex-col gap-3 pl-4">
+                      <InfoItem label="Name" value={profile.contactPersonName} />
+                      <InfoItem label="Phone" value={profile.contactPersonPhone} />
+                    </div>
+                  </div>
+                  <div className="flex flex-col gap-4">
+                    <h3 className="border-l-4 border-accent pl-3 text-sm font-bold uppercase tracking-wide text-foreground">
+                      General Manager
+                    </h3>
+                    <div className="flex flex-col gap-3 pl-4">
+                      <InfoItem label="Name" value={profile.generalManagerName} />
+                      <InfoItem label="Email" value={profile.generalManagerEmail} />
+                      <InfoItem label="Phone" value={profile.generalManagerPhone} />
+                    </div>
+                  </div>
                 </CardContent>
               </Card>
 
-              {/* Company Details Card */}
-              <Card>
-                <CardHeader>
-                  <CardTitle className="flex items-center gap-2">
-                    <Building2 className="size-5 text-primary" />
-                    Company Details
-                  </CardTitle>
-                  <CardDescription>Business registration information</CardDescription>
-                </CardHeader>
-                <CardContent className="flex flex-col gap-4">
-                  <InfoItem icon={<Globe />} label="Location" value={customer?.companyLocation} />
-                  <InfoItem icon={<MapPin />} label="Address" value={customer?.companyAddress} />
-                  <InfoItem icon={<FileCheck />} label="TIN Number" value={customer?.tinNumber} />
-                  <InfoItem icon={<ShieldCheck />} label="FAN Number" value={customer?.fanNumber} />
+              {/* Power of Attorney */}
+              {profile.poaName && (
+                <Card className="border-dashed">
+                  <CardHeader>
+                    <CardTitle className="flex items-center gap-2">
+                      <UserCheck className="size-5 text-accent" />
+                      Power of Attorney
+                    </CardTitle>
+                    <CardDescription>Authorized representative details</CardDescription>
+                  </CardHeader>
+                  <CardContent className="grid grid-cols-1 gap-4 md:grid-cols-2">
+                    <InfoItem label="PoA Name" value={profile.poaName} />
+                    <InfoItem label="PoA Email" value={profile.poaEmail} />
+                    <InfoItem label="PoA Phone" value={profile.poaPhone} />
+                    <InfoItem label="PoA Location" value={profile.poaLocation} />
+                  </CardContent>
+                </Card>
+              )}
+            </div>
+
+            {/* Right Column */}
+            <div className="flex flex-col gap-8">
+              <Card className="relative overflow-hidden border-none bg-foreground text-background shadow-xl">
+                <div className="absolute right-0 top-0 p-4 opacity-10">
+                  <ShieldCheck className="size-32" />
+                </div>
+                <CardContent className="relative z-10 flex flex-col gap-4 px-6 py-8">
+                  <h3 className="text-xl font-black">Secure Account</h3>
+                  <p className="text-sm leading-relaxed text-muted-foreground/80">
+                    Your information is protected by enterprise-grade security.
+                    Contact support for verified information updates.
+                  </p>
+                  <div className="pt-2">
+                    <a
+                      href="/settings"
+                      className="inline-flex h-9 items-center justify-center rounded-md bg-background px-4 text-sm font-medium text-foreground hover:bg-background/90"
+                    >
+                      Edit Settings
+                    </a>
+                  </div>
                 </CardContent>
               </Card>
             </div>
-
-            {/* Personnel Card */}
-            <Card>
-              <CardHeader>
-                <CardTitle className="flex items-center gap-2">
-                  <Briefcase className="size-5 text-primary" />
-                  Key Personnel
-                </CardTitle>
-                <CardDescription>Management and contact persons</CardDescription>
-              </CardHeader>
-              <CardContent className="grid grid-cols-1 gap-8 md:grid-cols-2">
-                <div className="flex flex-col gap-4">
-                  <h3 className="border-l-4 border-primary pl-3 text-sm font-bold uppercase tracking-wide text-foreground">
-                    Contact Person
-                  </h3>
-                  <div className="flex flex-col gap-3 pl-4">
-                    <InfoItem label="Name" value={customer?.contactPersonName} />
-                    <InfoItem label="Phone" value={customer?.contactPersonPhone} />
-                  </div>
-                </div>
-                <div className="flex flex-col gap-4">
-                  <h3 className="border-l-4 border-accent pl-3 text-sm font-bold uppercase tracking-wide text-foreground">
-                    General Manager
-                  </h3>
-                  <div className="flex flex-col gap-3 pl-4">
-                    <InfoItem label="Name" value={customer?.generalManagerName} />
-                    <InfoItem label="Email" value={customer?.generalManagerEmail} />
-                    <InfoItem label="Phone" value={customer?.generalManagerPhone} />
-                  </div>
-                </div>
-              </CardContent>
-            </Card>
-
-            {/* Power of Attorney Section (Conditional) */}
-            {customer?.poaName && (
-              <Card className="border-dashed">
-                <CardHeader>
-                  <CardTitle className="flex items-center gap-2">
-                    <UserCheck className="size-5 text-accent" />
-                    Power of Attorney
-                  </CardTitle>
-                  <CardDescription>Authorized representative details</CardDescription>
-                </CardHeader>
-                <CardContent className="grid grid-cols-1 gap-4 md:grid-cols-2">
-                  <InfoItem label="PoA Name" value={customer.poaName} />
-                  <InfoItem label="PoA Email" value={customer.poaEmail} />
-                  <InfoItem label="PoA Phone" value={customer.poaPhone} />
-                  <InfoItem label="PoA Location" value={customer.poaLocation} />
-                </CardContent>
-              </Card>
-            )}
-          </div>
-
-          {/* Right Column - Documents */}
-          <div className="flex flex-col gap-8">
-            <Card className="border-primary/20 bg-primary/[0.02] shadow-md">
-              <CardHeader>
-                <CardTitle className="flex items-center gap-2">
-                  <FileCheck className="size-6 text-primary" />
-                  Documents
-                </CardTitle>
-                <CardDescription>Manage required business documents</CardDescription>
-              </CardHeader>
-              <CardContent className="px-6 pb-6 pt-0">
-                <SmartFileInput
-                  file={documentSettings}
-                  variant="minimal"
-                  className="flex flex-col gap-4"
-                />
-              </CardContent>
-            </Card>
-
-            <Card className="relative overflow-hidden border-none bg-foreground text-background shadow-xl">
-              <div className="absolute right-0 top-0 p-4 opacity-10">
-                <ShieldCheck className="size-32" />
-              </div>
-              <CardContent className="relative z-10 flex flex-col gap-4 px-6 py-8">
-                <h3 className="text-xl font-black">Secure Account</h3>
-                <p className="text-sm leading-relaxed text-muted-foreground/80">
-                  Your information is protected by enterprise-grade security. 
-                  Contact support for verified information updates.
-                </p>
-                <div className="pt-2">
-                  <Button variant="secondary" size="sm">
-                    Contact Support
-                  </Button>
-                </div>
-              </CardContent>
-            </Card>
           </div>
         </div>
       </div>
     </div>
   );
 }
-
-function InfoItem({
-  icon,
-  label,
-  value,
-}: {
-  icon?: React.ReactNode;
-  label: string;
-  value?: string | null;
-}) {
-  return (
-    <div className="flex items-start gap-3">
-      {icon && (
-        <div className="mt-1 text-muted-foreground [&_svg]:size-4">
-          {icon}
-        </div>
-      )}
-      <div className="flex flex-col gap-0.5">
-        <p className="text-[10px] font-bold uppercase tracking-tight text-muted-foreground">
-          {label}
-        </p>
-        <p className="text-sm font-bold text-foreground">
-          {value || "—"}
-        </p>
-      </div>
-    </div>
-  );
-}

apps/edr-freight-web/portal/src/pages/SettingsPage.tsx

@@ -0,0 +1,617 @@
+import { useState, useMemo } from "react";
+import { useSearchParams } from "react-router-dom";
+import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query";
+import { useForm } from "react-hook-form";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { z } from "zod";
+import {
+  Building2,
+  User,
+  Briefcase,
+  UserCheck,
+  FileCheck,
+  Loader2,
+  Save,
+  UploadCloud,
+  CheckCircle2,
+  XCircle,
+} from "lucide-react";
+import { api } from "@/services/api";
+import { companiesService } from "@/services/companies.service";
+import PhoneInput from "@/components/auth/PhoneInput";
+import {
+  Card,
+  CardHeader,
+  CardTitle,
+  CardDescription,
+  CardContent,
+  CardFooter,
+  Button,
+  Input,
+  Field,
+  FieldLabel,
+  FieldError,
+  FieldGroup,
+  SmartFileInput,
+  Badge,
+} from "@edr/ui-common";
+import { cn } from "@/lib/utils";
+
+type SettingsTab =
+  | "company"
+  | "contact"
+  | "gm"
+  | "poa"
+  | "documents";
+
+const settingsSchema = z.object({
+  companyName: z.string().min(1, "Company name is required"),
+  companyEmail: z.string().email("Invalid email address"),
+  companyPhone: z.string().min(1, "Company phone is required"),
+  companyPhoneCountryCode: z.string().min(1, "Country code is required"),
+  companyLocation: z.string().min(1, "Location is required"),
+  companyAddress: z.string().min(1, "Address is required"),
+  tinNumber: z.string().length(10, "TIN must be exactly 10 digits"),
+  fanNumber: z.string().length(16, "FAN must be exactly 16 digits"),
+  contactPersonName: z.string().min(1, "Contact person name is required"),
+  contactPersonPhone: z.string().min(1, "Contact person phone is required"),
+  contactPersonPhoneCountryCode: z.string().min(1, "Country code is required"),
+  generalManagerName: z.string().min(1, "GM name is required"),
+  generalManagerEmail: z.string().email("Invalid GM email"),
+  generalManagerPhone: z.string().min(1, "GM phone is required"),
+  generalManagerPhoneCountryCode: z.string().min(1, "Country code is required"),
+  poaName: z.string().optional(),
+  poaEmail: z.string().optional(),
+  poaPhone: z.string().optional(),
+  poaPhoneCountryCode: z.string().optional(),
+  poaLocation: z.string().optional(),
+  poaAddress: z.string().optional(),
+});
+
+type FormData = z.infer<typeof settingsSchema>;
+
+const TABS: { id: SettingsTab; label: string; icon: React.ReactNode }[] = [
+  { id: "company", label: "Company Profile", icon: <Building2 className="size-4" /> },
+  { id: "contact", label: "Contact Person", icon: <User className="size-4" /> },
+  { id: "gm", label: "General Manager", icon: <Briefcase className="size-4" /> },
+  { id: "poa", label: "Power of Attorney", icon: <UserCheck className="size-4" /> },
+  { id: "documents", label: "Documents", icon: <FileCheck className="size-4" /> },
+];
+
+function splitPhone(fullPhone?: string | null): { code: string; number: string } {
+  if (!fullPhone) return { code: "+251", number: "" };
+  const match = fullPhone.match(/^(\+\d{1,3})(.*)$/);
+  if (match) return { code: match[1], number: match[2] };
+  return { code: "+251", number: fullPhone };
+}
+
+export default function SettingsPage() {
+  const queryClient = useQueryClient();
+  const [searchParams, setSearchParams] = useSearchParams();
+  const tab = (searchParams.get("tab") as SettingsTab) || "company";
+  const setTab = (t: SettingsTab) => {
+    setSearchParams((prev) => {
+      const next = new URLSearchParams(prev);
+      next.set("tab", t);
+      return next;
+    }, { replace: true });
+  };
+  const [documentFiles, setDocumentFiles] = useState<
+    Record<string, File | File[] | null>
+  >({});
+
+  const profileQuery = useQuery(
+    api.companies.getProfile.queryOptions(),
+  );
+
+  const docSettingQuery = useQuery(
+    api.fileUploadSettings.getByCode.queryOptions({
+      input: { code: "customer_documents" },
+      enabled: tab === "documents",
+    }),
+  );
+
+  const profile = profileQuery.data;
+
+  const defaultValues = useMemo((): FormData => {
+    if (!profile) {
+      return {
+        companyName: "",
+        companyEmail: "",
+        companyPhone: "",
+        companyPhoneCountryCode: "+251",
+        companyLocation: "",
+        companyAddress: "",
+        tinNumber: "",
+        fanNumber: "",
+        contactPersonName: "",
+        contactPersonPhone: "",
+        contactPersonPhoneCountryCode: "+251",
+        generalManagerName: "",
+        generalManagerEmail: "",
+        generalManagerPhone: "",
+        generalManagerPhoneCountryCode: "+251",
+        poaName: "",
+        poaEmail: "",
+        poaPhone: "",
+        poaPhoneCountryCode: "+251",
+        poaLocation: "",
+        poaAddress: "",
+      };
+    }
+    const contactPhone = splitPhone(profile.contactPersonPhone);
+    const gmPhone = splitPhone(profile.generalManagerPhone);
+    const poaPhone = splitPhone(profile.poaPhone);
+    return {
+      companyName: profile.companyName,
+      companyEmail: profile.companyEmail ?? "",
+      companyPhone: profile.companyPhone ?? "",
+      companyPhoneCountryCode: splitPhone(profile.companyPhone).code,
+      companyLocation: profile.companyLocation,
+      companyAddress: profile.companyAddress ?? "",
+      tinNumber: profile.tinNumber,
+      fanNumber: profile.fanNumber ?? "",
+      contactPersonName: profile.contactPersonName ?? "",
+      contactPersonPhone: contactPhone.number,
+      contactPersonPhoneCountryCode: contactPhone.code,
+      generalManagerName: profile.generalManagerName ?? "",
+      generalManagerEmail: profile.generalManagerEmail ?? "",
+      generalManagerPhone: gmPhone.number,
+      generalManagerPhoneCountryCode: gmPhone.code,
+      poaName: profile.poaName ?? "",
+      poaEmail: profile.poaEmail ?? "",
+      poaPhone: poaPhone.number,
+      poaPhoneCountryCode: poaPhone.code,
+      poaLocation: profile.poaLocation ?? "",
+      poaAddress: profile.poaAddress ?? "",
+    };
+  }, [profile]);
+
+  const {
+    register,
+    handleSubmit,
+    reset,
+    formState: { errors, isDirty },
+  } = useForm<FormData>({
+    resolver: zodResolver(settingsSchema),
+    values: defaultValues,
+  });
+
+  const updateMutation = useMutation({
+    mutationFn: (data: FormData) =>
+      api.companies.updateProfile.call({
+        companyName: data.companyName,
+        companyEmail: data.companyEmail,
+        companyPhone: `${data.companyPhoneCountryCode}${data.companyPhone}`,
+        companyLocation: data.companyLocation,
+        companyAddress: data.companyAddress,
+        tin: data.tinNumber,
+        fanNumber: data.fanNumber,
+        contactPersonName: data.contactPersonName,
+        contactPersonPhone: `${data.contactPersonPhoneCountryCode}${data.contactPersonPhone}`,
+        generalManagerName: data.generalManagerName,
+        generalManagerEmail: data.generalManagerEmail,
+        generalManagerPhone: `${data.generalManagerPhoneCountryCode}${data.generalManagerPhone}`,
+        poaName: data.poaName || undefined,
+        poaPhone:
+          data.poaPhone && data.poaPhoneCountryCode
+            ? `${data.poaPhoneCountryCode}${data.poaPhone}`
+            : undefined,
+        poaEmail: data.poaEmail || undefined,
+        poaLocation: data.poaLocation || undefined,
+        poaAddress: data.poaAddress || undefined,
+      }),
+    onSuccess: () => {
+      queryClient.invalidateQueries({
+        queryKey: api.companies.getProfile.queryKey(),
+      });
+    },
+  });
+
+  const docUploadMutation = useMutation({
+    mutationFn: (files: Record<string, File | File[] | null>) =>
+      companiesService.uploadDocuments(profile!.companyId, files),
+    onSuccess: () => {
+      queryClient.invalidateQueries({
+        queryKey: api.companies.getProfile.queryKey(),
+      });
+    },
+  });
+
+  const isPending = profileQuery.isPending || updateMutation.isPending || docUploadMutation.isPending;
+
+  if (profileQuery.isPending) {
+    return (
+      <div className="flex h-full items-center justify-center">
+        <div className="h-8 w-8 animate-spin rounded-full border-b-2 border-primary" />
+      </div>
+    );
+  }
+
+  if (!profile) {
+    return (
+      <div className="flex h-full items-center justify-center">
+        <p className="text-muted-foreground">No company profile found.</p>
+      </div>
+    );
+  }
+
+  const onSubmit = (data: FormData) => {
+    updateMutation.mutate(data);
+  };
+
+  return (
+    <div className="px-4 py-8">
+      <div className="mb-8 flex items-center justify-between">
+        <div>
+          <h1 className="text-2xl font-black tracking-tight text-foreground">
+            Account Settings
+          </h1>
+          <p className="mt-1 text-sm text-muted-foreground">
+            Manage your company profile, personnel, and documents
+          </p>
+        </div>
+        <Badge variant="secondary" className="font-bold uppercase tracking-wider">
+          Verified
+        </Badge>
+      </div>
+
+      {/* Tab Bar */}
+      <div className="mb-6 flex flex-wrap gap-1 border-b border-border">
+        {TABS.map((t) => (
+          <button
+            key={t.id}
+            type="button"
+            onClick={() => setTab(t.id)}
+            className={cn(
+              "flex items-center gap-2 border-b-2 px-4 py-3 text-sm font-semibold transition-colors",
+              tab === t.id
+                ? "border-primary text-primary"
+                : "border-transparent text-muted-foreground hover:text-foreground",
+            )}
+          >
+            {t.icon}
+            {t.label}
+          </button>
+        ))}
+      </div>
+
+      <form onSubmit={handleSubmit(onSubmit)}>
+        <Card>
+          <CardHeader>
+            <CardTitle className="flex items-center gap-2">
+              {tab === "company" && <><Building2 className="size-5 text-primary" /> Company Profile</>}
+              {tab === "contact" && <><User className="size-5 text-primary" /> Contact Person</>}
+              {tab === "gm" && <><Briefcase className="size-5 text-primary" /> General Manager</>}
+              {tab === "poa" && <><UserCheck className="size-5 text-accent" /> Power of Attorney</>}
+              {tab === "documents" && <><FileCheck className="size-5 text-primary" /> Documents</>}
+            </CardTitle>
+            <CardDescription>
+              {tab === "company" && "Edit your company registration details"}
+              {tab === "contact" && "Manage the primary contact person for your account"}
+              {tab === "gm" && "Manage the general manager information"}
+              {tab === "poa" && "Power of Attorney details are optional"}
+              {tab === "documents" && "Upload and manage required business documents"}
+            </CardDescription>
+          </CardHeader>
+
+          <CardContent>
+            <FieldGroup className="gap-4">
+              {/* Company Profile Tab */}
+              {tab === "company" && (
+                <>
+                  <Field data-invalid={Boolean(errors.companyName)}>
+                    <FieldLabel>Company Name</FieldLabel>
+                    <Input
+                      placeholder="Global Logistics Ltd"
+                      aria-invalid={Boolean(errors.companyName)}
+                      {...register("companyName")}
+                    />
+                    <FieldError errors={[errors.companyName]} />
+                  </Field>
+
+                  <div className="grid grid-cols-2 gap-4">
+                    <Field data-invalid={Boolean(errors.companyEmail)}>
+                      <FieldLabel>Company Email</FieldLabel>
+                      <Input
+                        type="email"
+                        placeholder="ops@company.com"
+                        aria-invalid={Boolean(errors.companyEmail)}
+                        {...register("companyEmail")}
+                      />
+                      <FieldError errors={[errors.companyEmail]} />
+                    </Field>
+
+                    <PhoneInput
+                      countryCode={{ ...register("companyPhoneCountryCode") }}
+                      phone={{
+                        ...register("companyPhone"),
+                        placeholder: "912345678",
+                      }}
+                      countryCodeError={errors.companyPhoneCountryCode}
+                      phoneError={errors.companyPhone}
+                      label="Company Phone"
+                    />
+                  </div>
+
+                  <div className="grid grid-cols-2 gap-4">
+                    <Field data-invalid={Boolean(errors.companyLocation)}>
+                      <FieldLabel>Location</FieldLabel>
+                      <Input
+                        placeholder="Addis Ababa, Ethiopia"
+                        aria-invalid={Boolean(errors.companyLocation)}
+                        {...register("companyLocation")}
+                      />
+                      <FieldError errors={[errors.companyLocation]} />
+                    </Field>
+
+                    <Field data-invalid={Boolean(errors.companyAddress)}>
+                      <FieldLabel>Address</FieldLabel>
+                      <Input
+                        placeholder="Bole Subcity, Woreda 03"
+                        aria-invalid={Boolean(errors.companyAddress)}
+                        {...register("companyAddress")}
+                      />
+                      <FieldError errors={[errors.companyAddress]} />
+                    </Field>
+                  </div>
+
+                  <div className="grid grid-cols-2 gap-4">
+                    <Field data-invalid={Boolean(errors.tinNumber)}>
+                      <FieldLabel>TIN Number (10 digits)</FieldLabel>
+                      <Input
+                        placeholder="1234567890"
+                        maxLength={10}
+                        aria-invalid={Boolean(errors.tinNumber)}
+                        {...register("tinNumber")}
+                      />
+                      <FieldError errors={[errors.tinNumber]} />
+                    </Field>
+
+                    <Field data-invalid={Boolean(errors.fanNumber)}>
+                      <FieldLabel>FAN Number (16 digits)</FieldLabel>
+                      <Input
+                        placeholder="1234567890123456"
+                        maxLength={16}
+                        aria-invalid={Boolean(errors.fanNumber)}
+                        {...register("fanNumber")}
+                      />
+                      <FieldError errors={[errors.fanNumber]} />
+                    </Field>
+                  </div>
+                </>
+              )}
+
+              {/* Contact Person Tab */}
+              {tab === "contact" && (
+                <>
+                  <Field data-invalid={Boolean(errors.contactPersonName)}>
+                    <FieldLabel>Full Name</FieldLabel>
+                    <Input
+                      placeholder="Jane Smith"
+                      aria-invalid={Boolean(errors.contactPersonName)}
+                      {...register("contactPersonName")}
+                    />
+                    <FieldError errors={[errors.contactPersonName]} />
+                  </Field>
+
+                  <PhoneInput
+                    countryCode={{ ...register("contactPersonPhoneCountryCode") }}
+                    phone={{
+                      ...register("contactPersonPhone"),
+                      placeholder: "912345678",
+                    }}
+                    countryCodeError={errors.contactPersonPhoneCountryCode}
+                    phoneError={errors.contactPersonPhone}
+                    label="Phone Number"
+                  />
+                </>
+              )}
+
+              {/* General Manager Tab */}
+              {tab === "gm" && (
+                <>
+                  <Field data-invalid={Boolean(errors.generalManagerName)}>
+                    <FieldLabel>Full Name</FieldLabel>
+                    <Input
+                      placeholder="Abebe Bikila"
+                      aria-invalid={Boolean(errors.generalManagerName)}
+                      {...register("generalManagerName")}
+                    />
+                    <FieldError errors={[errors.generalManagerName]} />
+                  </Field>
+
+                  <div className="grid grid-cols-2 gap-4">
+                    <Field data-invalid={Boolean(errors.generalManagerEmail)}>
+                      <FieldLabel>Email Address</FieldLabel>
+                      <Input
+                        type="email"
+                        placeholder="gm@company.com"
+                        aria-invalid={Boolean(errors.generalManagerEmail)}
+                        {...register("generalManagerEmail")}
+                      />
+                      <FieldError errors={[errors.generalManagerEmail]} />
+                    </Field>
+
+                    <PhoneInput
+                      countryCode={{ ...register("generalManagerPhoneCountryCode") }}
+                      phone={{
+                        ...register("generalManagerPhone"),
+                        placeholder: "912345678",
+                      }}
+                      countryCodeError={errors.generalManagerPhoneCountryCode}
+                      phoneError={errors.generalManagerPhone}
+                      label="Phone Number"
+                    />
+                  </div>
+                </>
+              )}
+
+              {/* Power of Attorney Tab */}
+              {tab === "poa" && (
+                <>
+                  <p className="text-sm text-muted-foreground">
+                    Power of Attorney details are optional. Fill them in if you have
+                    an authorized representative, or leave blank.
+                  </p>
+
+                  <Field data-invalid={Boolean(errors.poaName)}>
+                    <FieldLabel>PoA Full Name</FieldLabel>
+                    <Input
+                      placeholder="Authorized Representative Name"
+                      aria-invalid={Boolean(errors.poaName)}
+                      {...register("poaName")}
+                    />
+                    <FieldError errors={[errors.poaName]} />
+                  </Field>
+
+                  <div className="grid grid-cols-2 gap-4">
+                    <Field data-invalid={Boolean(errors.poaEmail)}>
+                      <FieldLabel>PoA Email</FieldLabel>
+                      <Input
+                        type="email"
+                        placeholder="poa@company.com"
+                        aria-invalid={Boolean(errors.poaEmail)}
+                        {...register("poaEmail")}
+                      />
+                      <FieldError errors={[errors.poaEmail]} />
+                    </Field>
+
+                    <PhoneInput
+                      countryCode={{ ...register("poaPhoneCountryCode") }}
+                      phone={{ ...register("poaPhone"), placeholder: "912345678" }}
+                      label="PoA Phone"
+                      countryCodeError={errors.poaPhoneCountryCode}
+                      phoneError={errors.poaPhone}
+                    />
+                  </div>
+
+                  <div className="grid grid-cols-2 gap-4">
+                    <Field data-invalid={Boolean(errors.poaLocation)}>
+                      <FieldLabel>PoA Location</FieldLabel>
+                      <Input
+                        placeholder="City, Country"
+                        aria-invalid={Boolean(errors.poaLocation)}
+                        {...register("poaLocation")}
+                      />
+                      <FieldError errors={[errors.poaLocation]} />
+                    </Field>
+
+                    <Field data-invalid={Boolean(errors.poaAddress)}>
+                      <FieldLabel>PoA Address</FieldLabel>
+                      <Input
+                        placeholder="Full Address"
+                        aria-invalid={Boolean(errors.poaAddress)}
+                        {...register("poaAddress")}
+                      />
+                      <FieldError errors={[errors.poaAddress]} />
+                    </Field>
+                  </div>
+                </>
+              )}
+
+              {/* Documents Tab */}
+              {tab === "documents" && (
+                <>
+                  {docSettingQuery.isLoading ? (
+                    <div className="flex items-center justify-center py-8">
+                      <Loader2 className="size-6 animate-spin text-muted-foreground" />
+                    </div>
+                  ) : !docSettingQuery.data ? (
+                    <p className="text-sm text-muted-foreground text-center py-4">
+                      No document requirements configured for your account.
+                    </p>
+                  ) : (
+                    <SmartFileInput
+                      file={docSettingQuery.data}
+                      value={documentFiles}
+                      onChange={setDocumentFiles}
+                    />
+                  )}
+
+                  {docSettingQuery.data && (
+                    <div className="flex items-center justify-between pt-4">
+                      <div className="flex items-center gap-2">
+                        {docUploadMutation.isSuccess && (
+                          <span className="flex items-center gap-1.5 text-sm font-medium text-emerald-600">
+                            <CheckCircle2 className="size-4" />
+                            Documents uploaded successfully
+                          </span>
+                        )}
+                        {docUploadMutation.isError && (
+                          <span className="flex items-center gap-1.5 text-sm font-medium text-red-600">
+                            <XCircle className="size-4" />
+                            Upload failed
+                          </span>
+                        )}
+                      </div>
+                      <Button
+                        type="button"
+                        onClick={() => docUploadMutation.mutate(documentFiles)}
+                        disabled={docUploadMutation.isPending}
+                      >
+                        {docUploadMutation.isPending ? (
+                          <>
+                            <Loader2 className="size-4 animate-spin" />
+                            Uploading...
+                          </>
+                        ) : (
+                          <>
+                            <UploadCloud className="size-4" />
+                            Upload Documents
+                          </>
+                        )}
+                      </Button>
+                    </div>
+                  )}
+                </>
+              )}
+            </FieldGroup>
+          </CardContent>
+
+          {tab !== "documents" && (
+            <CardFooter className="flex items-center justify-between gap-4 border-t border-border px-6 py-4">
+              <div className="flex items-center gap-2">
+                {updateMutation.isSuccess && (
+                  <span className="flex items-center gap-1.5 text-sm font-medium text-emerald-600">
+                    <CheckCircle2 className="size-4" />
+                    Saved successfully
+                  </span>
+                )}
+                {updateMutation.isError && (
+                  <span className="flex items-center gap-1.5 text-sm font-medium text-red-600">
+                    <XCircle className="size-4" />
+                    Save failed
+                  </span>
+                )}
+              </div>
+              <div className="flex items-center gap-3">
+                <Button
+                  type="button"
+                  variant="outline"
+                  disabled={isPending || !isDirty}
+                  onClick={() => reset()}
+                >
+                  Reset
+                </Button>
+                <Button type="submit" disabled={isPending}>
+                  {updateMutation.isPending ? (
+                    <>
+                      <Loader2 className="size-4 animate-spin" />
+                      Saving...
+                    </>
+                  ) : (
+                    <>
+                      <Save className="size-4" />
+                      Save Changes
+                    </>
+                  )}
+                </Button>
+              </div>
+            </CardFooter>
+          )}
+        </Card>
+      </form>
+    </div>
+  );
+}

apps/edr-freight-web/portal/src/pages/accounts/CompanyProfileForm.tsx

@@ -14,10 +14,8 @@ import {
   ChevronLeft,
   UploadCloud,
 } from "lucide-react";
-import type { OnboardingUserType } from "./types";
 import type { AuthUser } from "@/types/auth";
 import type { CreateCompanyPayload } from "@/services/companies.service";
-import type { FileUploadSetting } from "@/types/fileUploadSettings";
 import PhoneInput from "@/components/auth/PhoneInput";
 import {
   Button,
@@ -30,7 +28,7 @@ import {
 } from "@edr/ui-common";
 import { api } from "@/services/api";
 
-type CompanyStep = "company" | "personnel" | "poa" | "documents";
+type CompanyStep = "company" | "personnel" | "poa" | "documents" | "confirm";
 
 const onboardingSchema = z.object({
   companyName: z.string().min(1, "Company name is required"),
@@ -85,6 +83,7 @@ const stepFields: Record<CompanyStep, (keyof FormData)[]> = {
   ],
   poa: [],
   documents: [],
+  confirm: [],
 };
 
 function buildPayload(data: FormData, _user: AuthUser): CreateCompanyPayload {
@@ -116,26 +115,34 @@ function buildPayload(data: FormData, _user: AuthUser): CreateCompanyPayload {
 }
 
 export default function CompanyProfileForm({
-  userType,
+  documentSettingCode,
+  documentFiles: controlledFiles,
+  onDocumentFilesChange,
   user,
   onSubmit,
   isPending,
   onBack,
 }: {
-  userType: OnboardingUserType;
+  documentSettingCode: string;
+  documentFiles?: Record<string, File | File[] | null>;
+  onDocumentFilesChange?: (
+    files: Record<string, File | File[] | null>,
+  ) => void;
   user: AuthUser;
   onSubmit: (data: CreateCompanyPayload) => void;
   isPending: boolean;
   onBack: () => void;
 }) {
   const [step, setStep] = useState<CompanyStep>("company");
-  const [documentFiles, setDocumentFiles] = useState<
+  const [internalFiles, setInternalFiles] = useState<
     Record<string, File | File[] | null>
   >({});
+  const documentFiles = controlledFiles ?? internalFiles;
+  const setDocumentFiles = onDocumentFilesChange ?? setInternalFiles;
 
-  const { data: uploadSettings = [], isLoading: loadingDocuments } = useQuery(
-    api.fileUploadSettings.getByEntity.queryOptions({
-      input: { entity: "customer" },
+  const { data: uploadSetting, isLoading: loadingDocuments } = useQuery(
+    api.fileUploadSettings.getByCode.queryOptions({
+      input: { code: documentSettingCode },
       refetchOnMount: false,
     }),
   );
@@ -144,6 +151,7 @@ export default function CompanyProfileForm({
     register,
     handleSubmit,
     trigger,
+    watch,
     formState: { errors },
   } = useForm<FormData>({
     resolver: zodResolver(onboardingSchema),
@@ -173,18 +181,20 @@ export default function CompanyProfileForm({
     },
   });
 
-  const hasDocuments = uploadSettings.length > 0;
+  const formValues = watch();
+  const hasDocuments = Boolean(uploadSetting?.fields?.length);
+  const totalSteps = 5;
 
   const nextStep = async () => {
     if (step === "poa") {
-      if (hasDocuments) {
-        setStep("documents");
-      } else {
-        handleSubmit((data) => onSubmit(buildPayload(data, user)))();
-      }
+      setStep("documents");
       return;
     }
     if (step === "documents") {
+      setStep("confirm");
+      return;
+    }
+    if (step === "confirm") {
       handleSubmit((data) => onSubmit(buildPayload(data, user)))();
       return;
     }
@@ -201,8 +211,10 @@ export default function CompanyProfileForm({
       setStep("company");
     } else if (step === "poa") {
       setStep("personnel");
-    } else {
+    } else if (step === "documents") {
       setStep("poa");
+    } else {
+      setStep("documents");
     }
   };
 
@@ -228,31 +240,41 @@ export default function CompanyProfileForm({
           <StepIcon
             icon={<User className="size-5" />}
             active={step === "personnel"}
-            completed={step === "poa"}
+            completed={
+              step === "poa" || step === "documents" || step === "confirm"
+            }
           />
           <StepIcon
             icon={<FileText className="size-5" />}
             active={step === "poa"}
-            completed={hasDocuments ? step === "documents" : step === "personnel"}
+            completed={step === "documents" || step === "confirm"}
+          />
+          <StepIcon
+            icon={<UploadCloud className="size-5" />}
+            active={step === "documents"}
+            completed={step === "confirm"}
+          />
+          <StepIcon
+            icon={<CheckCircle2 className="size-5" />}
+            active={step === "confirm"}
+            completed={false}
           />
-          {hasDocuments && (
-            <StepIcon
-              icon={<UploadCloud className="size-5" />}
-              active={step === "documents"}
-              completed={false}
-            />
-          )}
         </div>
         <p className="text-center text-sm text-muted-foreground mt-3">
-          {step === "company" && `Step 1 of ${hasDocuments ? 4 : 3} — Company Information`}
-          {step === "personnel" && `Step 2 of ${hasDocuments ? 4 : 3} — Personnel Details`}
-          {step === "poa" && `Step 3 of ${hasDocuments ? 4 : 3} — Power of Attorney (Optional)`}
-          {step === "documents" && "Step 4 of 4 — Upload Documents (Optional)"}
+          {step === "company" &&
+            `Step 1 of ${totalSteps} — Company Information`}
+          {step === "personnel" &&
+            `Step 2 of ${totalSteps} — Personnel Details`}
+          {step === "poa" &&
+            `Step 3 of ${totalSteps} — Power of Attorney (Optional)`}
+          {step === "documents" &&
+            `Step 4 of ${totalSteps} — Upload Documents (Optional)`}
+          {step === "confirm" && `Step 5 of ${totalSteps} — Review & Confirm`}
         </p>
       </div>
 
       <form
-        onSubmit={handleSubmit((data) => onSubmit(buildPayload(data, user)))}
+        onSubmit={(e) => e.preventDefault()}
         className="flex flex-col gap-4"
       >
         <FieldGroup className="gap-4">
@@ -353,11 +375,6 @@ export default function CompanyProfileForm({
 
           {step === "personnel" && (
             <>
-              <p className="text-sm text-muted-foreground">
-                Personal details are pulled from your account. Contact and
-                management info is collected below.
-              </p>
-
               <div>
                 <h3 className="text-sm font-semibold text-foreground mb-3">
                   Contact Person
@@ -500,62 +517,155 @@ export default function CompanyProfileForm({
 
           {step === "documents" && (
             <>
-              <p className="text-sm text-muted-foreground">
-                Upload required documents for your registration. You can skip
-                this step and upload later from your account settings.
-              </p>
-
               {loadingDocuments ? (
                 <div className="flex items-center justify-center py-8">
                   <Loader2 className="size-6 animate-spin text-muted-foreground" />
                 </div>
-              ) : uploadSettings.length === 0 ? (
+              ) : !uploadSetting ? (
                 <p className="text-sm text-muted-foreground text-center py-4">
                   No document requirements found for your account type.
                 </p>
               ) : (
                 <div className="flex flex-col gap-6">
-                  {uploadSettings.map((setting) => (
-                    <SmartFileInput
-                      key={setting.id}
-                      file={setting}
-                      value={documentFiles}
-                      onChange={setDocumentFiles}
-                    />
-                  ))}
+                  <SmartFileInput
+                    file={uploadSetting}
+                    value={documentFiles}
+                    onChange={setDocumentFiles}
+                  />
                 </div>
               )}
             </>
           )}
+
+          {step === "confirm" && (
+            <div className="space-y-4 rounded-xl border border-border bg-card p-4">
+              <div>
+                <h3 className="text-base font-semibold text-foreground">
+                  Review your registration
+                </h3>
+                <p className="text-sm text-muted-foreground mt-1">
+                  Confirm the company details below before saving.
+                </p>
+              </div>
+
+              <div className="grid gap-3 md:grid-cols-2">
+                <ReviewRow
+                  label="Company name"
+                  value={formValues.companyName}
+                />
+                <ReviewRow
+                  label="Company email"
+                  value={formValues.companyEmail}
+                />
+                <ReviewRow
+                  label="Company phone"
+                  value={formValues.companyPhone}
+                />
+                <ReviewRow
+                  label="Location"
+                  value={formValues.companyLocation}
+                />
+                <ReviewRow label="Address" value={formValues.companyAddress} />
+                <ReviewRow label="TIN" value={formValues.tinNumber} />
+                <ReviewRow label="VAT" value={formValues.vatNumber} />
+                <ReviewRow label="FAN" value={formValues.fanNumber} />
+                <ReviewRow
+                  label="Contact person"
+                  value={formValues.contactPersonName}
+                />
+                <ReviewRow
+                  label="Contact phone"
+                  value={`${formValues.contactPersonPhoneCountryCode}${formValues.contactPersonPhone}`}
+                />
+                <ReviewRow
+                  label="General manager"
+                  value={formValues.generalManagerName}
+                />
+                <ReviewRow
+                  label="GM email"
+                  value={formValues.generalManagerEmail}
+                />
+                <ReviewRow
+                  label="GM phone"
+                  value={`${formValues.generalManagerPhoneCountryCode}${formValues.generalManagerPhone}`}
+                />
+                <ReviewRow
+                  label="PoA name"
+                  value={formValues.poaName || undefined}
+                />
+                <ReviewRow
+                  label="PoA phone"
+                  value={
+                    formValues.poaPhone && formValues.poaPhoneCountryCode
+                      ? `${formValues.poaPhoneCountryCode}${formValues.poaPhone}`
+                      : undefined
+                  }
+                />
+                <ReviewRow
+                  label="PoA email"
+                  value={formValues.poaEmail || undefined}
+                />
+                <ReviewRow
+                  label="PoA location"
+                  value={formValues.poaLocation || undefined}
+                />
+              </div>
+            </div>
+          )}
         </FieldGroup>
 
         <div className="flex items-center justify-between pt-2">
           <Button type="button" variant="outline" onClick={prevStep}>
             <ArrowLeft />
-            {step === "company" ? "Change Type" : "Back"}
+            {step === "company"
+              ? "Change Type"
+              : step === "confirm"
+                ? "Back to Documents"
+                : "Back"}
           </Button>
 
-          <Button type="button" onClick={nextStep} disabled={isPending}>
-            {isPending ? (
-              <>
-                <Loader2 className="animate-spin" />
-                Submitting...
-              </>
-            ) : step === "documents" ? (
-              "Complete Registration"
-            ) : (
-              <>
-                Next Step
-                <ArrowRight />
-              </>
-            )}
-          </Button>
+          <div className="flex items-center gap-3">
+            <Button
+              type="button"
+              onClick={step === "confirm" ? handleSubmit((data) => onSubmit(buildPayload(data, user))) : nextStep}
+              disabled={isPending || (step === "documents" && !hasDocuments && loadingDocuments)}
+            >
+              {isPending ? (
+                <>
+                  <Loader2 className="animate-spin" />
+                  Submitting...
+                </>
+              ) : step === "documents" ? (
+                "Continue"
+              ) : step === "confirm" ? (
+                "Submit Registration"
+              ) : (
+                <>
+                  Next Step
+                  <ArrowRight />
+                </>
+              )}
+            </Button>
+          </div>
         </div>
       </form>
     </>
   );
 }
 
+function ReviewRow({ label, value }: { label: string; value?: string | null }) {
+  return (
+    <div className="rounded-lg border border-border bg-muted/20 p-3">
+      <div className="text-xs font-medium uppercase tracking-wide text-muted-foreground">
+        {label}
+      </div>
+      <div className="mt-1 text-sm font-medium text-foreground">
+        {value?.trim() ? value : "Not provided"}
+      </div>
+    </div>
+  );
+}
+
 function StepIcon({
   icon,
   active,

apps/edr-freight-web/portal/src/pages/accounts/DjiboutiAgentForm.tsx

@@ -1,5 +1,6 @@
 import { useState } from "react";
 import { useForm } from "react-hook-form";
+import { useQuery } from "@tanstack/react-query";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { z } from "zod";
 import {
@@ -10,6 +11,7 @@ import {
   CheckCircle2,
   Loader2,
   ChevronLeft,
+  UploadCloud,
 } from "lucide-react";
 import type { AuthUser } from "@/types/auth";
 import type { CreateCompanyPayload } from "@/services/companies.service";
@@ -21,9 +23,11 @@ import {
   FieldLabel,
   FieldError,
   FieldGroup,
+  SmartFileInput,
 } from "@edr/ui-common";
+import { api } from "@/services/api";
 
-type DjiboutiStep = "company" | "representative";
+type DjiboutiStep = "company" | "representative" | "documents" | "confirm";
 
 const djiboutiSchema = z.object({
   companyName: z.string().min(1, "Company name is required"),
@@ -40,9 +44,23 @@ const djiboutiSchema = z.object({
 
 type FormData = z.infer<typeof djiboutiSchema>;
 
-const stepLabels: Record<DjiboutiStep, string> = {
-  company: "Step 1 of 2 — Company Information",
-  representative: "Step 2 of 2 — Representative Details",
+const stepFields: Record<DjiboutiStep, (keyof FormData)[]> = {
+  company: [
+    "companyName",
+    "companyEmail",
+    "companyPhone",
+    "companyPhoneCountryCode",
+    "companyLocation",
+    "companyAddress",
+  ],
+  representative: [
+    "repName",
+    "repEmail",
+    "repPhone",
+    "repPhoneCountryCode",
+  ],
+  documents: [],
+  confirm: [],
 };
 
 function buildPayload(data: FormData, _user: AuthUser): CreateCompanyPayload {
@@ -64,22 +82,43 @@ function buildPayload(data: FormData, _user: AuthUser): CreateCompanyPayload {
 }
 
 export default function DjiboutiAgentForm({
+  documentSettingCode,
+  documentFiles: controlledFiles,
+  onDocumentFilesChange,
   user,
   onSubmit,
   isPending,
   onBack,
 }: {
+  documentSettingCode: string;
+  documentFiles?: Record<string, File | File[] | null>;
+  onDocumentFilesChange?: (
+    files: Record<string, File | File[] | null>,
+  ) => void;
   user: AuthUser;
   onSubmit: (data: CreateCompanyPayload) => void;
   isPending: boolean;
   onBack: () => void;
 }) {
   const [step, setStep] = useState<DjiboutiStep>("company");
+  const [internalFiles, setInternalFiles] = useState<
+    Record<string, File | File[] | null>
+  >({});
+  const documentFiles = controlledFiles ?? internalFiles;
+  const setDocumentFiles = onDocumentFilesChange ?? setInternalFiles;
+
+  const { data: uploadSetting, isLoading: loadingDocuments } = useQuery(
+    api.fileUploadSettings.getByCode.queryOptions({
+      input: { code: documentSettingCode },
+      refetchOnMount: false,
+    }),
+  );
 
   const {
     register,
     handleSubmit,
     trigger,
+    watch,
     formState: { errors },
   } = useForm<FormData>({
     resolver: zodResolver(djiboutiSchema),
@@ -97,32 +136,42 @@ export default function DjiboutiAgentForm({
     },
   });
 
+  const formValues = watch();
+  const hasDocuments = Boolean(uploadSetting?.fields?.length);
+  const totalSteps = 4;
+
   const nextStep = async () => {
     if (step === "representative") {
+      setStep("documents");
+      return;
+    }
+    if (step === "documents") {
+      setStep("confirm");
+      return;
+    }
+    if (step === "confirm") {
       handleSubmit((data) => onSubmit(buildPayload(data, user)))();
       return;
     }
-    const fields: (keyof FormData)[] =
-      step === "company"
-        ? [
-            "companyName",
-            "companyEmail",
-            "companyPhone",
-            "companyPhoneCountryCode",
-            "companyLocation",
-            "companyAddress",
-          ]
-        : ["repName", "repEmail", "repPhone", "repPhoneCountryCode"];
+    const fields = stepFields[step];
     const isValid = await trigger(fields);
     if (!isValid) return;
     setStep("representative");
   };
 
+  const skipDocuments = () => {
+    setStep("confirm");
+  };
+
   const prevStep = () => {
     if (step === "company") {
       onBack();
-    } else {
+    } else if (step === "representative") {
       setStep("company");
+    } else if (step === "documents") {
+      setStep("representative");
+    } else {
+      setStep("documents");
     }
   };
 
@@ -143,21 +192,34 @@ export default function DjiboutiAgentForm({
           <StepIcon
             icon={<Building2 className="size-5" />}
             active={step === "company"}
-            completed={step === "representative"}
+            completed={step !== "company"}
           />
           <StepIcon
             icon={<UserRound className="size-5" />}
             active={step === "representative"}
+            completed={step === "documents" || step === "confirm"}
+          />
+          <StepIcon
+            icon={<UploadCloud className="size-5" />}
+            active={step === "documents"}
+            completed={step === "confirm"}
+          />
+          <StepIcon
+            icon={<CheckCircle2 className="size-5" />}
+            active={step === "confirm"}
             completed={false}
           />
         </div>
         <p className="text-center text-sm text-muted-foreground mt-3">
-          {stepLabels[step]}
+          {step === "company" && `Step 1 of ${totalSteps} — Company Information`}
+          {step === "representative" && `Step 2 of ${totalSteps} — Representative Details`}
+          {step === "documents" && `Step 3 of ${totalSteps} — Upload Documents (Optional)`}
+          {step === "confirm" && `Step 4 of ${totalSteps} — Review & Confirm`}
         </p>
       </div>
 
       <form
-        onSubmit={handleSubmit((data) => onSubmit(buildPayload(data, user)))}
+        onSubmit={(e) => e.preventDefault()}
         className="flex flex-col gap-4"
       >
         <FieldGroup className="gap-4">
@@ -262,35 +324,120 @@ export default function DjiboutiAgentForm({
               </div>
             </>
           )}
+
+          {step === "documents" && (
+            <>
+              {loadingDocuments ? (
+                <div className="flex items-center justify-center py-8">
+                  <Loader2 className="size-6 animate-spin text-muted-foreground" />
+                </div>
+              ) : !uploadSetting ? (
+                <p className="text-sm text-muted-foreground text-center py-4">
+                  No document requirements found for your account type.
+                </p>
+              ) : (
+                <div className="flex flex-col gap-6">
+                  <SmartFileInput
+                    file={uploadSetting}
+                    value={documentFiles}
+                    onChange={setDocumentFiles}
+                  />
+                </div>
+              )}
+            </>
+          )}
+
+          {step === "confirm" && (
+            <div className="space-y-4 rounded-xl border border-border bg-card p-4">
+              <div>
+                <h3 className="text-base font-semibold text-foreground">
+                  Review your registration
+                </h3>
+                <p className="text-sm text-muted-foreground mt-1">
+                  Confirm the company details below before saving.
+                </p>
+              </div>
+
+              <div className="grid gap-3 md:grid-cols-2">
+                <ReviewRow label="Company name" value={formValues.companyName} />
+                <ReviewRow label="Company email" value={formValues.companyEmail} />
+                <ReviewRow label="Company phone" value={formValues.companyPhone} />
+                <ReviewRow label="Location" value={formValues.companyLocation} />
+                <ReviewRow label="Address" value={formValues.companyAddress} />
+                <ReviewRow label="Rep. name" value={formValues.repName} />
+                <ReviewRow label="Rep. email" value={formValues.repEmail} />
+                <ReviewRow
+                  label="Rep. phone"
+                  value={`${formValues.repPhoneCountryCode}${formValues.repPhone}`}
+                />
+              </div>
+            </div>
+          )}
         </FieldGroup>
 
         <div className="flex items-center justify-between pt-2">
           <Button type="button" variant="outline" onClick={prevStep}>
             <ArrowLeft />
-            {step === "company" ? "Change Type" : "Back"}
+            {step === "company"
+              ? "Change Type"
+              : step === "confirm"
+                ? "Back to Documents"
+                : "Back"}
           </Button>
 
-          <Button type="button" onClick={nextStep} disabled={isPending}>
-            {isPending ? (
-              <>
-                <Loader2 className="animate-spin" />
-                Submitting...
-              </>
-            ) : step === "representative" ? (
-              "Complete Registration"
-            ) : (
-              <>
-                Next Step
-                <ArrowRight />
-              </>
+          <div className="flex items-center gap-3">
+            {step === "documents" && (
+              <Button
+                type="button"
+                variant="outline"
+                onClick={skipDocuments}
+                disabled={isPending}
+              >
+                Skip for now
+              </Button>
             )}
-          </Button>
+
+            <Button
+              type="button"
+              onClick={step === "confirm" ? handleSubmit((data) => onSubmit(buildPayload(data, user))) : nextStep}
+              disabled={isPending || (step === "documents" && !hasDocuments && loadingDocuments)}
+            >
+              {isPending ? (
+                <>
+                  <Loader2 className="animate-spin" />
+                  Submitting...
+                </>
+              ) : step === "documents" ? (
+                "Continue"
+              ) : step === "confirm" ? (
+                "Submit Registration"
+              ) : (
+                <>
+                  Next Step
+                  <ArrowRight />
+                </>
+              )}
+            </Button>
+          </div>
         </div>
       </form>
     </>
   );
 }
 
+function ReviewRow({ label, value }: { label: string; value?: string | null }) {
+  return (
+    <div className="rounded-lg border border-border bg-muted/20 p-3">
+      <div className="text-xs font-medium uppercase tracking-wide text-muted-foreground">
+        {label}
+      </div>
+      <div className="mt-1 text-sm font-medium text-foreground">
+        {value?.trim() ? value : "Not provided"}
+      </div>
+    </div>
+  );
+}
+
 function StepIcon({
   icon,
   active,

apps/edr-freight-web/portal/src/pages/accounts/ForwarderForm.tsx

@@ -1,6 +1,6 @@
 import { useState } from "react";
-import { useMutation, useQueryClient } from "@tanstack/react-query";
 import { useForm } from "react-hook-form";
+import { useQuery } from "@tanstack/react-query";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { z } from "zod";
 import {
@@ -11,11 +11,11 @@ import {
   FileText,
   CheckCircle2,
   Loader2,
+  ChevronLeft,
+  UploadCloud,
 } from "lucide-react";
-import useAuth from "@/hooks/useAuth";
-import { api } from "@/services/api";
-import type { CreateCustomerDto } from "@/types/customers";
-import AuthLayout from "@/components/auth/AuthLayout";
+import type { AuthUser } from "@/types/auth";
+import type { CreateCompanyPayload } from "@/services/companies.service";
 import PhoneInput from "@/components/auth/PhoneInput";
 import {
   Button,
@@ -24,14 +24,13 @@ import {
   FieldLabel,
   FieldError,
   FieldGroup,
+  SmartFileInput,
 } from "@edr/ui-common";
-import TransporterOnboarding from "./TransportrOnBoarding";
-import DjiboutiForwardingAgentForm from "./DjiboutiFreightForwardingAgent";
-import ImportExportOnBoarding from "./ImportExportOnBoarding";
+import { api } from "@/services/api";
 
-type OnboardingStep = "company" | "personnel" | "poa";
+type ForwarderStep = "company" | "personnel" | "poa" | "documents" | "confirm";
 
-const onboardingSchema = z.object({
+const forwarderSchema = z.object({
   companyName: z.string().min(1, "Company name is required"),
   companyEmail: z.string().email("Invalid email address"),
   companyPhone: z.string().min(1, "Company phone is required"),
@@ -59,9 +58,9 @@ const onboardingSchema = z.object({
   poaLocation: z.string().optional(),
 });
 
-type FormData = z.infer<typeof onboardingSchema>;
+type FormData = z.infer<typeof forwarderSchema>;
 
-const stepFields: Record<OnboardingStep, (keyof FormData)[]> = {
+const stepFields: Record<ForwarderStep, (keyof FormData)[]> = {
   company: [
     "companyName",
     "companyEmail",
@@ -83,20 +82,79 @@ const stepFields: Record<OnboardingStep, (keyof FormData)[]> = {
     "generalManagerPhoneCountryCode",
   ],
   poa: [],
+  documents: [],
+  confirm: [],
 };
 
-export default function CustomerOnboardingPage() {
-  const queryClient = useQueryClient();
-  const { user } = useAuth();
-  const [step, setStep] = useState<OnboardingStep>("company");
+function buildPayload(data: FormData, _user: AuthUser): CreateCompanyPayload {
+  return {
+    companyName: data.companyName,
+    companyEmail: data.companyEmail,
+    companyPhone: `${data.companyPhoneCountryCode}${data.companyPhone}`,
+    companyLocation: data.companyLocation,
+    companyAddress: data.companyAddress,
+    tin: data.tinNumber,
+    vatNumber: data.vatNumber,
+    fanNumber: data.fanNumber,
+    attributes: {
+      contactPersonName: data.contactPersonName,
+      contactPersonPhone: `${data.contactPersonPhoneCountryCode}${data.contactPersonPhone}`,
+      generalManagerName: data.generalManagerName,
+      generalManagerEmail: data.generalManagerEmail,
+      generalManagerPhone: `${data.generalManagerPhoneCountryCode}${data.generalManagerPhone}`,
+      poaName: data.poaName || undefined,
+      poaPhone:
+        data.poaPhone && data.poaPhoneCountryCode
+          ? `${data.poaPhoneCountryCode}${data.poaPhone}`
+          : undefined,
+      poaAddress: data.poaAddress || undefined,
+      poaEmail: data.poaEmail || undefined,
+      poaLocation: data.poaLocation || undefined,
+    },
+  };
+}
+
+export default function ForwarderForm({
+  documentSettingCode,
+  documentFiles: controlledFiles,
+  onDocumentFilesChange,
+  user,
+  onSubmit,
+  isPending,
+  onBack,
+}: {
+  documentSettingCode: string;
+  documentFiles?: Record<string, File | File[] | null>;
+  onDocumentFilesChange?: (
+    files: Record<string, File | File[] | null>,
+  ) => void;
+  user: AuthUser;
+  onSubmit: (data: CreateCompanyPayload) => void;
+  isPending: boolean;
+  onBack: () => void;
+}) {
+  const [step, setStep] = useState<ForwarderStep>("company");
+  const [internalFiles, setInternalFiles] = useState<
+    Record<string, File | File[] | null>
+  >({});
+  const documentFiles = controlledFiles ?? internalFiles;
+  const setDocumentFiles = onDocumentFilesChange ?? setInternalFiles;
+
+  const { data: uploadSetting, isLoading: loadingDocuments } = useQuery(
+    api.fileUploadSettings.getByCode.queryOptions({
+      input: { code: documentSettingCode },
+      refetchOnMount: false,
+    }),
+  );
 
   const {
     register,
     handleSubmit,
     trigger,
+    watch,
     formState: { errors },
   } = useForm<FormData>({
-    resolver: zodResolver(onboardingSchema),
+    resolver: zodResolver(forwarderSchema),
     defaultValues: {
       companyName: "",
       companyEmail: "",
@@ -123,20 +181,21 @@ export default function CustomerOnboardingPage() {
     },
   });
 
-  const createCustomerMutation = useMutation({
-    mutationFn: (payload: CreateCustomerDto) =>
-      api.customers.create.call(payload),
-    onSuccess: () => {
-      if (user)
-        queryClient.invalidateQueries({
-          queryKey: api.customers.getByUserId.queryKey({ id: user.id }),
-        });
-    },
-  });
+  const formValues = watch();
+  const hasDocuments = Boolean(uploadSetting?.fields?.length);
+  const totalSteps = 5;
 
   const nextStep = async () => {
     if (step === "poa") {
-      handleSubmit(onSubmit)();
+      setStep("documents");
+      return;
+    }
+    if (step === "documents") {
+      setStep("confirm");
+      return;
+    }
+    if (step === "confirm") {
+      handleSubmit((data) => onSubmit(buildPayload(data, user)))();
       return;
     }
     const fields = stepFields[step];
@@ -145,69 +204,36 @@ export default function CustomerOnboardingPage() {
     setStep(step === "company" ? "personnel" : "poa");
   };
 
-  const prevStep = () => {
-    if (step === "personnel") setStep("company");
-    else if (step === "poa") setStep("personnel");
+  const skipDocuments = () => {
+    setStep("confirm");
   };
 
-  const onSubmit = async (data: FormData) => {
-    const nameParts = (user?.name?.en ?? "").split(" ");
-    const payload: CreateCustomerDto = {
-      userId: user!.id,
-      firstName: nameParts[0] || "",
-      lastName: nameParts.slice(-1)[0] || "",
-      email: user!.email,
-      phone: user!.phoneNumber,
-      companyName: data.companyName,
-      companyEmail: data.companyEmail,
-      companyPhone: `${data.companyPhoneCountryCode}${data.companyPhone}`,
-      companyLocation: data.companyLocation,
-      companyAddress: data.companyAddress,
-      contactPersonName: data.contactPersonName,
-      contactPersonPhone: `${data.contactPersonPhoneCountryCode}${data.contactPersonPhone}`,
-      tinNumber: data.tinNumber,
-      vatNumber: data.vatNumber,
-      fanNumber: data.fanNumber,
-      generalManagerName: data.generalManagerName,
-      generalManagerEmail: data.generalManagerEmail,
-      generalManagerPhone: `${data.generalManagerPhoneCountryCode}${data.generalManagerPhone}`,
-      poaName: data.poaName || undefined,
-      poaPhone:
-        data.poaPhone && data.poaPhoneCountryCode
-          ? `${data.poaPhoneCountryCode}${data.poaPhone}`
-          : undefined,
-      poaAddress: data.poaAddress || undefined,
-      poaEmail: data.poaEmail || undefined,
-      poaLocation: data.poaLocation || undefined,
-    };
-    createCustomerMutation.mutate(payload);
+  const prevStep = () => {
+    if (step === "company") {
+      onBack();
+    } else if (step === "personnel") {
+      setStep("company");
+    } else if (step === "poa") {
+      setStep("personnel");
+    } else if (step === "documents") {
+      setStep("poa");
+    } else {
+      setStep("documents");
+    }
   };
 
   return (
-    <AuthLayout
-      left={{
-        badge: "Complete Your Profile",
-        title: "Set up your company profile",
-        description:
-          "Provide your business details to start using EDR Freight for managing shipments, tracking consignments, and streamlining logistics operations across Ethiopia and Djibouti.",
-        features: [
-          "Company registration details",
-          "Contact and management personnel",
-          "Power of Attorney (optional)",
-        ],
-        stats: {
-          label: "Active Customers",
-          value: "500+",
-          footer: "And growing",
-          progress: "w-[95%]",
-        },
-      }}
-    >
+    <>
+      <div className="mb-8">
+        <button
+          type="button"
+          onClick={prevStep}
+          className="mb-4 flex items-center gap-1 text-sm text-muted-foreground hover:text-foreground transition-colors"
+        >
+          <ChevronLeft className="size-4" />
+          Change account type
+        </button>
 
-      <TransporterOnboarding />
-      {/* <DjiboutiForwardingAgentForm /> */}
-      {/* <ImportExportOnBoarding /> */}
-      {/* <div className="mb-8 lg:col-span-2">
         <div className="flex items-center justify-between max-w-lg mx-auto relative px-2">
           <div className="absolute top-1/2 left-0 w-full h-0.5 bg-border -translate-y-1/2 z-0" />
           <StepIcon
@@ -218,22 +244,41 @@ export default function CustomerOnboardingPage() {
           <StepIcon
             icon={<User className="size-5" />}
             active={step === "personnel"}
-            completed={step === "poa"}
+            completed={step === "poa" || step === "documents" || step === "confirm"}
           />
           <StepIcon
             icon={<FileText className="size-5" />}
             active={step === "poa"}
+            completed={step === "documents" || step === "confirm"}
+          />
+          <StepIcon
+            icon={<UploadCloud className="size-5" />}
+            active={step === "documents"}
+            completed={step === "confirm"}
+          />
+          <StepIcon
+            icon={<CheckCircle2 className="size-5" />}
+            active={step === "confirm"}
             completed={false}
           />
         </div>
         <p className="text-center text-sm text-muted-foreground mt-3">
-          {step === "company" && "Step 1 of 3 — Company Information"}
-          {step === "personnel" && "Step 2 of 3 — Personnel Details"}
-          {step === "poa" && "Step 3 of 3 — Power of Attorney (Optional)"}
+          {step === "company" &&
+            `Step 1 of ${totalSteps} — Company Information`}
+          {step === "personnel" &&
+            `Step 2 of ${totalSteps} — Personnel Details`}
+          {step === "poa" &&
+            `Step 3 of ${totalSteps} — Power of Attorney (Optional)`}
+          {step === "documents" &&
+            `Step 4 of ${totalSteps} — Upload Documents (Optional)`}
+          {step === "confirm" && `Step 5 of ${totalSteps} — Review & Confirm`}
         </p>
-      </div> */}
+      </div>
 
-      {/* <form onSubmit={handleSubmit(onSubmit)} className="flex flex-col gap-4">
+      <form
+        onSubmit={(e) => e.preventDefault()}
+        className="flex flex-col gap-4"
+      >
         <FieldGroup className="gap-4">
           {step === "company" && (
             <>
@@ -332,11 +377,6 @@ export default function CustomerOnboardingPage() {
 
           {step === "personnel" && (
             <>
-              <p className="text-sm text-muted-foreground">
-                Personal details are pulled from your account. Contact and
-                management info is collected below.
-              </p>
-
               <div>
                 <h3 className="text-sm font-semibold text-foreground mb-3">
                   Contact Person
@@ -418,88 +458,212 @@ export default function CustomerOnboardingPage() {
           {step === "poa" && (
             <>
               <p className="text-sm text-muted-foreground">
-                Power of Attorney details are optional. Skip if not applicable.
+                Power of Attorney details are optional. Fill them in if you have
+                them, or skip to continue.
               </p>
 
-              <Field>
+              <Field data-invalid={Boolean(errors.poaName)}>
                 <FieldLabel>PoA Name</FieldLabel>
                 <Input
                   placeholder="Authorized Representative Name"
+                  aria-invalid={Boolean(errors.poaName)}
                   {...register("poaName")}
                 />
+                <FieldError errors={[errors.poaName]} />
               </Field>
 
               <div className="grid grid-cols-2 gap-4">
-                <Field>
+                <Field data-invalid={Boolean(errors.poaEmail)}>
                   <FieldLabel>PoA Email</FieldLabel>
                   <Input
                     type="email"
                     placeholder="poa@company.com"
+                    aria-invalid={Boolean(errors.poaEmail)}
                     {...register("poaEmail")}
                   />
+                  <FieldError errors={[errors.poaEmail]} />
                 </Field>
 
                 <PhoneInput
                   countryCode={{ ...register("poaPhoneCountryCode") }}
                   phone={{ ...register("poaPhone"), placeholder: "912345678" }}
                   label="PoA Phone"
+                  countryCodeError={errors.poaPhoneCountryCode}
+                  phoneError={errors.poaPhone}
                 />
               </div>
 
               <div className="grid grid-cols-2 gap-4">
-                <Field>
+                <Field data-invalid={Boolean(errors.poaLocation)}>
                   <FieldLabel>PoA Location</FieldLabel>
                   <Input
                     placeholder="City, Country"
+                    aria-invalid={Boolean(errors.poaLocation)}
                     {...register("poaLocation")}
                   />
+                  <FieldError errors={[errors.poaLocation]} />
                 </Field>
 
-                <Field>
+                <Field data-invalid={Boolean(errors.poaAddress)}>
                   <FieldLabel>PoA Address</FieldLabel>
                   <Input
                     placeholder="Full Address"
+                    aria-invalid={Boolean(errors.poaAddress)}
                     {...register("poaAddress")}
                   />
+                  <FieldError errors={[errors.poaAddress]} />
                 </Field>
               </div>
             </>
           )}
+
+          {step === "documents" && (
+            <>
+              {loadingDocuments ? (
+                <div className="flex items-center justify-center py-8">
+                  <Loader2 className="size-6 animate-spin text-muted-foreground" />
+                </div>
+              ) : !uploadSetting ? (
+                <p className="text-sm text-muted-foreground text-center py-4">
+                  No document requirements found for your account type.
+                </p>
+              ) : (
+                <div className="flex flex-col gap-6">
+                  <SmartFileInput
+                    file={uploadSetting}
+                    value={documentFiles}
+                    onChange={setDocumentFiles}
+                  />
+                </div>
+              )}
+            </>
+          )}
+
+          {step === "confirm" && (
+            <div className="space-y-4 rounded-xl border border-border bg-card p-4">
+              <div>
+                <h3 className="text-base font-semibold text-foreground">
+                  Review your registration
+                </h3>
+                <p className="text-sm text-muted-foreground mt-1">
+                  Confirm the company details below before saving.
+                </p>
+              </div>
+
+              <div className="grid gap-3 md:grid-cols-2">
+                <ReviewRow label="Company name" value={formValues.companyName} />
+                <ReviewRow label="Company email" value={formValues.companyEmail} />
+                <ReviewRow label="Company phone" value={formValues.companyPhone} />
+                <ReviewRow label="Location" value={formValues.companyLocation} />
+                <ReviewRow label="Address" value={formValues.companyAddress} />
+                <ReviewRow label="TIN" value={formValues.tinNumber} />
+                <ReviewRow label="VAT" value={formValues.vatNumber} />
+                <ReviewRow label="FAN" value={formValues.fanNumber} />
+                <ReviewRow
+                  label="Contact person"
+                  value={formValues.contactPersonName}
+                />
+                <ReviewRow
+                  label="Contact phone"
+                  value={`${formValues.contactPersonPhoneCountryCode}${formValues.contactPersonPhone}`}
+                />
+                <ReviewRow
+                  label="General manager"
+                  value={formValues.generalManagerName}
+                />
+                <ReviewRow
+                  label="GM email"
+                  value={formValues.generalManagerEmail}
+                />
+                <ReviewRow
+                  label="GM phone"
+                  value={`${formValues.generalManagerPhoneCountryCode}${formValues.generalManagerPhone}`}
+                />
+                <ReviewRow
+                  label="PoA name"
+                  value={formValues.poaName || undefined}
+                />
+                <ReviewRow
+                  label="PoA phone"
+                  value={
+                    formValues.poaPhone && formValues.poaPhoneCountryCode
+                      ? `${formValues.poaPhoneCountryCode}${formValues.poaPhone}`
+                      : undefined
+                  }
+                />
+                <ReviewRow
+                  label="PoA email"
+                  value={formValues.poaEmail || undefined}
+                />
+                <ReviewRow
+                  label="PoA location"
+                  value={formValues.poaLocation || undefined}
+                />
+              </div>
+            </div>
+          )}
         </FieldGroup>
 
         <div className="flex items-center justify-between pt-2">
-          <Button
-            type="button"
-            variant="outline"
-            onClick={prevStep}
-            disabled={step === "company"}
-          >
+          <Button type="button" variant="outline" onClick={prevStep}>
             <ArrowLeft />
-            Back
+            {step === "company"
+              ? "Change Type"
+              : step === "confirm"
+                ? "Back to Documents"
+                : "Back"}
           </Button>
 
-          <Button
-            type="button"
-            onClick={nextStep}
-            disabled={createCustomerMutation.isPending}
-          >
-            {createCustomerMutation.isPending ? (
-              <>
-                <Loader2 className="animate-spin" />
-                Submitting...
-              </>
-            ) : step === "poa" ? (
-              "Complete Registration"
-            ) : (
-              <>
-                Next Step
-                <ArrowRight />
-              </>
+          <div className="flex items-center gap-3">
+            {step === "documents" && (
+              <Button
+                type="button"
+                variant="outline"
+                onClick={skipDocuments}
+                disabled={isPending}
+              >
+                Skip for now
+              </Button>
             )}
-          </Button>
+
+            <Button
+              type="button"
+              onClick={step === "confirm" ? handleSubmit((data) => onSubmit(buildPayload(data, user))) : nextStep}
+              disabled={isPending || (step === "documents" && !hasDocuments && loadingDocuments)}
+            >
+              {isPending ? (
+                <>
+                  <Loader2 className="animate-spin" />
+                  Submitting...
+                </>
+              ) : step === "documents" ? (
+                "Continue"
+              ) : step === "confirm" ? (
+                "Submit Registration"
+              ) : (
+                <>
+                  Next Step
+                  <ArrowRight />
+                </>
+              )}
+            </Button>
+          </div>
         </div>
-      </form> */}
-    </AuthLayout>
+      </form>
+    </>
+  );
+}
+
+function ReviewRow({ label, value }: { label: string; value?: string | null }) {
+  return (
+    <div className="rounded-lg border border-border bg-muted/20 p-3">
+      <div className="text-xs font-medium uppercase tracking-wide text-muted-foreground">
+        {label}
+      </div>
+      <div className="mt-1 text-sm font-medium text-foreground">
+        {value?.trim() ? value : "Not provided"}
+      </div>
+    </div>
   );
 }
 

apps/edr-freight-web/portal/src/pages/accounts/OnboardingPage.tsx

@@ -1,5 +1,5 @@
 import { useState } from "react";
-import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import { useMutation, useQueryClient } from "@tanstack/react-query";
 import {
   ArrowDownToLine,
   ArrowUpFromLine,
@@ -10,9 +10,11 @@ import {
 } from "lucide-react";
 import useAuth from "@/hooks/useAuth";
 import { api } from "@/services/api";
+import { companiesService } from "@/services/companies.service";
 import type { CreateCompanyPayload } from "@/services/companies.service";
 import AuthLayout from "@/components/auth/AuthLayout";
 import CompanyProfileForm from "./CompanyProfileForm";
+import ForwarderForm from "./ForwarderForm";
 import DjiboutiAgentForm from "./DjiboutiAgentForm";
 import TransporterForm from "./TransporterForm";
 import type { OnboardingUserType } from "./types";
@@ -113,17 +115,21 @@ const PREFLIGHT_LEFT = {
   },
 };
 
+const DOCUMENT_SETTING_CODE_MAP: Record<OnboardingUserType, string> = {
+  importer: "company_onboarding_documents_customer",
+  exporter: "company_onboarding_documents_customer",
+  "freight-forwarder-et": "company_onboarding_documents_forwarder",
+  "freight-forwarder-dj": "company_onboarding_documents_forwarder_dj",
+  transporter: "company_onboarding_documents_transporter",
+};
+
 export default function OnboardingPage() {
   const queryClient = useQueryClient();
   const { user } = useAuth();
   const [userType, setUserType] = useState<OnboardingUserType | null>(null);
-
-  useQuery(
-    api.fileUploadSettings.getByEntity.queryOptions({
-      input: { entity: "customer" },
-      refetchOnMount: false,
-    }),
-  );
+  const [documentFiles, setDocumentFiles] = useState<
+    Record<string, File | File[] | null>
+  >({});
 
   const COMPANY_TYPE_MAP: Record<OnboardingUserType, string> = {
     importer: "customer",
@@ -136,8 +142,14 @@ export default function OnboardingPage() {
   const createCompanyMutation = useMutation({
     mutationFn: (payload: CreateCompanyPayload) =>
       api.companies.create.call(payload),
-    onSuccess: () => {
-      queryClient.invalidateQueries({
+    onSuccess: async (data) => {
+      const hasFiles = Object.values(documentFiles).some(
+        (f) => f !== null && (Array.isArray(f) ? f.length > 0 : true),
+      );
+      if (hasFiles) {
+        await companiesService.uploadDocuments(data.company.id, documentFiles);
+      }
+      await queryClient.invalidateQueries({
         queryKey: api.companies.getInfo.queryKey(),
       });
     },
@@ -237,6 +249,9 @@ export default function OnboardingPage() {
     <AuthLayout left={leftProps}>
       {userType === "transporter" ? (
         <TransporterForm
+          documentSettingCode={DOCUMENT_SETTING_CODE_MAP[userType]}
+          documentFiles={documentFiles}
+          onDocumentFilesChange={setDocumentFiles}
           user={user}
           onSubmit={handleSubmit}
           isPending={createCompanyMutation.isPending}
@@ -244,6 +259,19 @@ export default function OnboardingPage() {
         />
       ) : userType === "freight-forwarder-dj" ? (
         <DjiboutiAgentForm
+          documentSettingCode={DOCUMENT_SETTING_CODE_MAP[userType]}
+          documentFiles={documentFiles}
+          onDocumentFilesChange={setDocumentFiles}
+          user={user}
+          onSubmit={handleSubmit}
+          isPending={createCompanyMutation.isPending}
+          onBack={handleBack}
+        />
+      ) : userType === "freight-forwarder-et" ? (
+        <ForwarderForm
+          documentSettingCode={DOCUMENT_SETTING_CODE_MAP[userType]}
+          documentFiles={documentFiles}
+          onDocumentFilesChange={setDocumentFiles}
           user={user}
           onSubmit={handleSubmit}
           isPending={createCompanyMutation.isPending}
@@ -251,7 +279,9 @@ export default function OnboardingPage() {
         />
       ) : (
         <CompanyProfileForm
-          userType={userType}
+          documentSettingCode={DOCUMENT_SETTING_CODE_MAP[userType]}
+          documentFiles={documentFiles}
+          onDocumentFilesChange={setDocumentFiles}
           user={user}
           onSubmit={handleSubmit}
           isPending={createCompanyMutation.isPending}

apps/edr-freight-web/portal/src/pages/accounts/TransporterForm.tsx

@@ -1,11 +1,16 @@
+import { useState } from "react";
 import { useForm, Controller } from "react-hook-form";
+import { useQuery } from "@tanstack/react-query";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { z } from "zod";
 import {
-  Loader2,
+  ArrowRight,
+  ArrowLeft,
   ChevronLeft,
   Truck,
-  Info,
+  CheckCircle2,
+  Loader2,
+  UploadCloud,
 } from "lucide-react";
 import type { AuthUser } from "@/types/auth";
 import type { CreateCompanyPayload } from "@/services/companies.service";
@@ -20,8 +25,10 @@ import {
   SelectItem,
   SelectTrigger,
   SelectValue,
+  SmartFileInput,
 } from "@edr/ui-common";
 import { cn } from "@/lib/utils";
+import { api } from "@/services/api";
 
 const TRUCK_TYPES = [
   "Casoni",
@@ -31,6 +38,8 @@ const TRUCK_TYPES = [
   "Others",
 ] as const;
 
+type TransporterStep = "vehicle" | "documents" | "confirm";
+
 const transporterSchema = z
   .object({
     tinNumber: z.string().length(10, "TIN must be exactly 10 digits"),
@@ -45,7 +54,10 @@ const transporterSchema = z
       .regex(/^\d{4}$/, "Enter a valid year (e.g. 2023)"),
   })
   .superRefine((data, ctx) => {
-    if (data.truckType === "Casoni" && (!data.plateNumber2 || data.plateNumber2.trim().length === 0)) {
+    if (
+      data.truckType === "Casoni" &&
+      (!data.plateNumber2 || data.plateNumber2.trim().length === 0)
+    ) {
       ctx.addIssue({
         code: z.ZodIssueCode.custom,
         path: ["plateNumber2"],
@@ -77,19 +89,42 @@ function buildPayload(data: FormData, user: AuthUser): CreateCompanyPayload {
 }
 
 export default function TransporterForm({
+  documentSettingCode,
+  documentFiles: controlledFiles,
+  onDocumentFilesChange,
   user,
   onSubmit,
   isPending,
   onBack,
 }: {
+  documentSettingCode: string;
+  documentFiles?: Record<string, File | File[] | null>;
+  onDocumentFilesChange?: (
+    files: Record<string, File | File[] | null>,
+  ) => void;
   user: AuthUser;
   onSubmit: (data: CreateCompanyPayload) => void;
   isPending: boolean;
   onBack: () => void;
 }) {
+  const [step, setStep] = useState<TransporterStep>("vehicle");
+  const [internalFiles, setInternalFiles] = useState<
+    Record<string, File | File[] | null>
+  >({});
+  const documentFiles = controlledFiles ?? internalFiles;
+  const setDocumentFiles = onDocumentFilesChange ?? setInternalFiles;
+
+  const { data: uploadSetting, isLoading: loadingDocuments } = useQuery(
+    api.fileUploadSettings.getByCode.queryOptions({
+      input: { code: documentSettingCode },
+      refetchOnMount: false,
+    }),
+  );
+
   const {
     register,
     handleSubmit,
+    trigger,
     watch,
     control,
     formState: { errors },
@@ -108,187 +143,341 @@ export default function TransporterForm({
 
   const truckType = watch("truckType");
   const isCasoni = truckType === "Casoni";
+  const formValues = watch();
+  const hasDocuments = Boolean(uploadSetting?.fields?.length);
+  const totalSteps = 3;
+
+  const nextStep = async () => {
+    if (step === "documents") {
+      setStep("confirm");
+      return;
+    }
+    if (step === "confirm") {
+      handleSubmit((data) => onSubmit(buildPayload(data, user)))();
+      return;
+    }
+    const fields: (keyof FormData)[] = [
+      "tinNumber",
+      "fanNumber",
+      "truckType",
+      "plateNumber",
+      "vehicleModel",
+      "yearOfManufacturing",
+    ];
+    const isValid = await trigger(fields);
+    if (!isValid) return;
+    setStep("documents");
+  };
+
+  const skipDocuments = () => {
+    setStep("confirm");
+  };
+
+  const prevStep = () => {
+    if (step === "vehicle") {
+      onBack();
+    } else if (step === "documents") {
+      setStep("vehicle");
+    } else {
+      setStep("documents");
+    }
+  };
 
   return (
     <>
       <div className="mb-8">
         <button
           type="button"
-          onClick={onBack}
+          onClick={prevStep}
           className="mb-4 flex items-center gap-1 text-sm text-muted-foreground hover:text-foreground transition-colors"
         >
           <ChevronLeft className="size-4" />
           Change account type
         </button>
 
-        <div className="flex items-center justify-center relative px-2">
-          <div className="flex h-10 w-10 items-center justify-center rounded-full border-2 border-primary bg-background text-primary shadow-md">
-            <Truck className="size-5" />
-          </div>
+        <div className="flex items-center justify-between max-w-lg mx-auto relative px-2">
+          <div className="absolute top-1/2 left-0 w-full h-0.5 bg-border -translate-y-1/2 z-0" />
+          <StepIcon
+            icon={<Truck className="size-5" />}
+            active={step === "vehicle"}
+            completed={step !== "vehicle"}
+          />
+          <StepIcon
+            icon={<UploadCloud className="size-5" />}
+            active={step === "documents"}
+            completed={step === "confirm"}
+          />
+          <StepIcon
+            icon={<CheckCircle2 className="size-5" />}
+            active={step === "confirm"}
+            completed={false}
+          />
         </div>
         <p className="text-center text-sm text-muted-foreground mt-3">
-          Transporter Registration
+          {step === "vehicle" && `Step 1 of ${totalSteps} — Vehicle Information`}
+          {step === "documents" && `Step 2 of ${totalSteps} — Upload Documents (Optional)`}
+          {step === "confirm" && `Step 3 of ${totalSteps} — Review & Confirm`}
         </p>
       </div>
 
       <form
-        onSubmit={handleSubmit((data) => onSubmit(buildPayload(data, user)))}
+        onSubmit={(e) => e.preventDefault()}
         className="flex flex-col gap-4"
       >
-        {/* Personal Info (read-only) */}
-        <div className="rounded-lg bg-muted/30 p-4 text-sm text-muted-foreground">
-          <div className="flex items-center gap-2 mb-2">
-            <Info className="size-4" />
-            <span className="font-medium text-foreground">Account Holder</span>
+        {step === "vehicle" && (
+          <>
+            <div className="grid grid-cols-2 gap-4">
+              <Field data-invalid={Boolean(errors.tinNumber)}>
+                <FieldLabel>TIN Number (10 digits)</FieldLabel>
+                <Input
+                  placeholder="1234567890"
+                  maxLength={10}
+                  aria-invalid={Boolean(errors.tinNumber)}
+                  {...register("tinNumber")}
+                />
+                <FieldError errors={[errors.tinNumber]} />
+              </Field>
+
+              <Field data-invalid={Boolean(errors.fanNumber)}>
+                <FieldLabel>FAN Number (16 digits)</FieldLabel>
+                <Input
+                  placeholder="1234567890123456"
+                  maxLength={16}
+                  aria-invalid={Boolean(errors.fanNumber)}
+                  {...register("fanNumber")}
+                />
+                <FieldError errors={[errors.fanNumber]} />
+              </Field>
+            </div>
+
+            <hr className="border-border" />
+
+            <h3 className="text-sm font-semibold text-foreground">
+              Vehicle / Truck Information
+            </h3>
+
+            <Controller
+              name="truckType"
+              control={control}
+              render={({ field, fieldState }) => (
+                <Field data-invalid={Boolean(fieldState.error)}>
+                  <FieldLabel>Truck Type</FieldLabel>
+                  <Select value={field.value} onValueChange={field.onChange}>
+                    <SelectTrigger
+                      className={cn(
+                        "w-full",
+                        fieldState.error ? "border-destructive!" : "",
+                      )}
+                      aria-invalid={Boolean(fieldState.error)}
+                    >
+                      <SelectValue placeholder="Select truck type..." />
+                    </SelectTrigger>
+                    <SelectContent>
+                      {TRUCK_TYPES.map((type) => (
+                        <SelectItem key={type} value={type}>
+                          {type}
+                        </SelectItem>
+                      ))}
+                    </SelectContent>
+                  </Select>
+                  <FieldError errors={[fieldState.error]} />
+                </Field>
+              )}
+            />
+
+            <div className="grid grid-cols-2 gap-4">
+              <Field data-invalid={Boolean(errors.plateNumber)}>
+                <FieldLabel>Plate Number{isCasoni ? " (Front)" : ""}</FieldLabel>
+                <Input
+                  placeholder={isCasoni ? "AA-12345" : "AA-12345"}
+                  aria-invalid={Boolean(errors.plateNumber)}
+                  {...register("plateNumber")}
+                />
+                <FieldError errors={[errors.plateNumber]} />
+              </Field>
+
+              {isCasoni && (
+                <Field data-invalid={Boolean(errors.plateNumber2)}>
+                  <FieldLabel>Plate Number (Trailer)</FieldLabel>
+                  <Input
+                    placeholder="AA-67890"
+                    aria-invalid={Boolean(errors.plateNumber2)}
+                    {...register("plateNumber2")}
+                  />
+                  <FieldError errors={[errors.plateNumber2]} />
+                </Field>
+              )}
+
+              {!isCasoni && (
+                <Field data-invalid={Boolean(errors.vehicleModel)}>
+                  <FieldLabel>Vehicle Model</FieldLabel>
+                  <Input
+                    placeholder="Isuzu FVR 2024"
+                    aria-invalid={Boolean(errors.vehicleModel)}
+                    {...register("vehicleModel")}
+                  />
+                  <FieldError errors={[errors.vehicleModel]} />
+                </Field>
+              )}
+            </div>
+
+            <div className="grid grid-cols-2 gap-4">
+              {isCasoni && (
+                <Field data-invalid={Boolean(errors.vehicleModel)}>
+                  <FieldLabel>Vehicle Model</FieldLabel>
+                  <Input
+                    placeholder="Isuzu FVR 2024"
+                    aria-invalid={Boolean(errors.vehicleModel)}
+                    {...register("vehicleModel")}
+                  />
+                  <FieldError errors={[errors.vehicleModel]} />
+                </Field>
+              )}
+
+              <Field data-invalid={Boolean(errors.yearOfManufacturing)}>
+                <FieldLabel>Year of Manufacturing</FieldLabel>
+                <Input
+                  placeholder="2023"
+                  maxLength={4}
+                  aria-invalid={Boolean(errors.yearOfManufacturing)}
+                  {...register("yearOfManufacturing")}
+                />
+                <FieldError errors={[errors.yearOfManufacturing]} />
+              </Field>
+            </div>
+          </>
+        )}
+
+        {step === "documents" && (
+          <>
+            {loadingDocuments ? (
+              <div className="flex items-center justify-center py-8">
+                <Loader2 className="size-6 animate-spin text-muted-foreground" />
+              </div>
+            ) : !uploadSetting ? (
+              <p className="text-sm text-muted-foreground text-center py-4">
+                No document requirements found for your account type.
+              </p>
+            ) : (
+              <div className="flex flex-col gap-6">
+                <SmartFileInput
+                  file={uploadSetting}
+                  value={documentFiles}
+                  onChange={setDocumentFiles}
+                />
+              </div>
+            )}
+          </>
+        )}
+
+        {step === "confirm" && (
+          <div className="space-y-4 rounded-xl border border-border bg-card p-4">
+            <div>
+              <h3 className="text-base font-semibold text-foreground">
+                Review your registration
+              </h3>
+              <p className="text-sm text-muted-foreground mt-1">
+                Confirm the details below before saving.
+              </p>
+            </div>
+
+            <div className="grid gap-3 md:grid-cols-2">
+              <ReviewRow label="TIN Number" value={formValues.tinNumber} />
+              <ReviewRow label="FAN Number" value={formValues.fanNumber} />
+              <ReviewRow label="Truck Type" value={formValues.truckType} />
+              <ReviewRow label="Plate Number" value={formValues.plateNumber} />
+              {formValues.plateNumber2 && (
+                <ReviewRow label="Plate (Trailer)" value={formValues.plateNumber2} />
+              )}
+              <ReviewRow label="Vehicle Model" value={formValues.vehicleModel} />
+              <ReviewRow label="Year" value={formValues.yearOfManufacturing} />
+            </div>
           </div>
-          <p>
-            {user.name?.en} — {user.email} — {user.phoneNumber}
-          </p>
-        </div>
-
-        <div className="grid grid-cols-2 gap-4">
-          <Field data-invalid={Boolean(errors.tinNumber)}>
-            <FieldLabel>TIN Number (10 digits)</FieldLabel>
-            <Input
-              placeholder="1234567890"
-              maxLength={10}
-              aria-invalid={Boolean(errors.tinNumber)}
-              {...register("tinNumber")}
-            />
-            <FieldError errors={[errors.tinNumber]} />
-          </Field>
-
-          <Field data-invalid={Boolean(errors.fanNumber)}>
-            <FieldLabel>FAN Number (16 digits)</FieldLabel>
-            <Input
-              placeholder="1234567890123456"
-              maxLength={16}
-              aria-invalid={Boolean(errors.fanNumber)}
-              {...register("fanNumber")}
-            />
-            <FieldError errors={[errors.fanNumber]} />
-          </Field>
-        </div>
-
-        <hr className="border-border" />
-
-        <h3 className="text-sm font-semibold text-foreground">
-          Vehicle / Truck Information
-        </h3>
-
-        <Controller
-          name="truckType"
-          control={control}
-          render={({ field, fieldState }) => (
-            <Field data-invalid={Boolean(fieldState.error)}>
-              <FieldLabel>Truck Type</FieldLabel>
-              <Select
-                value={field.value}
-                onValueChange={field.onChange}
-              >
-                <SelectTrigger
-                  className={cn(
-                    "w-full",
-                    fieldState.error ? "border-destructive!" : "",
-                  )}
-                  aria-invalid={Boolean(fieldState.error)}
-                >
-                  <SelectValue placeholder="Select truck type..." />
-                </SelectTrigger>
-                <SelectContent>
-                  {TRUCK_TYPES.map((type) => (
-                    <SelectItem key={type} value={type}>
-                      {type}
-                    </SelectItem>
-                  ))}
-                </SelectContent>
-              </Select>
-              <FieldError errors={[fieldState.error]} />
-            </Field>
-          )}
-        />
-
-        <div className="grid grid-cols-2 gap-4">
-          <Field data-invalid={Boolean(errors.plateNumber)}>
-            <FieldLabel>
-              Plate Number{isCasoni ? " (Front)" : ""}
-            </FieldLabel>
-            <Input
-              placeholder={isCasoni ? "AA-12345" : "AA-12345"}
-              aria-invalid={Boolean(errors.plateNumber)}
-              {...register("plateNumber")}
-            />
-            <FieldError errors={[errors.plateNumber]} />
-          </Field>
-
-          {isCasoni && (
-            <Field data-invalid={Boolean(errors.plateNumber2)}>
-              <FieldLabel>Plate Number (Trailer)</FieldLabel>
-              <Input
-                placeholder="AA-67890"
-                aria-invalid={Boolean(errors.plateNumber2)}
-                {...register("plateNumber2")}
-              />
-              <FieldError errors={[errors.plateNumber2]} />
-            </Field>
-          )}
-
-          {!isCasoni && (
-            <Field data-invalid={Boolean(errors.vehicleModel)}>
-              <FieldLabel>Vehicle Model</FieldLabel>
-              <Input
-                placeholder="Isuzu FVR 2024"
-                aria-invalid={Boolean(errors.vehicleModel)}
-                {...register("vehicleModel")}
-              />
-              <FieldError errors={[errors.vehicleModel]} />
-            </Field>
-          )}
-        </div>
-
-        <div className="grid grid-cols-2 gap-4">
-          {isCasoni && (
-            <Field data-invalid={Boolean(errors.vehicleModel)}>
-              <FieldLabel>Vehicle Model</FieldLabel>
-              <Input
-                placeholder="Isuzu FVR 2024"
-                aria-invalid={Boolean(errors.vehicleModel)}
-                {...register("vehicleModel")}
-              />
-              <FieldError errors={[errors.vehicleModel]} />
-            </Field>
-          )}
-
-          <Field data-invalid={Boolean(errors.yearOfManufacturing)}>
-            <FieldLabel>Year of Manufacturing</FieldLabel>
-            <Input
-              placeholder="2023"
-              maxLength={4}
-              aria-invalid={Boolean(errors.yearOfManufacturing)}
-              {...register("yearOfManufacturing")}
-            />
-            <FieldError errors={[errors.yearOfManufacturing]} />
-          </Field>
-        </div>
+        )}
 
         <div className="flex items-center justify-between pt-2">
-          <Button type="button" variant="outline" onClick={onBack}>
-            <ChevronLeft />
-            Change Type
+          <Button type="button" variant="outline" onClick={prevStep}>
+            <ArrowLeft />
+            {step === "vehicle"
+              ? "Change Type"
+              : step === "confirm"
+                ? "Back to Documents"
+                : "Back"}
           </Button>
 
-          <Button type="submit" disabled={isPending}>
-            {isPending ? (
-              <>
-                <Loader2 className="animate-spin" />
-                Submitting...
-              </>
-            ) : (
-              "Complete Registration"
+          <div className="flex items-center gap-3">
+            {step === "documents" && (
+              <Button
+                type="button"
+                variant="outline"
+                onClick={skipDocuments}
+                disabled={isPending}
+              >
+                Skip for now
+              </Button>
             )}
-          </Button>
+
+            <Button
+              type="button"
+              onClick={step === "confirm" ? handleSubmit((data) => onSubmit(buildPayload(data, user))) : nextStep}
+              disabled={isPending || (step === "documents" && !hasDocuments && loadingDocuments)}
+            >
+              {isPending ? (
+                <>
+                  <Loader2 className="animate-spin" />
+                  Submitting...
+                </>
+              ) : step === "documents" ? (
+                "Continue"
+              ) : step === "confirm" ? (
+                "Submit Registration"
+              ) : (
+                <>
+                  Next Step
+                  <ArrowRight />
+                </>
+              )}
+            </Button>
+          </div>
         </div>
       </form>
     </>
   );
 }
+
+function ReviewRow({ label, value }: { label: string; value?: string | null }) {
+  return (
+    <div className="rounded-lg border border-border bg-muted/20 p-3">
+      <div className="text-xs font-medium uppercase tracking-wide text-muted-foreground">
+        {label}
+      </div>
+      <div className="mt-1 text-sm font-medium text-foreground">
+        {value?.trim() ? value : "Not provided"}
+      </div>
+    </div>
+  );
+}
+
+function StepIcon({
+  icon,
+  active,
+  completed,
+}: {
+  icon: React.ReactNode;
+  active: boolean;
+  completed: boolean;
+}) {
+  return (
+    <div
+      className={`relative z-10 flex h-10 w-10 items-center justify-center rounded-full border-2 transition-all ${
+        completed
+          ? "bg-primary border-primary text-primary-foreground"
+          : active
+            ? "bg-background border-primary text-primary shadow-md"
+            : "bg-background border-border text-muted-foreground"
+      }`}
+    >
+      {completed ? <CheckCircle2 className="size-5" /> : icon}
+    </div>
+  );
+}

apps/edr-freight-web/portal/src/pages/bookings/NewBookingPage.tsx

@@ -6,14 +6,12 @@ import { useNavigate } from "react-router-dom";
 import {
   AlertCircle,
   Check,
-  CheckCircle2,
   ChevronLeft,
   ChevronRight,
   LoaderCircle,
 } from "lucide-react";
 import { Button } from "@edr/ui-common";
 import { api } from "@/services/api";
-import { Freight } from "@edr/types";
 import type { CreateBookingPayload } from "@/services/bookings.service";
 import {
   BookingFormInputValues,
@@ -32,13 +30,11 @@ import {
   Step5CargoDetails,
   Step8Review,
 } from "./new-booking-form/steps";
-import useAuth from "@/hooks/useAuth";
 
 export default function NewBookingPage() {
   const navigate = useNavigate();
   const queryClient = useQueryClient();
   const [step, setStep] = useState(1);
-  const { customer } = useAuth();
   const { data: referenceData, isLoading: refDataLoading } = useQuery(
     api.bookings.referenceData.queryOptions(),
   );
@@ -48,7 +44,7 @@ export default function NewBookingPage() {
       api.bookings.create.call(payload),
     onSuccess: (booking) => {
       queryClient.invalidateQueries({ queryKey: api.bookings.list.queryKey() });
-      setTimeout(() => navigate(`/bookings/${booking.id}`), 2500);
+      navigate(`/bookings/${booking.id}`);
     },
   });
 
@@ -132,23 +128,27 @@ export default function NewBookingPage() {
       return "";
     };
 
+    const selectedChild =
+      data.cargoType !== "container" && data.bulkCommoditytype
+        ? cargoTree
+          .find((g) => g.code.toLowerCase() === data.freightType)
+          ?.children?.find((c) => c.name === data.bulkCommoditytype)
+        : undefined;
+
     const cargoTypeId =
       data.cargoType === "container"
         ? findContainerCargoTypeId()
-        : (findCargoTypeId(
-            data.freightType === "bulk"
-              ? data.bulkCommodity
-              : data.breakBulkType,
-          ) ?? "");
+        : (findCargoTypeId(data.bulkCommoditytype) ??
+          cargoTree.find((g) => g.code.toLowerCase() === data.freightType)
+            ?.id ??
+          "");
 
     const cargoFreeText =
       data.cargoType === "container"
         ? undefined
-        : data.freightType === "bulk" && data.bulkCommodity === "Others"
-          ? data.bulkCommodityOther
-          : data.freightType === "break_bulk" && data.breakBulkType === "Others"
-            ? data.breakBulkTypeOther
-            : undefined;
+        : selectedChild?.show_free_text_box
+          ? data.bulkCommoditytype
+          : undefined;
 
     // ── Build API payload ───────────────────────────────────────────────
     const apiPayload: CreateBookingPayload = {
@@ -168,15 +168,16 @@ export default function NewBookingPage() {
           : direction === "domestic"
             ? "DOMESTIC"
             : "IMPORT",
-      freightType:
-        data.cargoType === "container"
-          ? Freight.FreightType.Container
-          : Freight.FreightType.Bulk,
       cargoTypeId: data.cargoType === "container" ? undefined : cargoTypeId,
       cargoTotalWeightVgm: totalWeight,
       isHazardous: data.isHazardous,
       paymentCurrency: "USD",
       allowConsolidation: data.consolidationEnabled,
+      // @ts-ignore
+      freightType:
+        data.cargoType === "container"
+          ? ("CONTAINER" as const)
+          : ("BULK" as const),
       containers:
         data.cargoType === "container"
           ? data.containers.map((c) => ({
@@ -185,7 +186,6 @@ export default function NewBookingPage() {
             vgmPerUnitTons: Number(c.vgm || 0),
           }))
           : [],
-      ...(customer?.company?.id ? { companyId: customer.company.id } : {}),
       ...(data.previousContractRef
         ? { previousContractId: data.previousContractRef }
         : {}),
@@ -207,26 +207,6 @@ export default function NewBookingPage() {
     createMutation.mutate(apiPayload);
   });
 
-  if (createMutation.isSuccess) {
-    return (
-      <div className="flex min-h-screen items-center justify-center p-6">
-        <div className="w-full max-w-sm rounded-2xl border border-border bg-card p-10 text-center shadow-sm">
-          <div className="mx-auto mb-4 flex h-14 w-14 items-center justify-center rounded-full bg-emerald-100">
-            <CheckCircle2 className="h-7 w-7 text-emerald-600" />
-          </div>
-          <h2 className="text-xl font-bold">Contract Submitted</h2>
-          <p className="mt-2 text-sm text-muted-foreground">
-            Your request is queued for review by EDR Line Staff. You will be
-            notified once approved.
-          </p>
-          <p className="mt-4 font-mono text-sm font-semibold text-primary">
-            {createMutation.data?.reference}
-          </p>
-        </div>
-      </div>
-    );
-  }
-
   return (
     <form
       id="new-booking-form"
@@ -245,7 +225,7 @@ export default function NewBookingPage() {
             <div className="mb-6 flex items-start gap-3 rounded-xl border border-red-200 bg-red-50 p-4 text-sm text-red-800">
               <AlertCircle className="mt-0.5 h-4 w-4 shrink-0 text-red-500" />
               <div>
-                <p className="font-semibold">Submission failed</p>
+                <p className="font-semibold">Failed to save draft</p>
                 <p className="mt-1 text-red-600">
                   {createMutation.error instanceof Error
                     ? createMutation.error.message
@@ -306,9 +286,7 @@ export default function NewBookingPage() {
               ) : (
                 <Check />
               )}
-              {createMutation.isPending
-                ? "Submitting..."
-                : "Submit Contract Request"}
+              {createMutation.isPending ? "Saving Draft..." : "Save as Draft"}
             </Button>
           )}
         </div>

apps/edr-freight-web/portal/src/pages/bookings/new-booking-form/schema.ts

@@ -1,19 +1,6 @@
 import { DeepPartial, Path } from "react-hook-form";
 import * as z from "zod";
 
-export const STATIONS = [
-  "Addis Ababa",
-  "Adama",
-  "Mojo",
-  "Awash",
-  "Mieso",
-  "Dire Dawa",
-  "Aysha",
-  "Ali Sabieh",
-  "Holhol",
-  "Djibouti City",
-] as const;
-
 export const ETHIOPIA_STATIONS = new Set<string>([
   "Addis Ababa",
   "Adama",
@@ -23,19 +10,6 @@ export const ETHIOPIA_STATIONS = new Set<string>([
   "Dire Dawa",
 ]);
 
-export const BULK_COMMODITIES = [
-  "Coffee",
-  "Beans",
-  "Fertilizer",
-  "Sugar",
-  "Oil",
-  "Livestock",
-  "Steel",
-  "Others",
-] as const;
-
-export const BREAK_BULK_TYPES = ["Machinery", "Ro-Ro", "Others"] as const;
-
 export const MOCK_VALID_CONTRACTS = [
   "EDR-2024-10001",
   "EDR-2024-10002",
@@ -43,31 +17,6 @@ export const MOCK_VALID_CONTRACTS = [
   "EDR-2022-55442",
 ];
 
-export const CONTAINER_TYPES = [
-  "Dry Container",
-  "High Cubic",
-  "Reefer Container",
-  "Open Top",
-  "Flat Rack",
-  "Tank Container",
-  "Open Side",
-] as const;
-
-export const SHIPPING_LINES = [
-  "MSC",
-  "CMA CGM",
-  "Evergreen",
-  "COSCO",
-  "Hapag-Lloyd",
-  "ONE",
-  "Yang Ming",
-  "ZIM",
-  "Messina Line",
-  "Safmarine",
-  "Wan Hai",
-  "Ethiopian Shipping Lines (ESLSE)",
-] as const;
-
 export const STEPS = [
   { id: 1, label: "Contract Type", short: "Contract" },
   { id: 2, label: "Service Type & Mile", short: "Service" },
@@ -108,11 +57,8 @@ export const bookingFormSchema = z
     shippingLine: z.string(),
     cargoType: z.enum(["container", "bulk"], "Select a cargo type."),
     cargoWeight: z.string(),
-    freightType: z.enum(["bulk", "break_bulk"]).optional(),
-    bulkCommodity: z.string(),
-    bulkCommodityOther: z.string(),
-    breakBulkType: z.string(),
-    breakBulkTypeOther: z.string(),
+    freightType: z.string(), // parent group
+    bulkCommoditytype: z.string(),
     isHazardous: z.boolean(),
     isRefrigerated: z.boolean(),
     containers: z.array(
@@ -171,42 +117,10 @@ export const bookingFormSchema = z
     (data) =>
       !(
         data.cargoType === "bulk" &&
-        data.freightType === "bulk" &&
-        !data.bulkCommodity
+        data.freightType &&
+        !data.bulkCommoditytype
       ),
-    { message: "Select a commodity.", path: ["bulkCommodity"] },
-  )
-  .refine(
-    (data) =>
-      !(
-        data.cargoType === "bulk" &&
-        data.freightType === "bulk" &&
-        data.bulkCommodity === "Others" &&
-        !data.bulkCommodityOther.trim()
-      ),
-    { message: "Specify the commodity.", path: ["bulkCommodityOther"] },
-  )
-  .refine(
-    (data) =>
-      !(
-        data.cargoType === "bulk" &&
-        data.freightType === "break_bulk" &&
-        !data.breakBulkType
-      ),
-    { message: "Select a break-bulk type.", path: ["breakBulkType"] },
-  )
-  .refine(
-    (data) =>
-      !(
-        data.cargoType === "bulk" &&
-        data.freightType === "break_bulk" &&
-        data.breakBulkType === "Others" &&
-        !data.breakBulkTypeOther.trim()
-      ),
-    {
-      message: "Specify the break-bulk type.",
-      path: ["breakBulkTypeOther"],
-    },
+    { message: "Select a commodity.", path: ["bulkCommoditytype"] },
   )
   .refine(
     (data) => {
@@ -268,10 +182,7 @@ export const initialBookingFormValues: DeepPartial<BookingFormValues> = {
   destinationYard: "",
   shippingLine: "",
   cargoWeight: "",
-  bulkCommodity: "",
-  bulkCommodityOther: "",
-  breakBulkType: "",
-  breakBulkTypeOther: "",
+  bulkCommoditytype: "",
   isHazardous: false,
   isRefrigerated: false,
   containers: [{ type: "20ft", containerType: "", qty: "1", vgm: "" }],
@@ -300,10 +211,7 @@ export const stepFields: Record<number, Array<Path<BookingFormValues>>> = {
     "cargoType",
     "cargoWeight",
     "freightType",
-    "bulkCommodity",
-    "bulkCommodityOther",
-    "breakBulkType",
-    "breakBulkTypeOther",
+    "bulkCommoditytype",
     "containers",
     "consolidationEnabled",
   ],

apps/edr-freight-web/portal/src/pages/bookings/new-booking-form/step5-cargo-details.tsx

@@ -44,8 +44,7 @@ export function Step5CargoDetails({
 }) {
   const cargoType = form.watch("cargoType");
   const freightType = form.watch("freightType");
-  const bulkCommodity = form.watch("bulkCommodity");
-  const breakBulkType = form.watch("breakBulkType");
+  const bulkCommoditytype = form.watch("bulkCommoditytype");
   const containers = form.watch("containers");
 
   const { fields, append, remove } = useFieldArray({
@@ -60,13 +59,21 @@ export function Step5CargoDetails({
     );
   }, [referenceData]);
 
-  const bulkCommodityOptions = useMemo(() => {
+  const freightTypeGroups = useMemo(() => {
     if (!referenceData?.cargo_type) return [];
-    return referenceData.cargo_type.flatMap(
-      (group) => group.children?.map((c) => c.name) ?? [],
+    return referenceData.cargo_type.filter(
+      (g) => g.code !== "CONTAINER",
     );
   }, [referenceData]);
 
+  const commodityOptions = useMemo(() => {
+    if (!referenceData?.cargo_type || !freightType) return [];
+    const group = referenceData.cargo_type.find(
+      (g) => g.code.toLowerCase() === freightType,
+    );
+    return group?.children?.map((c) => c.name) ?? [];
+  }, [referenceData, freightType]);
+
   function getOverweightAlert(
     type: "20ft" | "40ft",
     vgm: number,
@@ -122,7 +129,7 @@ export function Step5CargoDetails({
                   selected={cargoType === "container"}
                   onClick={() => {
                     field.onChange("container");
-                    form.setValue("freightType", undefined, {
+                    form.setValue("freightType", "", {
                       shouldDirty: true,
                     });
                   }}
@@ -194,82 +201,42 @@ export function Step5CargoDetails({
             render={({ field, fieldState }) => (
               <Field data-invalid={fieldState.invalid}>
                 <div className="grid gap-3 sm:grid-cols-2">
-                  <OptionCard
-                    selected={freightType === "bulk"}
-                    onClick={() => field.onChange("bulk")}
-                  >
-                    <p className="font-semibold">Bulk</p>
-                    <p className="mt-0.5 text-xs text-muted-foreground">
-                      Coffee, fertilizer, grain, ore, etc.
-                    </p>
-                  </OptionCard>
-                  <OptionCard
-                    selected={freightType === "break_bulk"}
-                    onClick={() => field.onChange("break_bulk")}
-                  >
-                    <p className="font-semibold">Break-Bulk</p>
-                    <p className="mt-0.5 text-xs text-muted-foreground">
-                      Machinery, vehicles, project cargo, etc.
-                    </p>
-                  </OptionCard>
+                  {freightTypeGroups.map((group) => {
+                    const val = group.code.toLowerCase();
+                    return (
+                      <OptionCard
+                        key={group.code}
+                        selected={freightType === val}
+                        onClick={() => {
+                          field.onChange(val);
+                          form.setValue("bulkCommoditytype", "", {
+                            shouldDirty: true,
+                          });
+                        }}
+                      >
+                        <p className="font-semibold">{group.name}</p>
+                      </OptionCard>
+                    );
+                  })}
                 </div>
                 <FieldError errors={[fieldState.error]} />
               </Field>
             )}
           />
 
-          {freightType === "bulk" && (
+          {freightType && commodityOptions.length > 0 && (
             <div className="space-y-2">
               <Controller
-                name="bulkCommodity"
+                name="bulkCommoditytype"
                 control={form.control}
                 render={({ field, fieldState }) => (
                   <SelectField
                     field={field}
                     error={fieldState.error}
-                    label="Commodity *"
-                    placeholder="Select commodity *"
-                  >
-                    {bulkCommodityOptions.map((option) => (
-                      <SelectItem key={option} value={option}>
-                        {option}
-                      </SelectItem>
-                    ))}
-                  </SelectField>
-                )}
-              />
-              {bulkCommodity === "Others" && (
-                <Controller
-                  name="bulkCommodityOther"
-                  control={form.control}
-                  render={({ field, fieldState }) => (
-                    <Field data-invalid={fieldState.invalid}>
-                      <Input
-                        {...field}
-                        aria-invalid={fieldState.invalid}
-                        placeholder="Specify commodity *"
-                      />
-                      <FieldError errors={[fieldState.error]} />
-                    </Field>
-                  )}
-                />
-              )}
-            </div>
-          )}
-
-          {freightType === "break_bulk" && (
-            <div className="space-y-2">
-              <Controller
-                name="breakBulkType"
-                control={form.control}
-                render={({ field, fieldState }) => (
-                  <SelectField
-                    field={field}
-                    error={fieldState.error}
-                    label="Break-bulk type *"
+                    label="Cargo type *"
                     placeholder="Select type *"
                   >
-                    {bulkCommodityOptions.map((option) => (
+                    {commodityOptions.map((option) => (
                       <SelectItem key={option} value={option}>
                         {option}
                       </SelectItem>
@@ -277,22 +244,6 @@ export function Step5CargoDetails({
                   </SelectField>
                 )}
               />
-              {breakBulkType === "Others" && (
-                <Controller
-                  name="breakBulkTypeOther"
-                  control={form.control}
-                  render={({ field, fieldState }) => (
-                    <Field data-invalid={fieldState.invalid}>
-                      <Input
-                        {...field}
-                        aria-invalid={fieldState.invalid}
-                        placeholder="Specify break-bulk type *"
-                      />
-                      <FieldError errors={[fieldState.error]} />
-                    </Field>
-                  )}
-                />
-              )}
             </div>
           )}
         </div>

apps/edr-freight-web/portal/src/pages/customers/customers.mock.ts

@@ -14,6 +14,7 @@ export interface Customer {
   country: string;
   address: string;
   notes: string;
+  documentsComplete: boolean;
 }
 
 const seedCustomers: Customer[] = [
@@ -30,6 +31,7 @@ const seedCustomers: Customer[] = [
     country: "Ethiopia",
     address: "Bole Road, Sub-City 03, Building 17",
     notes: "Top-tier importer. Prefers weekly invoicing.",
+    documentsComplete: false,
   },
   {
     id: 2,
@@ -44,6 +46,7 @@ const seedCustomers: Customer[] = [
     country: "Ethiopia",
     address: "Industrial Park, Zone B, Warehouse 4",
     notes: "Awaiting compliance documents.",
+    documentsComplete: false,
   },
   {
     id: 3,
@@ -58,6 +61,7 @@ const seedCustomers: Customer[] = [
     country: "Djibouti",
     address: "Port Quarter, Avenue 26, Block 9",
     notes: "Account paused since last quarter.",
+    documentsComplete: true,
   },
 ];
 
@@ -99,6 +103,7 @@ const generated: Customer[] = extras.map((entry, i) => {
     country: entry.country,
     address: `Block ${i + 1}, Street ${10 + i}, Quarter ${(i % 5) + 1}`,
     notes: `Mock customer #${id}.`,
+    documentsComplete: i % 3 === 0,
   };
 });
 

apps/edr-freight-web/portal/src/services/api.ts

@@ -8,13 +8,16 @@ import type {
   UpdateFileUploadFieldDto,
   UpdateFileUploadSettingDto,
 } from "@/types/fileUploadSettings";
-import { bookingsService, CreateBookingPayload } from "./bookings.service";
+import {
+  bookingsService,
+  CreateBookingPayload,
+  GeneratePriceResponse,
+} from "./bookings.service";
 import { consignmentsService } from "./consignments.service";
 import { trackingService } from "./tracking.service";
 import { fileUploadSettingsService } from "./fileUploadSettings.service";
 import { dropdownSettingsService } from "./dropdownSettings.service";
 import { authService } from "./auth.service";
-import { customersService } from "./customers.service";
 import { companiesService } from "./companies.service";
 import {
   CreateDropdownOptionDto,
@@ -24,15 +27,11 @@ import {
   UpdateDropdownOptionDto,
   UpdateDropdownSettingDto,
 } from "@/types/dropdownSettings";
-import {
-  CreateCustomerDto,
-  Customer,
-  UpdateCustomerDto,
-} from "@/types/customers";
 import type {
   CompanyInfoResponse,
   CreateCompanyPayload,
 } from "./companies.service";
+import type { ProfileResponse, UpdateProfilePayload } from "@/types/profile";
 import type {
   AuthUser,
   GenerateVerificationCodePayload,
@@ -89,40 +88,6 @@ export const api = {
     logout: endpoint<void, void>("auth", "logout", authService.logout),
   },
 
-  customers: {
-    list: endpoint<void, Customer[]>(
-      "customers",
-      "list",
-      customersService.list,
-    ),
-
-    get: endpoint<{ id: string }, Customer>("customers", "get", ({ id }) =>
-      customersService.getById(id),
-    ),
-
-    create: endpoint<CreateCustomerDto, Customer>(
-      "customers",
-      "create",
-      customersService.create,
-    ),
-
-    update: endpoint<{ id: string; dto: UpdateCustomerDto }, Customer>(
-      "customers",
-      "update",
-      ({ id, dto }) => customersService.update(id, dto),
-    ),
-
-    remove: endpoint<{ id: string }, void>("customers", "remove", ({ id }) =>
-      customersService.remove(id),
-    ),
-
-    getByUserId: endpoint<{ id: string }, Customer | null>(
-      "customers",
-      "getByUserId",
-      ({ id }) => customersService.getByUserId(id),
-    ),
-  },
-
   companies: {
     getInfo: endpoint<void, CompanyInfoResponse | null>(
       "companies",
@@ -135,6 +100,18 @@ export const api = {
       "create",
       companiesService.create,
     ),
+
+    getProfile: endpoint<void, ProfileResponse>(
+      "companies",
+      "getProfile",
+      companiesService.getProfile,
+    ),
+
+    updateProfile: endpoint<UpdateProfilePayload, ProfileResponse>(
+      "companies",
+      "updateProfile",
+      companiesService.updateProfile,
+    ),
   },
 
   bookings: {
@@ -165,6 +142,31 @@ export const api = {
     remove: endpoint<{ id: string }, void>("bookings", "remove", ({ id }) =>
       bookingsService.remove(id),
     ),
+
+    cancel: endpoint<{ id: string; reason: string }, Freight.IBooking>(
+      "bookings",
+      "cancel",
+      ({ id, reason }) => bookingsService.cancel(id, reason),
+    ),
+
+    generatePrice: endpoint<{ id: string }, GeneratePriceResponse>(
+      "bookings",
+      "generatePrice",
+      ({ id }) => bookingsService.generatePrice(id),
+    ),
+
+    submit: endpoint<{ id: string }, Freight.IBooking>(
+      "bookings",
+      "submit",
+      ({ id }) => bookingsService.submit(id),
+    ),
+
+    uploadDocuments: endpoint<
+      { id: string; files: Record<string, File | File[] | null> },
+      Freight.IBooking
+    >("bookings", "uploadDocuments", ({ id, files }) =>
+      bookingsService.uploadDocuments(id, files),
+    ),
   },
 
   consignments: {

apps/edr-freight-web/portal/src/services/bookings.service.ts

@@ -25,6 +25,21 @@ export interface ContractView {
   }>;
 }
 
+export interface PriceLineItem {
+  code: string;
+  description: string;
+  amount: number;
+  currency: string;
+}
+
+export interface GeneratePriceResponse {
+  bookingId: string;
+  totalAmount: number;
+  currency: string;
+  lineItems: PriceLineItem[];
+  warnings: string[];
+}
+
 export interface SignContractPayload {
   role: "CUSTOMER" | "STAFF";
   signatureImageBase64: string;
@@ -53,6 +68,42 @@ export const bookingsService = {
     await client.delete(`/api/bookings/${id}`);
   },
 
+  cancel: async (id: string, reason: string): Promise<Freight.IBooking> => {
+    const { data } = await client.post(`/api/bookings/${id}/cancel`, { reason });
+    return data.data;
+  },
+
+  generatePrice: async (id: string): Promise<GeneratePriceResponse> => {
+    const { data } = await client.post(`/api/bookings/${id}/generate-price`);
+    return data.data;
+  },
+
+  submit: async (id: string): Promise<Freight.IBooking> => {
+    const { data } = await client.post(`/api/bookings/${id}/submit`);
+    return data.data;
+  },
+
+  uploadDocuments: async (
+    id: string,
+    files: Record<string, File | File[] | null>,
+  ): Promise<Freight.IBooking> => {
+    const formData = new FormData();
+    for (const [key, fileOrFiles] of Object.entries(files)) {
+      if (!fileOrFiles) continue;
+      if (Array.isArray(fileOrFiles)) {
+        for (const f of fileOrFiles) formData.append(key, f);
+      } else {
+        formData.append(key, fileOrFiles);
+      }
+    }
+    const { data } = await client.post(
+      `/api/bookings/${id}/documents`,
+      formData,
+      { headers: { "Content-Type": "multipart/form-data" } },
+    );
+    return data.data;
+  },
+
   getContractView: async (id: string): Promise<ContractView> => {
     const { data } = await client.get(B.CONTRACT_VIEW(id));
     return data.data ?? data;

apps/edr-freight-web/portal/src/services/companies.service.ts

@@ -2,6 +2,7 @@ import { client } from "@/utils/api";
 import { unwrap } from "@/utils/endpoint";
 import { URL_CONSTANTS } from "@/constants/URLS";
 import type { ApiResponse } from "@/types/apiResponse";
+import type { ProfileResponse, UpdateProfilePayload } from "@/types/profile";
 import { isAxiosError } from "axios";
 
 export interface ExternalProfileResponse {
@@ -80,4 +81,37 @@ export const companiesService = {
     );
     return unwrap(response.data);
   },
+
+  getProfile: async (): Promise<ProfileResponse> => {
+    const response = await client.get<ApiResponse<ProfileResponse>>(
+      URL_CONSTANTS.COMPANIES_API.PROFILE,
+    );
+    return unwrap(response.data);
+  },
+
+  updateProfile: async (payload: UpdateProfilePayload): Promise<ProfileResponse> => {
+    const response = await client.patch<ApiResponse<ProfileResponse>>(
+      URL_CONSTANTS.COMPANIES_API.PROFILE,
+      payload,
+    );
+    return unwrap(response.data);
+  },
+
+  uploadDocuments: async (
+    companyId: string,
+    files: Record<string, File | File[] | null>,
+  ): Promise<void> => {
+    const formData = new FormData();
+    for (const [fieldName, fileOrFiles] of Object.entries(files)) {
+      if (!fileOrFiles) continue;
+      if (Array.isArray(fileOrFiles)) {
+        for (const f of fileOrFiles) {
+          formData.append(fieldName, f);
+        }
+      } else {
+        formData.append(fieldName, fileOrFiles);
+      }
+    }
+    await client.post(URL_CONSTANTS.COMPANIES_API.DOCUMENTS(companyId), formData);
+  },
 };

apps/edr-freight-web/portal/src/services/customers.service.ts

@@ -1,57 +0,0 @@
-import { client } from "@/utils/api";
-import { unwrap } from "@/utils/endpoint";
-import { URL_CONSTANTS } from "@/constants/URLS";
-import type { ApiResponse } from "@/types/apiResponse";
-import type {
-  CreateCustomerDto,
-  Customer,
-  UpdateCustomerDto,
-} from "@/types/customers";
-import { isAxiosError } from "axios";
-
-const BASE = URL_CONSTANTS.CUSTOMERS_API.BASE;
-
-export const customersService = {
-  list: async (): Promise<Customer[]> => {
-    const response = await client.get<ApiResponse<Customer[]>>(BASE);
-    return unwrap(response.data);
-  },
-
-  getById: async (id: string): Promise<Customer> => {
-    const response = await client.get<ApiResponse<Customer>>(
-      URL_CONSTANTS.CUSTOMERS_API.BY_ID(id),
-    );
-    return unwrap(response.data);
-  },
-
-  getByUserId: async (userId: string): Promise<Customer | null> => {
-    try {
-      const response = await client.get<ApiResponse<Customer>>(
-        URL_CONSTANTS.CUSTOMERS_API.BY_USER_ID(userId),
-      );
-      return unwrap(response.data);
-    } catch (e) {
-      if (isAxiosError(e) && e.response?.status === 404) {
-        return null;
-      }
-      throw e;
-    }
-  },
-
-  create: async (payload: CreateCustomerDto): Promise<Customer> => {
-    const response = await client.post<ApiResponse<Customer>>(BASE, payload);
-    return unwrap(response.data);
-  },
-
-  update: async (id: string, payload: UpdateCustomerDto): Promise<Customer> => {
-    const response = await client.patch<ApiResponse<Customer>>(
-      URL_CONSTANTS.CUSTOMERS_API.BY_ID(id),
-      payload,
-    );
-    return unwrap(response.data);
-  },
-
-  remove: async (id: string): Promise<void> => {
-    await client.delete(URL_CONSTANTS.CUSTOMERS_API.BY_ID(id));
-  },
-};

apps/edr-freight-web/portal/src/services/files/file_upload_settings.ts

@@ -1,3 +0,0 @@
-import { api } from "../crud";
-
-import { URL_CONSTANTS } from "../../constants/URLS"

apps/edr-freight-web/portal/src/types/profile.ts

@@ -0,0 +1,43 @@
+export interface ProfileResponse {
+  companyId: string;
+  companyName: string;
+  companyEmail: string | null;
+  companyPhone: string | null;
+  companyLocation: string;
+  companyAddress: string | null;
+  tinNumber: string;
+  vatNumber: string | null;
+  fanNumber: string | null;
+  contactPersonName: string | null;
+  contactPersonPhone: string | null;
+  generalManagerName: string | null;
+  generalManagerEmail: string | null;
+  generalManagerPhone: string | null;
+  poaName: string | null;
+  poaPhone: string | null;
+  poaEmail: string | null;
+  poaLocation: string | null;
+  poaAddress: string | null;
+  profileId: string;
+}
+
+export interface UpdateProfilePayload {
+  companyName?: string;
+  companyEmail?: string;
+  companyPhone?: string;
+  companyLocation?: string;
+  companyAddress?: string;
+  tin?: string;
+  vatNumber?: string;
+  fanNumber?: string;
+  contactPersonName?: string;
+  contactPersonPhone?: string;
+  generalManagerName?: string;
+  generalManagerEmail?: string;
+  generalManagerPhone?: string;
+  poaName?: string;
+  poaPhone?: string;
+  poaEmail?: string;
+  poaLocation?: string;
+  poaAddress?: string;
+}