@burdenoff/microfe-movethewheels 2026.920.1 → 2026.920.3

package/src/movethewheels/pages/CreateOrderPage.tsx

@@ -5,7 +5,7 @@
  */
 
 import { useEffect, useState } from 'react';
-import { useParams } from 'react-router';
+import { useParams, useSearchParams } from 'react-router';
 import { Package, ArrowLeft, Save, Plus, Trash2, Users, MapPin, CalendarClock } from 'lucide-react';
 import { PageLayout, EmptyState } from '../components/PageLayout';
 import { FormError } from '../components/FormError';
@@ -27,9 +27,11 @@ import {
 } from '../components/ui';
 import { EmphasisPanel, NextSteps, PagePurpose } from '@burdenoff/fe-libs/ui';
 import { useOrder, useOrders } from '../hooks/useOrders';
-import { useCustomers } from '../hooks/useCustomers';
+import { useCustomer, useCustomers } from '../hooks/useCustomers';
 import { useMoveTheWheels } from '../providers/MoveTheWheelsProvider';
-import { joinPath } from '../utils/navigation';
+import { joinPath, buildCustomerCreatePath } from '../utils/navigation';
+import { CustomerPicker } from '../components/CustomerPicker';
+import type { Customer } from '../types';
 
 /**
  * `<input type="datetime-local">` needs a `YYYY-MM-DDTHH:mm` string in LOCAL
@@ -49,15 +51,25 @@ function toDateTimeLocalValue(date: Date | undefined): string {
 
 export default function CreateOrderPage() {
   const { orderId } = useParams<{ orderId: string }>();
+  const [searchParams] = useSearchParams();
+  const prefilledCustomerId = searchParams.get('customerId')?.trim() || undefined;
   const { basePath, navigate } = useMoveTheWheels();
   const { order } = useOrder(orderId);
   const { createOrder, updateOrder } = useOrders();
-  const { customers } = useCustomers({ limit: 100 });
+  const {
+    customers,
+    createCustomer,
+    isLoading: customersLoading,
+    error: customersError,
+    refetch: refetchCustomers,
+  } = useCustomers({ limit: 100 });
+  const { customer: linkedCustomer } = useCustomer(prefilledCustomerId ?? order?.customerId);
 
   const isEditing = !!orderId && !!order;
 
+  const [selectedCustomer, setSelectedCustomer] = useState<Customer | null>(null);
   const [formData, setFormData] = useState({
-    customerId: order?.customerId || '',
+    customerId: prefilledCustomerId || order?.customerId || '',
     priority: order?.priority || 'normal',
     pickupAddress: {
       street: order?.pickupAddress.street || '',
@@ -81,6 +93,18 @@ export default function CreateOrderPage() {
   const [isSubmitting, setIsSubmitting] = useState(false);
   const [formError, setFormError] = useState<string | null>(null);
 
+  useEffect(() => {
+    if (!linkedCustomer) {
+      return;
+    }
+    setSelectedCustomer((previous) =>
+      previous?.id === linkedCustomer.id ? previous : linkedCustomer
+    );
+    setFormData((previous) =>
+      previous.customerId ? previous : { ...previous, customerId: linkedCustomer.id }
+    );
+  }, [linkedCustomer]);
+
   // Prefill the form from the loaded order when editing. `order` arrives
   // asynchronously after the initial render, so the useState initializers alone
   // leave the fields blank until this syncs them.
@@ -112,15 +136,24 @@ export default function CreateOrderPage() {
   }, [order]);
 
   const goBack = () => {
-    if (navigate) {
-      navigate(joinPath(basePath, 'orders'));
+    if (!navigate) {
+      return;
+    }
+    if (!isEditing && prefilledCustomerId) {
+      navigate(joinPath(basePath, `customers/${prefilledCustomerId}`));
+      return;
     }
+    navigate(joinPath(basePath, 'orders'));
   };
 
+  const getSelectedCustomer = () =>
+    selectedCustomer ?? customers.find((customer) => customer.id === formData.customerId);
+
   const validate = (): string | null => {
-    const selectedCustomer = customers.find((c) => c.id === formData.customerId);
-    if (!formData.customerId || !selectedCustomer) {
-      return 'Select a customer for this order.';
+    if (!formData.customerId || !getSelectedCustomer()) {
+      return customersError
+        ? 'Customers could not be loaded. Retry or create a customer before continuing.'
+        : 'Select a customer for this order.';
     }
     if (!formData.pickupAddress.street.trim()) {
       return 'Enter a pickup street address.';
@@ -147,9 +180,13 @@ export default function CreateOrderPage() {
       return;
     }
 
-    const selectedCustomer = customers.find((c) => c.id === formData.customerId);
+    const selectedCustomer = getSelectedCustomer();
     if (!selectedCustomer) {
-      setFormError('Select a customer for this order.');
+      setFormError(
+        customersError
+          ? 'Customers could not be loaded. Retry or create a customer before continuing.'
+          : 'Select a customer for this order.'
+      );
       return;
     }
 
@@ -242,6 +279,14 @@ export default function CreateOrderPage() {
     }));
   };
 
+  const goToCustomerCreate = () => {
+    if (!navigate) {
+      return;
+    }
+    const orderPath = isEditing && orderId ? `orders/${orderId}/edit` : 'orders/new';
+    navigate(joinPath(basePath, buildCustomerCreatePath(orderPath)));
+  };
+
   return (
     <PageLayout
       title={isEditing ? 'Edit Order' : 'Create Order'}
@@ -253,7 +298,7 @@ export default function CreateOrderPage() {
             <ArrowLeft size={16} />
             Cancel
           </Button>
-          <Button onClick={handleSubmit} disabled={isSubmitting}>
+          <Button onClick={handleSubmit} disabled={isSubmitting || customersLoading}>
             <Save size={16} />
             {isSubmitting ? 'Saving...' : isEditing ? 'Save Changes' : 'Create Order'}
           </Button>
@@ -304,24 +349,32 @@ export default function CreateOrderPage() {
           <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-2 gap-4">
-              <div className="space-y-2">
-                <Label htmlFor="customer">Customer</Label>
-                <Select
-                  value={formData.customerId}
-                  onValueChange={(value) => updateField('customerId', value)}
-                >
-                  <SelectTrigger id="customer">
-                    <SelectValue placeholder="Select customer" />
-                  </SelectTrigger>
-                  <SelectContent>
-                    {customers.map((customer) => (
-                      <SelectItem key={customer.id} value={customer.id}>
-                        {customer.name} ({customer.email})
-                      </SelectItem>
-                    ))}
-                  </SelectContent>
-                </Select>
-              </div>
+              <CustomerPicker
+                customers={customers}
+                value={formData.customerId}
+                onValueChange={(value) => {
+                  if (!value) {
+                    return;
+                  }
+                  updateField('customerId', value);
+                  setSelectedCustomer(
+                    customers.find((customer) => customer.id === value) ??
+                      (selectedCustomer?.id === value ? selectedCustomer : null)
+                  );
+                  setFormError(null);
+                }}
+                onCreated={(customer) => {
+                  setSelectedCustomer(customer);
+                  updateField('customerId', customer.id);
+                  setFormError(null);
+                }}
+                createCustomer={createCustomer}
+                isLoading={customersLoading}
+                error={customersError}
+                onRetry={refetchCustomers}
+                onOpenCustomers={goToCustomerCreate}
+                selectedCustomer={selectedCustomer}
+              />
               <div className="space-y-2">
                 <Label htmlFor="priority">Priority</Label>
                 <Select

package/src/movethewheels/pages/CustomerDetailsPage.tsx

@@ -3,7 +3,7 @@
  */
 
 import { useEffect, useState } from 'react';
-import { useParams } from 'react-router';
+import { useParams, useSearchParams } from 'react-router';
 import {
   Users,
   ArrowLeft,
@@ -40,7 +40,7 @@ import { useCustomer, useCustomers } from '../hooks/useCustomers';
 import { useOrders } from '../hooks/useOrders';
 import { useMoveTheWheels } from '../providers/MoveTheWheelsProvider';
 import { formatAddress, formatCurrency, formatDate } from '../utils/formatters';
-import { joinPath } from '../utils/navigation';
+import { joinPath, buildOrderCustomerPath, getSafeCustomerReturnPath } from '../utils/navigation';
 import { FormError } from '../components/FormError';
 import { Notice, useNotice } from '../components/Notice';
 
@@ -62,6 +62,8 @@ function safeHttpUrl(raw: string | undefined): string | null {
 
 function NewCustomerForm() {
   const { basePath, navigate } = useMoveTheWheels();
+  const [searchParams] = useSearchParams();
+  const returnTo = getSafeCustomerReturnPath(searchParams.get('returnTo'));
   const { createCustomer } = useCustomers();
   const [form, setForm] = useState({
     name: '',
@@ -91,7 +93,10 @@ function NewCustomerForm() {
         phone: form.phone.trim() || undefined,
         company: form.company.trim() || undefined,
       });
-      navigate?.(joinPath(basePath, `customers/${created.id}`));
+      const destination = returnTo
+        ? buildOrderCustomerPath(returnTo, created.id)
+        : `customers/${created.id}`;
+      navigate?.(joinPath(basePath, destination));
     } catch (err) {
       console.error('Failed to create customer:', err);
       setError(err instanceof Error ? err.message : 'Failed to create customer. Please try again.');
@@ -330,7 +335,7 @@ export default function CustomerDetailsPage() {
             label: 'Book a delivery for this customer',
             description: 'Start a new order pre-filled for this account.',
             icon: <FileText size={16} />,
-            onClick: () => goTo('orders/new'),
+            onClick: () => goTo(buildOrderCustomerPath('orders/new', customer.id)),
           },
           {
             id: 'edit',
@@ -475,7 +480,11 @@ export default function CustomerDetailsPage() {
               <CardTitle className="flex items-center gap-2">
                 <Package size={18} /> Orders
               </CardTitle>
-              <Button variant="outline" size="sm" onClick={() => goTo('orders/new')}>
+              <Button
+                variant="outline"
+                size="sm"
+                onClick={() => goTo(buildOrderCustomerPath('orders/new', customer.id))}
+              >
                 <FileText size={14} /> New order
               </Button>
             </CardHeader>
@@ -508,7 +517,7 @@ export default function CustomerDetailsPage() {
                   <p className="text-text-secondary">No orders yet for this customer</p>
                   <button
                     type="button"
-                    onClick={() => goTo('orders/new')}
+                    onClick={() => goTo(buildOrderCustomerPath('orders/new', customer.id))}
                     className="mt-1 text-sm text-primary hover:underline"
                   >
                     Book their first delivery

package/src/movethewheels/pages/ShippingRatesPage.tsx

@@ -48,6 +48,9 @@ export default function ShippingRatesPage() {
   const [width, setWidth] = useState('');
   const [height, setHeight] = useState('');
   const [cod, setCod] = useState(false);
+  const [distance, setDistance] = useState('');
+  const [costPerKm, setCostPerKm] = useState('');
+  const [fixedCost, setFixedCost] = useState('');
   const [isLoading, setIsLoading] = useState(false);
   const [error, setError] = useState<string | null>(null);
   const [result, setResult] = useState<ShippingQuoteResult | null>(null);
@@ -82,11 +85,41 @@ export default function ShippingRatesPage() {
       return;
     }
 
+    const fleetDistance = optionalNumber(distance);
+    const fleetCostPerKm = optionalNumber(costPerKm);
+    const fleetFixed = optionalNumber(fixedCost);
+    const fleetGiven = fleetDistance !== undefined || fleetCostPerKm !== undefined;
+    if (
+      fleetGiven &&
+      (!fleetDistance || fleetDistance <= 0 || !fleetCostPerKm || fleetCostPerKm <= 0)
+    ) {
+      setError(
+        tr(
+          'movethewheels.shipping.form.ownFleetError',
+          'To compare with your own vehicle, enter both the distance and your cost per km'
+        )
+      );
+      return;
+    }
+    if (fleetFixed !== undefined && fleetFixed < 0) {
+      setError(tr('movethewheels.shipping.form.fixedCostError', 'Fixed cost cannot be negative'));
+      return;
+    }
+
     const input: ShippingQuoteInput = {
       pickupPostcode: pickup,
       deliveryPostcode: delivery,
       weightKg,
       cod,
+      ...(fleetGiven && fleetDistance && fleetCostPerKm
+        ? {
+            ownFleet: {
+              distanceKm: fleetDistance,
+              costPerKm: fleetCostPerKm,
+              ...(fleetFixed ? { fixedCost: fleetFixed } : {}),
+            },
+          }
+        : {}),
       ...(given === 3 ? { lengthCm: dims[0], widthCm: dims[1], heightCm: dims[2] } : {}),
     };
 
@@ -193,6 +226,58 @@ export default function ShippingRatesPage() {
                   />
                 </div>
               </div>
+              <fieldset className="space-y-3 rounded-lg border p-4">
+                <legend className="px-1 text-sm font-medium">
+                  {tr(
+                    'movethewheels.shipping.form.ownFleetTitle',
+                    'Compare with your own vehicle (optional)'
+                  )}
+                </legend>
+                <p className="text-sm text-text-secondary">
+                  {tr(
+                    'movethewheels.shipping.form.ownFleetHelp',
+                    'Enter the road distance and what it costs you to run a vehicle per km, and we will show it next to the courier prices.'
+                  )}
+                </p>
+                <div className="grid gap-3 sm:grid-cols-3">
+                  <div className="space-y-1">
+                    <Label htmlFor="rate-distance">
+                      {tr('movethewheels.shipping.form.distance', 'Distance (km)')}
+                    </Label>
+                    <Input
+                      id="rate-distance"
+                      inputMode="decimal"
+                      value={distance}
+                      onChange={(e) => setDistance(e.target.value)}
+                    />
+                  </div>
+                  <div className="space-y-1">
+                    <Label htmlFor="rate-cost-per-km">
+                      {tr('movethewheels.shipping.form.costPerKm', 'Your cost per km (₹)')}
+                    </Label>
+                    <Input
+                      id="rate-cost-per-km"
+                      inputMode="decimal"
+                      value={costPerKm}
+                      onChange={(e) => setCostPerKm(e.target.value)}
+                    />
+                  </div>
+                  <div className="space-y-1">
+                    <Label htmlFor="rate-fixed-cost">
+                      {tr(
+                        'movethewheels.shipping.form.fixedCost',
+                        'Fixed cost per trip (₹, optional)'
+                      )}
+                    </Label>
+                    <Input
+                      id="rate-fixed-cost"
+                      inputMode="decimal"
+                      value={fixedCost}
+                      onChange={(e) => setFixedCost(e.target.value)}
+                    />
+                  </div>
+                </div>
+              </fieldset>
               <div className="flex items-center gap-2">
                 <Switch id="rate-cod" checked={cod} onCheckedChange={setCod} />
                 <Label htmlFor="rate-cod">

package/src/movethewheels/utils/navigation.ts

@@ -68,3 +68,35 @@ export function parseQueryParams(search: string): Record<string, string> {
   });
   return params;
 }
+
+const CUSTOMER_RETURN_PATHS = [/^orders\/new$/, /^orders\/[^/?#]+\/edit$/];
+
+/**
+ * Return only an internal order destination for customer create-and-return flows.
+ * Query strings are intentionally discarded so callers cannot smuggle a second
+ * return target or an open redirect through the customer form.
+ */
+export function getSafeCustomerReturnPath(value: string | null | undefined): string | null {
+  if (!value || value.length > 200 || value.includes('://') || value.startsWith('/')) {
+    return null;
+  }
+
+  const [pathname] = value.split(/[?#]/, 1);
+  return CUSTOMER_RETURN_PATHS.some((pattern) => pattern.test(pathname)) ? pathname : null;
+}
+
+/**
+ * Build an order route with a customer preselected after a customer is created.
+ */
+export function buildOrderCustomerPath(orderPath: string, customerId: string): string {
+  const safeOrderPath = getSafeCustomerReturnPath(orderPath);
+  return safeOrderPath ? buildUrl(safeOrderPath, { customerId }) : orderPath;
+}
+
+/**
+ * Build the local customer creation route while preserving a safe order return path.
+ */
+export function buildCustomerCreatePath(orderPath: string): string {
+  const safeOrderPath = getSafeCustomerReturnPath(orderPath);
+  return safeOrderPath ? buildUrl('customers/new', { returnTo: safeOrderPath }) : 'customers/new';
+}