@burdenoff/microfe-movethewheels 2026.924.2 → 2026.925.2

package/src/movethewheels/types/index.ts

@@ -253,6 +253,7 @@ export type OrderStatus =
   | 'in_transit'
   | 'out_for_delivery'
   | 'delivered'
+  | 'returned'
   | 'cancelled'
   | 'failed';
 
@@ -345,6 +346,9 @@ export interface Vehicle {
   nextMaintenance?: Date;
   /** Odometer reading (km) at which the next service is due. */
   nextMaintenanceMileage?: number;
+  fuelType?: string;
+  /** Fuel consumption, litres per 100km. */
+  fuelEfficiencyLPer100Km?: number;
   fuelLevel?: number;
   mileage?: number;
   documents: VehicleDocument[];
@@ -352,7 +356,7 @@ export interface Vehicle {
 }
 
 // Driver type
-export type DriverStatus = 'available' | 'busy' | 'offline' | 'on_break';
+export type DriverStatus = 'available' | 'busy' | 'offline' | 'on_break' | 'inactive';
 
 export interface DriverDocument {
   id: string;
@@ -376,44 +380,19 @@ export interface Driver {
   assignedVehicle?: string;
   status: DriverStatus;
   currentLocation?: Location;
-  joinDate: Date;
-  baseSalary: number;
-  completedOrders: number;
-  todayOrders: number;
-  specializations: string[];
-  workingHours: {
-    startTime: string;
-    endTime: string;
-    workingDays: string[];
-    maxHoursPerDay: number;
-    maxHoursPerWeek: number;
-    currentHoursToday: number;
-    currentHoursThisWeek: number;
-  };
-  ratings: {
-    overall: number;
-    punctuality: number;
-    communication: number;
-    carefulHandling: number;
-    professionalism: number;
-    onTimeDelivery: number;
-    totalRatings: number;
-  };
+  /** MtwDriver.rating — a single overall rating; the backend does not track per-category breakdowns. */
+  rating: number;
+  /** Free-text HR/performance notes. */
+  notes?: string;
+  hireDate?: Date;
+  baseSalary?: number;
+  bonusYtd?: number;
+  payCurrency?: string;
+  /** Set and in the future means the driver is currently on leave. */
+  onLeaveUntil?: Date;
+  terminatedAt?: Date;
+  terminationReason?: string;
   documents: DriverDocument[];
-  earnings: {
-    totalEarnings: number;
-    weeklyEarnings: number;
-    monthlyEarnings: number;
-    pendingPayments: number;
-    completedDeliveries: number;
-    bonuses: number;
-  };
-  compliance: {
-    hoursOfService: boolean;
-    documentation: boolean;
-    vehicleInspection: boolean;
-    lastUpdate: Date;
-  };
   createdAt: Date;
 }
 

package/src/movethewheels/utils/mapMarkers.ts

@@ -20,6 +20,7 @@ export function deliveryMarkerStatus(status: string | undefined): MapMarkerStatu
     case 'failed':
     case 'delayed':
     case 'cancelled':
+    case 'returned':
       return 'delayed';
     case 'assigned':
     case 'picked_up':

package/src/operations/wspace/movethewheels/queries/dashboard.graphql

@@ -13,10 +13,15 @@ query GetMovethewheelsDashboard {
   deliveryJobStats {
     total
     pending
+    confirmed
+    assigned
+    pickedUp
     inTransit
+    outForDelivery
     delivered
     cancelled
     failed
+    returned
   }
   fleetStats {
     totalVehicles

package/src/operations/wspace/movethewheels/queries/logistics.graphql

@@ -57,8 +57,8 @@ query GetShipment($id: ID!) {
   }
 }
 
-query GetDeliveryJobTracking($deliveryJobId: ID!) {
-  deliveryJobTracking(deliveryJobId: $deliveryJobId) {
+query GetDeliveryJobTracking($deliveryJobId: ID!, $pagination: PaginationInput) {
+  deliveryJobTracking(deliveryJobId: $deliveryJobId, pagination: $pagination) {
     id
     shipmentId
     eventType