@burdenoff/microfe-movethewheels 2026.722.1 → 2026.725.1

package/src/movethewheels/hooks/useOrders.ts

@@ -27,16 +27,19 @@ interface UseOrdersResult {
   updateOrderStatus: (id: string, status: OrderStatus) => Promise<Order>;
 }
 
+// Wire shape of MtwDeliveryJob (wspace-movethewheels-svc: src/modules/order/schema/order.gql).
+// The `order` domain was renamed to `delivery_jobs`/MtwDeliveryJob on 2026-07-07 (commit
+// 7e99ec5); `orderType` was dropped entirely in that rename with no replacement field, so it
+// is intentionally absent here — see BOFF-4505.
 interface ApiOrder {
   id: string;
-  orderNumber: string;
+  deliveryJobNumber: string;
   customerId: string;
-  orderType: string;
   status: string;
   priority: string;
   pickupAddress: Record<string, unknown> | null;
   deliveryAddress: Record<string, unknown> | null;
-  items: unknown;
+  cargoItems: unknown;
   pricing: unknown;
   trackingNumber?: string | null;
   specialInstructions?: string | null;
@@ -60,83 +63,57 @@ interface ApiOrder {
   }>;
 }
 
+const DELIVERY_JOB_FIELDS = `
+  id
+  deliveryJobNumber
+  customerId
+  status
+  priority
+  pickupAddress
+  deliveryAddress
+  cargoItems
+  pricing
+  trackingNumber
+  specialInstructions
+  scheduledDelivery
+  vehicleId
+  driverId
+  createdAt
+  updatedAt
+  customer {
+    name
+    email
+    phone
+    company
+  }
+  statusHistory {
+    status
+    notes
+    location
+    createdAt
+    createdBy
+  }
+`;
+
 const LIST_ORDERS_QUERY = `
-  query ListMovethewheelsOrders($filter: OrderFilterInput, $pagination: PaginationInput) {
-    movethewheelsOrders(filter: $filter, pagination: $pagination) {
-      id
-      orderNumber
-      customerId
-      orderType
-      status
-      priority
-      pickupAddress
-      deliveryAddress
-      items
-      pricing
-      trackingNumber
-      specialInstructions
-      scheduledDelivery
-      vehicleId
-      driverId
-      createdAt
-      updatedAt
-      customer {
-        name
-        email
-        phone
-        company
-      }
-      statusHistory {
-        status
-        notes
-        location
-        createdAt
-        createdBy
-      }
+  query ListDeliveryJobs($filter: DeliveryJobFilterInput, $pagination: PaginationInput) {
+    deliveryJobs(filter: $filter, pagination: $pagination) {
+      ${DELIVERY_JOB_FIELDS}
     }
   }
 `;
 
 const GET_ORDER_QUERY = `
-  query GetMovethewheelsOrder($id: ID!) {
-    movethewheelsOrder(id: $id) {
-      id
-      orderNumber
-      customerId
-      orderType
-      status
-      priority
-      pickupAddress
-      deliveryAddress
-      items
-      pricing
-      trackingNumber
-      specialInstructions
-      scheduledDelivery
-      vehicleId
-      driverId
-      createdAt
-      updatedAt
-      customer {
-        name
-        email
-        phone
-        company
-      }
-      statusHistory {
-        status
-        notes
-        location
-        createdAt
-        createdBy
-      }
+  query GetDeliveryJob($id: ID!) {
+    deliveryJob(id: $id) {
+      ${DELIVERY_JOB_FIELDS}
     }
   }
 `;
 
 const ORDER_STATS_QUERY = `
-  query GetOrderStatsBundle {
-    orderStats {
+  query GetDeliveryJobStatsBundle {
+    deliveryJobStats {
       total
       pending
       inTransit
@@ -154,119 +131,32 @@ const ORDER_STATS_QUERY = `
 `;
 
 const CREATE_ORDER_MUTATION = `
-  mutation CreateMovethewheelsOrder($input: CreateOrderInput!) {
-    createMovethewheelsOrder(input: $input) {
-      id
-      orderNumber
-      customerId
-      orderType
-      status
-      priority
-      pickupAddress
-      deliveryAddress
-      items
-      pricing
-      trackingNumber
-      specialInstructions
-      scheduledDelivery
-      vehicleId
-      driverId
-      createdAt
-      updatedAt
-      customer {
-        name
-        email
-        phone
-        company
-      }
-      statusHistory {
-        status
-        notes
-        location
-        createdAt
-        createdBy
-      }
+  mutation CreateDeliveryJob($input: CreateDeliveryJobInput!) {
+    createDeliveryJob(input: $input) {
+      ${DELIVERY_JOB_FIELDS}
     }
   }
 `;
 
 const UPDATE_ORDER_MUTATION = `
-  mutation UpdateMovethewheelsOrder($id: ID!, $input: UpdateOrderInput!) {
-    updateMovethewheelsOrder(id: $id, input: $input) {
-      id
-      orderNumber
-      customerId
-      orderType
-      status
-      priority
-      pickupAddress
-      deliveryAddress
-      items
-      pricing
-      trackingNumber
-      specialInstructions
-      scheduledDelivery
-      vehicleId
-      driverId
-      createdAt
-      updatedAt
-      customer {
-        name
-        email
-        phone
-        company
-      }
-      statusHistory {
-        status
-        notes
-        location
-        createdAt
-        createdBy
-      }
+  mutation UpdateDeliveryJob($id: ID!, $input: UpdateDeliveryJobInput!) {
+    updateDeliveryJob(id: $id, input: $input) {
+      ${DELIVERY_JOB_FIELDS}
     }
   }
 `;
 
 const UPDATE_ORDER_STATUS_MUTATION = `
-  mutation UpdateMovethewheelsOrderStatus($id: ID!, $input: UpdateOrderStatusInput!) {
-    updateMovethewheelsOrderStatus(id: $id, input: $input) {
-      id
-      orderNumber
-      customerId
-      orderType
-      status
-      priority
-      pickupAddress
-      deliveryAddress
-      items
-      pricing
-      trackingNumber
-      specialInstructions
-      scheduledDelivery
-      vehicleId
-      driverId
-      createdAt
-      updatedAt
-      customer {
-        name
-        email
-        phone
-        company
-      }
-      statusHistory {
-        status
-        notes
-        location
-        createdAt
-        createdBy
-      }
+  mutation UpdateDeliveryJobStatus($id: ID!, $input: UpdateDeliveryJobStatusInput!) {
+    updateDeliveryJobStatus(id: $id, input: $input) {
+      ${DELIVERY_JOB_FIELDS}
     }
   }
 `;
 
 const DELETE_ORDER_MUTATION = `
-  mutation DeleteMovethewheelsOrder($id: ID!) {
-    deleteMovethewheelsOrder(id: $id)
+  mutation DeleteDeliveryJob($id: ID!) {
+    deleteDeliveryJob(id: $id)
   }
 `;
 
@@ -293,10 +183,6 @@ function mapOrderStatus(status: string): OrderStatus {
   }
 }
 
-function mapOrderType(type: string): 'b2b' | 'b2c' {
-  return type === 'B2B' ? 'b2b' : 'b2c';
-}
-
 function mapOrderPriority(priority: string): 'low' | 'normal' | 'high' | 'urgent' {
   switch (priority) {
     case 'LOW':
@@ -334,10 +220,6 @@ function toApiStatus(status: OrderStatus): string {
   }
 }
 
-function toApiOrderType(orderType: 'b2b' | 'b2c' | undefined): string {
-  return orderType === 'b2b' ? 'B2B' : 'B2C';
-}
-
 function toApiPriority(priority: 'low' | 'normal' | 'high' | 'urgent' | undefined): string {
   switch (priority) {
     case 'low':
@@ -365,7 +247,7 @@ function mapAddress(address: Record<string, unknown> | null | undefined): Order[
 function mapOrder(order: ApiOrder): Order {
   return {
     id: order.id,
-    orderNumber: order.orderNumber,
+    orderNumber: order.deliveryJobNumber,
     customerId: order.customerId,
     customerInfo: {
       name: order.customer?.name ?? 'Unknown Customer',
@@ -373,9 +255,8 @@ function mapOrder(order: ApiOrder): Order {
       phone: order.customer?.phone ?? '',
       company: order.customer?.company ?? undefined,
     },
-    items: Array.isArray(order.items) ? (order.items as Order['items']) : [],
+    items: Array.isArray(order.cargoItems) ? (order.cargoItems as Order['items']) : [],
     status: mapOrderStatus(order.status),
-    orderType: mapOrderType(order.orderType),
     priority: mapOrderPriority(order.priority),
     pickupAddress: mapAddress(order.pickupAddress),
     deliveryAddress: mapAddress(order.deliveryAddress),
@@ -419,7 +300,6 @@ export function useOrders(options: UseOrdersOptions = {}): UseOrdersResult {
     [
       rawFilters?.status,
       rawFilters?.priority,
-      rawFilters?.orderType,
       rawFilters?.customerId,
       rawFilters?.driverId,
       rawFilters?.unassigned,
@@ -450,21 +330,20 @@ export function useOrders(options: UseOrdersOptions = {}): UseOrdersResult {
     setError(null);
     try {
       const data = await executeGraphQL<{
-        movethewheelsOrders: ApiOrder[];
+        deliveryJobs: ApiOrder[];
       }>(graphQLOptions, LIST_ORDERS_QUERY, {
         filter: {
           status: filters?.status ? toApiStatus(filters.status) : undefined,
           priority: filters?.priority
             ? toApiPriority(filters.priority as 'low' | 'normal' | 'high' | 'urgent')
             : undefined,
-          orderType: filters?.orderType ? toApiOrderType(filters.orderType) : undefined,
           customerId: filters?.customerId,
           driverId: filters?.driverId,
         },
         pagination: { limit, offset },
       });
 
-      const raw = data.movethewheelsOrders;
+      const raw = data.deliveryJobs;
       setHasMore(raw.length === limit);
       let mapped = raw.map(mapOrder);
       if (filters?.unassigned) {
@@ -488,22 +367,21 @@ export function useOrders(options: UseOrdersOptions = {}): UseOrdersResult {
 
   const createOrder = useCallback(
     async (orderData: Partial<Order>): Promise<Order> => {
-      const orderNumber =
+      const deliveryJobNumber =
         orderData.orderNumber ??
         `ORD-${new Date().getFullYear()}-${Date.now().toString().slice(-6)}`;
 
       const data = await executeGraphQL<{
-        createMovethewheelsOrder: ApiOrder;
+        createDeliveryJob: ApiOrder;
       }>(graphQLOptions, CREATE_ORDER_MUTATION, {
         input: {
-          orderNumber,
-          orderType: toApiOrderType(orderData.orderType),
+          deliveryJobNumber,
           status: toApiStatus(orderData.status ?? 'pending'),
           priority: toApiPriority(orderData.priority),
           customerId: orderData.customerId,
           pickupAddress: orderData.pickupAddress ?? {},
           deliveryAddress: orderData.deliveryAddress ?? {},
-          items: orderData.items ?? [],
+          cargoItems: orderData.items ?? [],
           pricing: orderData.pricing ?? null,
           specialInstructions: orderData.specialInstructions,
           trackingNumber: orderData.trackingNumber,
@@ -513,7 +391,7 @@ export function useOrders(options: UseOrdersOptions = {}): UseOrdersResult {
         },
       });
 
-      const created = mapOrder(data.createMovethewheelsOrder);
+      const created = mapOrder(data.createDeliveryJob);
       setOrders((previous) => [created, ...previous]);
       return created;
     },
@@ -523,17 +401,16 @@ export function useOrders(options: UseOrdersOptions = {}): UseOrdersResult {
   const updateOrder = useCallback(
     async (id: string, updates: Partial<Order>): Promise<Order> => {
       const data = await executeGraphQL<{
-        updateMovethewheelsOrder: ApiOrder;
+        updateDeliveryJob: ApiOrder;
       }>(graphQLOptions, UPDATE_ORDER_MUTATION, {
         id,
         input: {
-          orderType: updates.orderType ? toApiOrderType(updates.orderType) : undefined,
           status: updates.status ? toApiStatus(updates.status) : undefined,
           priority: updates.priority ? toApiPriority(updates.priority) : undefined,
           customerId: updates.customerId,
           pickupAddress: updates.pickupAddress,
           deliveryAddress: updates.deliveryAddress,
-          items: updates.items,
+          cargoItems: updates.items,
           pricing: updates.pricing,
           specialInstructions: updates.specialInstructions,
           trackingNumber: updates.trackingNumber,
@@ -543,7 +420,7 @@ export function useOrders(options: UseOrdersOptions = {}): UseOrdersResult {
         },
       });
 
-      const updated = mapOrder(data.updateMovethewheelsOrder);
+      const updated = mapOrder(data.updateDeliveryJob);
       setOrders((previous) => previous.map((item) => (item.id === id ? updated : item)));
       return updated;
     },
@@ -552,11 +429,9 @@ export function useOrders(options: UseOrdersOptions = {}): UseOrdersResult {
 
   const deleteOrder = useCallback(
     async (id: string): Promise<void> => {
-      await executeGraphQL<{ deleteMovethewheelsOrder: boolean }>(
-        graphQLOptions,
-        DELETE_ORDER_MUTATION,
-        { id }
-      );
+      await executeGraphQL<{ deleteDeliveryJob: boolean }>(graphQLOptions, DELETE_ORDER_MUTATION, {
+        id,
+      });
       setOrders((previous) => previous.filter((item) => item.id !== id));
     },
     [graphQLOptions]
@@ -565,7 +440,7 @@ export function useOrders(options: UseOrdersOptions = {}): UseOrdersResult {
   const updateOrderStatus = useCallback(
     async (id: string, status: OrderStatus): Promise<Order> => {
       const data = await executeGraphQL<{
-        updateMovethewheelsOrderStatus: ApiOrder;
+        updateDeliveryJobStatus: ApiOrder;
       }>(graphQLOptions, UPDATE_ORDER_STATUS_MUTATION, {
         id,
         input: {
@@ -573,7 +448,7 @@ export function useOrders(options: UseOrdersOptions = {}): UseOrdersResult {
         },
       });
 
-      const updated = mapOrder(data.updateMovethewheelsOrderStatus);
+      const updated = mapOrder(data.updateDeliveryJobStatus);
       setOrders((previous) => previous.map((item) => (item.id === id ? updated : item)));
       return updated;
     },
@@ -623,10 +498,10 @@ export function useOrder(orderId: string | undefined) {
     setError(null);
     try {
       const data = await executeGraphQL<{
-        movethewheelsOrder: ApiOrder | null;
+        deliveryJob: ApiOrder | null;
       }>(graphQLOptions, GET_ORDER_QUERY, { id: orderId });
 
-      setOrder(data.movethewheelsOrder ? mapOrder(data.movethewheelsOrder) : null);
+      setOrder(data.deliveryJob ? mapOrder(data.deliveryJob) : null);
     } catch (fetchError) {
       setError(fetchError instanceof Error ? fetchError : new Error('Failed to load order'));
     } finally {
@@ -685,7 +560,7 @@ export function useOrderStats() {
     setError(null);
     try {
       const data = await executeGraphQL<{
-        orderStats: {
+        deliveryJobStats: {
           total: number;
           pending: number;
           inTransit: number;
@@ -702,17 +577,17 @@ export function useOrderStats() {
       }>(graphQLOptions, ORDER_STATS_QUERY);
 
       setStats({
-        total: data.orderStats.total,
+        total: data.deliveryJobStats.total,
         byStatus: {
-          pending: data.orderStats.pending,
+          pending: data.deliveryJobStats.pending,
           confirmed: 0,
           assigned: 0,
           picked_up: 0,
-          in_transit: data.orderStats.inTransit,
+          in_transit: data.deliveryJobStats.inTransit,
           out_for_delivery: 0,
-          delivered: data.orderStats.delivered,
-          cancelled: data.orderStats.cancelled,
-          failed: data.orderStats.failed,
+          delivered: data.deliveryJobStats.delivered,
+          cancelled: data.deliveryJobStats.cancelled,
+          failed: data.deliveryJobStats.failed,
         },
         totalRevenue: data.financeMetrics.revenue.totalRevenue,
         todayOrders: 0,

package/src/movethewheels/pages/CreateOrderPage.tsx

@@ -42,7 +42,6 @@ export default function CreateOrderPage() {
 
   const [formData, setFormData] = useState({
     customerId: order?.customerId || '',
-    orderType: order?.orderType || 'b2c',
     priority: order?.priority || 'normal',
     pickupAddress: {
       street: order?.pickupAddress.street || '',
@@ -74,7 +73,6 @@ export default function CreateOrderPage() {
     }
     setFormData({
       customerId: order.customerId || '',
-      orderType: order.orderType || 'b2c',
       priority: order.priority || 'normal',
       pickupAddress: {
         street: order.pickupAddress.street || '',
@@ -144,7 +142,6 @@ export default function CreateOrderPage() {
           phone: selectedCustomer.phone,
           company: selectedCustomer.company,
         },
-        orderType: formData.orderType as 'b2b' | 'b2c',
         priority: formData.priority as 'low' | 'normal' | 'high' | 'urgent',
         pickupAddress: formData.pickupAddress,
         deliveryAddress: formData.deliveryAddress,
@@ -283,7 +280,7 @@ export default function CreateOrderPage() {
         <EmphasisPanel>
           <h2 className="text-base font-semibold text-text-primary mb-4">Order Details</h2>
           <div className="space-y-4">
-            <div className="grid grid-cols-1 md:grid-cols-3 gap-4">
+            <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
               <div className="space-y-2">
                 <Label htmlFor="customer">Customer</Label>
                 <Select
@@ -302,21 +299,6 @@ export default function CreateOrderPage() {
                   </SelectContent>
                 </Select>
               </div>
-              <div className="space-y-2">
-                <Label htmlFor="orderType">Order Type</Label>
-                <Select
-                  value={formData.orderType}
-                  onValueChange={(value) => updateField('orderType', value)}
-                >
-                  <SelectTrigger id="orderType">
-                    <SelectValue />
-                  </SelectTrigger>
-                  <SelectContent>
-                    <SelectItem value="b2c">B2C (Individual)</SelectItem>
-                    <SelectItem value="b2b">B2B (Business)</SelectItem>
-                  </SelectContent>
-                </Select>
-              </div>
               <div className="space-y-2">
                 <Label htmlFor="priority">Priority</Label>
                 <Select

package/src/movethewheels/pages/OrderDetailsPage.tsx

@@ -25,12 +25,7 @@ import {
   UserCheck,
 } from 'lucide-react';
 import { PageLayout, LoadingState, ErrorState } from '../components/PageLayout';
-import {
-  StatusBadge,
-  PriorityBadge,
-  TypeBadge,
-  PaymentStatusBadge,
-} from '../components/StatusBadge';
+import { StatusBadge, PriorityBadge, PaymentStatusBadge } from '../components/StatusBadge';
 import {
   Card,
   CardContent,
@@ -205,7 +200,6 @@ export default function OrderDetailsPage() {
         <div className="flex flex-wrap gap-2">
           <StatusBadge status={order.status} type="order" />
           <PriorityBadge priority={order.priority} />
-          <TypeBadge type={order.orderType} />
           <PaymentStatusBadge status={order.pricing.paymentStatus} />
         </div>
       }

package/src/movethewheels/pages/OrdersListPage.tsx

@@ -20,7 +20,7 @@ import {
 import { PageLayout } from '../components/PageLayout';
 import { MetricCard, MetricGrid } from '../components/MetricCard';
 import { DataTable, type Column } from '../components/DataTable';
-import { StatusBadge, PriorityBadge, TypeBadge } from '../components/StatusBadge';
+import { StatusBadge, PriorityBadge } from '../components/StatusBadge';
 import { CTAOverflowMenu, PagePurpose } from '@burdenoff/fe-libs/ui';
 import {
   Button,
@@ -48,17 +48,15 @@ export default function OrdersListPage() {
   };
   const { basePath, navigate } = useMoveTheWheels();
   const [statusFilter, setStatusFilter] = useState<OrderStatus | 'all'>('all');
-  const [typeFilter, setTypeFilter] = useState<'b2b' | 'b2c' | 'all'>('all');
   const [unassignedOnly, setUnassignedOnly] = useState(false);
   const [page, setPage] = useState(0);
   const [pageSize, setPageSize] = useState(25);
 
-  const filtersActive = statusFilter !== 'all' || typeFilter !== 'all' || unassignedOnly;
+  const filtersActive = statusFilter !== 'all' || unassignedOnly;
 
   const { orders, hasMore, isLoading, error, refetch } = useOrders({
     filters: {
       status: statusFilter === 'all' ? undefined : statusFilter,
-      orderType: typeFilter === 'all' ? undefined : typeFilter,
       unassigned: unassignedOnly || undefined,
     },
     limit: pageSize,
@@ -107,13 +105,6 @@ export default function OrdersListPage() {
       className: 'min-w-[130px] whitespace-nowrap',
       cell: (row) => <StatusBadge status={row.status} type="order" />,
     },
-    {
-      id: 'type',
-      header: t('movethewheels.orders.table.type', 'Type'),
-      accessorKey: 'orderType',
-      className: 'min-w-[70px] whitespace-nowrap',
-      cell: (row) => <TypeBadge type={row.orderType} />,
-    },
     {
       id: 'priority',
       header: t('movethewheels.orders.table.priority', 'Priority'),
@@ -227,7 +218,7 @@ export default function OrdersListPage() {
       <PagePurpose icon={<Package size={18} />}>
         {t(
           'movethewheels.orders.purpose',
-          'Every delivery job lives here — B2B and B2C orders, their status, priority and value. Use this list to find an order, filter by status or type, and open one to assign a driver, track it, or update fulfilment.'
+          'Every delivery job lives here — their status, priority and value. Use this list to find an order, filter by status, and open one to assign a driver, track it, or update fulfilment.'
         )}
       </PagePurpose>
 
@@ -294,24 +285,6 @@ export default function OrdersListPage() {
                 ))}
               </SelectContent>
             </Select>
-            <Select
-              value={typeFilter}
-              onValueChange={(value) => {
-                setTypeFilter(value as 'b2b' | 'b2c' | 'all');
-                resetPage();
-              }}
-            >
-              <SelectTrigger className="w-[150px]">
-                <SelectValue placeholder={t('movethewheels.orders.filters.type', 'Type')} />
-              </SelectTrigger>
-              <SelectContent>
-                <SelectItem value="all">
-                  {t('movethewheels.orders.filters.allTypes', 'All Types')}
-                </SelectItem>
-                <SelectItem value="b2b">B2B</SelectItem>
-                <SelectItem value="b2c">B2C</SelectItem>
-              </SelectContent>
-            </Select>
             <Button
               variant={unassignedOnly ? 'default' : 'outline'}
               size="sm"
@@ -329,7 +302,6 @@ export default function OrdersListPage() {
                 size="sm"
                 onClick={() => {
                   setStatusFilter('all');
-                  setTypeFilter('all');
                   setUnassignedOnly(false);
                   resetPage();
                 }}

package/src/movethewheels/types/index.ts

@@ -271,7 +271,6 @@ export interface Order {
   };
   items: OrderItem[];
   status: OrderStatus;
-  orderType: 'b2b' | 'b2c';
   priority: 'low' | 'normal' | 'high' | 'urgent';
   pickupAddress: Address;
   deliveryAddress: Address;
@@ -722,10 +721,9 @@ export interface OrderFilter {
   dateFrom?: Date;
   dateTo?: Date;
   priority?: string;
-  orderType?: 'b2b' | 'b2c';
   /**
    * Client-side quick filter for orders that still need a driver assigned
-   * (driverId is null). The backend OrderFilterInput has no null-driver
+   * (driverId is null). The backend DeliveryJobFilterInput has no null-driver
    * predicate, so this is applied to the fetched page after mapping.
    */
   unassigned?: boolean;