name: CI/CD - ERP Core Monorepo

on:
  pull_request:
    branches:
      - production
    types:
      - closed

jobs:
  backend-build-and-deploy:
    name: Build & Deploy ERP Core Backend
    runs-on: linux
    if: github.event.pull_request.merged == true
    steps:
      - name: Checkout code
        run: |
          git clone \
            --depth 1 \
            --branch production \
            https://oauth2:${{ secrets.ERPCORE }}@gitea.hexdive.com/New_REP_SYSTEM/ERP-core.git \
            .

      - name: Restore backend
        run: dotnet restore Backend/ERPCore.sln

      - name: Publish backend
        run: |
          rm -rf /tmp/erpcore-deploy
          mkdir -p /tmp/erpcore-deploy
          dotnet publish Backend/ERPCore/ERPCore.csproj \
            -c Release \
            -r linux-x64 \
            --self-contained true \
            -o /tmp/erpcore-deploy

      - name: Stop backend service
        run: systemctl stop erpcore.service

      - name: Copy backend to deploy folder
        run: |
          mkdir -p /home/erp/core/publish
          rm -rf /home/erp/core/publish/*
          cp -r /tmp/erpcore-deploy/* /home/erp/core/publish/

      - name: Fix backend ownership and permissions
        run: |
          chown -R erpuser:erpuser /home/erp/core/publish
          find /home/erp/core/publish -type d -exec chmod 755 {} +
          find /home/erp/core/publish -type f -exec chmod 644 {} +
          chmod +x /home/erp/core/publish/ERPCore

      - name: Restart backend service
        run: systemctl restart erpcore.service

      - name: Verify backend
        run: |
          systemctl is-active erpcore.service && echo "Backend service running" || echo "Backend service failed"

  frontend-build-and-deploy:
    name: Build & Deploy ERP Core Frontend
    runs-on: linux
    needs: backend-build-and-deploy
    if: github.event.pull_request.merged == true
    steps:
      - name: Checkout code
        run: |
          git clone \
            --depth 1 \
            --branch Production \
            https://oauth2:${{ secrets.ERPCORE }}@gitea.hexdive.com/New_REP_SYSTEM/ERP-core.git \
            .

      - name: Build frontend Docker image
        run: docker build -t erpcore-frontend:latest Frontend/erp-system

      - name: Stop & remove existing frontend container
        run: |
          docker stop erpcore-frontend 2>/dev/null || true
          docker rm erpcore-frontend 2>/dev/null || true

      - name: Start frontend container
        run: |
          docker run -d \
            --name erpcore-frontend \
            -p 6702:6702 \
            --add-host=host.docker.internal:host-gateway \
            -e BACKEND_ORIGIN=http://host.docker.internal:6701 \
            --restart unless-stopped \
            --memory="512m" \
            --cpus="1.0" \
            --cap-drop ALL \
            --security-opt no-new-privileges \
            erpcore-frontend:latest

      - name: Remove old frontend images
        run: docker image prune -f

      - name: Verify frontend
        run: |
          docker ps --filter name=erpcore-frontend --format "table {{.Names}}\t{{.Status}}\t{{.Ports}}" \
            | grep erpcore-frontend && echo "Frontend container running" || echo "Frontend container failed"

distribution_fe/app/(dashboard)/operations/rides/_components/ride-cancel-dialog.tsx

@@ -57,12 +57,12 @@ export function RideCancelDialog({ open, onClose, onSuccess, ride }: RideCancelD
 
   async function onSubmit(values: FormValues) {
     try {
-      await ridesApi.cancelRequests.raise(ride!.id, values)
-      toast.add({ title: 'Cancel request raised', type: 'success' })
+      await ridesApi.cancel(ride!.id, values)
+      toast.add({ title: 'Ride cancelled', type: 'success' })
       onSuccess()
       onClose()
     } catch (err) {
-      toast.add({ title: 'Failed to raise cancel request', description: getApiError(err), type: 'error' })
+      toast.add({ title: 'Failed to cancel ride', description: getApiError(err), type: 'error' })
     }
   }
 
@@ -72,7 +72,7 @@ export function RideCancelDialog({ open, onClose, onSuccess, ride }: RideCancelD
         <DialogHeader>
           <DialogTitle>Cancel Ride</DialogTitle>
           <DialogDescription>
-            Raises a cancel request for this ride, subject to supervisor approval.
+            Cancelling this ride is immediate and cannot be undone.
           </DialogDescription>
         </DialogHeader>
 
@@ -122,7 +122,7 @@ export function RideCancelDialog({ open, onClose, onSuccess, ride }: RideCancelD
               Back
             </Button>
             <Button type="submit" variant="destructive" disabled={form.formState.isSubmitting}>
-              {form.formState.isSubmitting ? 'Submitting…' : 'Raise Cancel Request'}
+              {form.formState.isSubmitting ? 'Cancelling…' : 'Cancel Ride'}
             </Button>
           </DialogFooter>
         </form>

distribution_fe/app/(dashboard)/operations/rides/_components/ride-edit-driver-sheet.tsx

@@ -72,7 +72,7 @@ export function RideEditDriverSheet({ open, onClose, onSuccess, ride }: RideEdit
         <DialogHeader>
           <DialogTitle>Edit Ride Driver</DialogTitle>
           <DialogDescription>
-            Reassign the driver for this ride. Only available while the ride is in Draft status.
+            Reassign the driver for this ride. Only available while the ride is Open.
           </DialogDescription>
         </DialogHeader>
 

distribution_fe/app/(dashboard)/operations/rides/_components/ride-sheet.tsx

@@ -26,19 +26,14 @@ import {
   rides as ridesApi,
   vehicles as vehiclesApi,
   drivers as driversApi,
-  routes as routesApi,
-  warehouses as warehousesApi,
   getApiError,
   getPaginatedItems,
 } from '@/lib/api/index'
-import type { VehicleResponse, DriverProfileResponse, RouteResponse, WarehouseResponse } from '@/types/api'
+import type { VehicleResponse, DriverProfileResponse } from '@/types/api'
 
 const schema = z.object({
-  rideType: z.enum(['Delivery', 'Sale']),
   vehicleId: z.string().min(1, 'Vehicle is required'),
   driverProfileId: z.string().min(1, 'Driver is required'),
-  routeId: z.string().min(1, 'Route is required'),
-  sourceWarehouseId: z.string().min(1, 'Warehouse is required'),
   meterstart: z.number().min(0, 'Meter start must be 0 or more'),
 })
 
@@ -50,21 +45,15 @@ interface RideSheetProps {
   onSuccess: () => void
 }
 
-
 export function RideSheet({ open, onClose, onSuccess }: RideSheetProps) {
   const [vehiclesList, setVehiclesList] = useState<VehicleResponse[]>([])
   const [driversList, setDriversList] = useState<DriverProfileResponse[]>([])
-  const [routesList, setRoutesList] = useState<RouteResponse[]>([])
-  const [warehousesList, setWarehousesList] = useState<WarehouseResponse[]>([])
 
   const form = useForm<FormValues>({
     resolver: zodResolver(schema),
     defaultValues: {
-      rideType: 'Delivery',
       vehicleId: '',
       driverProfileId: '',
-      routeId: '',
-      sourceWarehouseId: '',
       meterstart: 0,
     },
   })
@@ -73,26 +62,18 @@ export function RideSheet({ open, onClose, onSuccess }: RideSheetProps) {
     if (!open) return
 
     form.reset({
-      rideType: 'Delivery',
       vehicleId: '',
       driverProfileId: '',
-      routeId: '',
-      sourceWarehouseId: '',
       meterstart: 0,
     })
 
-    // available=true tells backend to exclude vehicles already on an open ride
     Promise.all([
       vehiclesApi.list({ available: true, isActive: true, pageSize: 200 }),
       driversApi.list({ pageSize: 200 }),
-      routesApi.list({ pageSize: 200 }),
-      warehousesApi.list({ pageSize: 200 }),
     ])
-      .then(([v, d, r, w]) => {
+      .then(([v, d]) => {
         setVehiclesList(getPaginatedItems(v))
         setDriversList(getPaginatedItems(d))
-        setRoutesList(getPaginatedItems(r))
-        setWarehousesList(getPaginatedItems(w))
       })
       .catch((err) => {
         toast.add({ title: 'Failed to load reference data', description: getApiError(err), type: 'error' })
@@ -115,30 +96,11 @@ export function RideSheet({ open, onClose, onSuccess }: RideSheetProps) {
       <DialogContent className="overflow-y-auto sm:max-w-lg">
         <DialogHeader>
           <DialogTitle>Create Ride</DialogTitle>
-          <DialogDescription>Start a new delivery or sales run.</DialogDescription>
+          <DialogDescription>Start a new delivery run for a driver and vehicle.</DialogDescription>
         </DialogHeader>
 
         <form onSubmit={form.handleSubmit(onSubmit)} className="flex flex-col gap-6">
           <FieldGroup>
-            <FormField
-              control={form.control}
-              name="rideType"
-              label="Ride Type"
-              required
-              render={({ field }) => (
-                <Select value={field.value as string} onValueChange={field.onChange}>
-                  <SelectTrigger>
-                    <SelectValue placeholder="Select ride type..." />
-                  </SelectTrigger>
-                  <SelectContent>
-                    <SelectItem value="" disabled>Select ride type...</SelectItem>
-                    <SelectItem value="Delivery">Delivery</SelectItem>
-                    <SelectItem value="Sale">Sale</SelectItem>
-                  </SelectContent>
-                </Select>
-              )}
-            />
-
             <FormField
               control={form.control}
               name="vehicleId"
@@ -183,50 +145,6 @@ export function RideSheet({ open, onClose, onSuccess }: RideSheetProps) {
               )}
             />
 
-            <FormField
-              control={form.control}
-              name="routeId"
-              label="Route"
-              required
-              render={({ field }) => (
-                <Select value={field.value as string} onValueChange={field.onChange}>
-                  <SelectTrigger>
-                    <SelectValue placeholder="Select route..." />
-                  </SelectTrigger>
-                  <SelectContent>
-                    <SelectItem value="" disabled>Select route...</SelectItem>
-                    {routesList.map((r) => (
-                      <SelectItem key={r.id} value={r.id}>
-                        {r.routeName} ({r.startPoint} → {r.endPoint})
-                      </SelectItem>
-                    ))}
-                  </SelectContent>
-                </Select>
-              )}
-            />
-
-            <FormField
-              control={form.control}
-              name="sourceWarehouseId"
-              label="Source Warehouse"
-              required
-              render={({ field }) => (
-                <Select value={field.value as string} onValueChange={field.onChange}>
-                  <SelectTrigger>
-                    <SelectValue placeholder="Select warehouse..." />
-                  </SelectTrigger>
-                  <SelectContent>
-                    <SelectItem value="" disabled>Select warehouse...</SelectItem>
-                    {warehousesList.map((w) => (
-                      <SelectItem key={w.id} value={w.id}>
-                        {w.name} — {w.location}
-                      </SelectItem>
-                    ))}
-                  </SelectContent>
-                </Select>
-              )}
-            />
-
             <FormField
               control={form.control}
               name="meterstart"

distribution_fe/app/(dashboard)/operations/rides/_components/ride-view-sheet.tsx

@@ -7,22 +7,14 @@ import {
   DialogHeader,
   DialogTitle,
 } from '@/components/ui/dialog'
-import type { RideResponse, RideStatus, RideType } from '@/types/api'
+import type { RideResponse, RideStatus } from '@/types/api'
 
 const RIDE_STATUS_VARIANT: Record<RideStatus, 'default' | 'secondary' | 'destructive'> = {
-  Draft: 'secondary',
-  Open: 'secondary',
-  Active: 'default',
-  CancelRequested: 'destructive',
+  Open: 'default',
   Cancelled: 'destructive',
   Closed: 'secondary',
 }
 
-const RIDE_TYPE_VARIANT: Record<RideType, 'default' | 'secondary'> = {
-  Delivery: 'default',
-  Sale: 'secondary',
-}
-
 const fmtDateTime = (v: string | null) =>
   v
     ? new Date(v).toLocaleString('en-GB', {
@@ -58,14 +50,10 @@ export function RideViewSheet({ open, onClose, ride }: RideViewSheetProps) {
         <div className="flex flex-col">
           <Row label="Vehicle" value={ride.vehicleNumberPlate} />
           <Row label="Driver" value={ride.driverFullName} />
-          <Row label="Route" value={ride.routeName} />
-          <Row label="Source Warehouse" value={ride.sourceWarehouseName} />
-          <Row label="Type" value={<Badge variant={RIDE_TYPE_VARIANT[ride.rideType]}>{ride.rideType}</Badge>} />
           <Row label="Status" value={<Badge variant={RIDE_STATUS_VARIANT[ride.status]}>{ride.status}</Badge>} />
-          <Row label="Meter Start" value={ride.meterstart} />
-          <Row label="Meter End" value={ride.meterend || '—'} />
+          <Row label="Meter Start" value={`${ride.meterstart} km`} />
+          <Row label="Meter End" value={ride.meterend ? `${ride.meterend} km` : '—'} />
           <Row label="Started At" value={fmtDateTime(ride.startedAt)} />
-          <Row label="Activated At" value={fmtDateTime(ride.activatedAt)} />
           <Row label="Closed At" value={fmtDateTime(ride.closedAt)} />
           <Row label="Created At" value={fmtDateTime(ride.createdAt)} />
         </div>

distribution_fe/app/(dashboard)/operations/rides/_components/rides-client.tsx

@@ -10,7 +10,7 @@ import { Badge } from '@/components/ui/badge'
 import { Button } from '@/components/ui/button'
 import { toast } from '@/components/ui/toast'
 import { rides as ridesApi, getApiError, getPaginatedItems } from '@/lib/api/index'
-import type { RideResponse, RideStatus, RideType } from '@/types/api'
+import type { RideResponse, RideStatus } from '@/types/api'
 
 import { RideSheet } from './ride-sheet'
 import { RideViewSheet } from './ride-view-sheet'
@@ -22,19 +22,11 @@ const fmtDate = (v: string) =>
   new Date(v).toLocaleDateString('en-GB', { day: '2-digit', month: 'short', year: 'numeric' })
 
 const RIDE_STATUS_VARIANT: Record<RideStatus, 'default' | 'secondary' | 'destructive'> = {
-  Draft: 'secondary',
-  Open: 'secondary',
-  Active: 'default',
-  CancelRequested: 'destructive',
+  Open: 'default',
   Cancelled: 'destructive',
   Closed: 'secondary',
 }
 
-const RIDE_TYPE_VARIANT: Record<RideType, 'default' | 'secondary'> = {
-  Delivery: 'default',
-  Sale: 'secondary',
-}
-
 export function RidesClient() {
   const [data, setData] = useState<RideResponse[]>([])
   const [loading, setLoading] = useState(true)
@@ -81,16 +73,6 @@ export function RidesClient() {
     setCancelOpen(true)
   }
 
-  async function handleActivate(row: RideResponse) {
-    try {
-      await ridesApi.activate(row.id)
-      toast.add({ title: 'Ride activated', type: 'success' })
-      fetchData(page, pageSize)
-    } catch (err) {
-      toast.add({ title: 'Failed to activate ride', description: getApiError(err), type: 'error' })
-    }
-  }
-
   function handleClose(row: RideResponse) {
     setSelectedRide(row)
     setCloseOpen(true)
@@ -115,30 +97,29 @@ export function RidesClient() {
           </div>
         ),
       },
-      {
-        key: 'routeName',
-        title: 'Route',
-        fields: [{ key: 'routeName', primary: true }],
-        minWidth: 160,
-      },
-      {
-        key: 'rideType',
-        title: 'Type',
-        fields: ['rideType'],
-        width: 120,
-        cellRender: (row) => (
-          <Badge variant={RIDE_TYPE_VARIANT[row.rideType]}>{row.rideType}</Badge>
-        ),
-      },
       {
         key: 'status',
         title: 'Status',
         fields: ['status'],
-        width: 160,
+        width: 140,
         cellRender: (row) => (
           <Badge variant={RIDE_STATUS_VARIANT[row.status]}>{row.status}</Badge>
         ),
       },
+      {
+        key: 'meter',
+        title: 'Meter',
+        fields: ['meterstart', 'meterend'],
+        width: 160,
+        cellRender: (row) => (
+          <div>
+            <p className="text-sm">{row.meterstart} km</p>
+            {row.meterend ? (
+              <p className="text-xs text-muted-foreground">→ {row.meterend} km</p>
+            ) : null}
+          </div>
+        ),
+      },
       {
         key: 'createdAt',
         title: 'Created',
@@ -157,25 +138,19 @@ export function RidesClient() {
           action: 'edit',
           label: 'Edit driver',
           onClick: handleEditDriver,
-          visible: (target) => target.status === 'Draft',
-        },
-        {
-          action: 'activate',
-          label: 'Activate ride',
-          onClick: handleActivate,
           visible: (target) => target.status === 'Open',
         },
         {
           action: 'close',
           label: 'Close ride',
           onClick: handleClose,
-          visible: (target) => target.status === 'Active',
+          visible: (target) => target.status === 'Open',
         },
         {
           action: 'cancel',
           label: 'Cancel ride',
           onClick: handleCancel,
-          visible: (target) => target.status === 'Active',
+          visible: (target) => target.status === 'Open',
         },
       ],
     },
@@ -192,7 +167,7 @@ export function RidesClient() {
         </div>
         <Button onClick={() => setSheetOpen(true)}>
           <HugeiconsIcon icon={Add01Icon} size={16} />
-          Add Ride
+          New Ride
         </Button>
       </div>