@fleetbase/fleetops-engine 0.6.48 → 0.6.50

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (266) hide show
  1. package/addon/components/customer/create-order-form.hbs +2 -2
  2. package/addon/components/customer/form.hbs +2 -2
  3. package/addon/components/customer/order-form.hbs +2 -2
  4. package/addon/components/customer/orders.hbs +2 -2
  5. package/addon/components/display-place.hbs +2 -2
  6. package/addon/components/driver/details.hbs +5 -1
  7. package/addon/components/driver/form.hbs +11 -1
  8. package/addon/components/fleet-listing-panel.hbs +2 -2
  9. package/addon/components/fleet-listing-panel.js +10 -0
  10. package/addon/components/map/google-live-map.js +18 -75
  11. package/addon/components/map/leaflet-live-map.hbs +187 -37
  12. package/addon/components/map/leaflet-live-map.js +184 -20
  13. package/addon/components/modals/order-change-destination.hbs +46 -0
  14. package/addon/components/modals/order-change-destination.js +106 -0
  15. package/addon/components/modals/stop-activity.hbs +28 -0
  16. package/addon/components/modals/stop-activity.js +52 -0
  17. package/addon/components/modals/update-order-activity.hbs +45 -3
  18. package/addon/components/modals/update-order-activity.js +143 -5
  19. package/addon/components/orchestrator/phase-builder.hbs +21 -0
  20. package/addon/components/orchestrator/phase-builder.js +13 -0
  21. package/addon/components/orchestrator/resource-panel.hbs +0 -10
  22. package/addon/components/orchestrator/resource-panel.js +2 -4
  23. package/addon/components/orchestrator-workbench.js +1 -0
  24. package/addon/components/order/activity-list.hbs +2 -2
  25. package/addon/components/order/activity-timeline.hbs +31 -29
  26. package/addon/components/order/details/activity.hbs +3 -3
  27. package/addon/components/order/details/activity.js +11 -0
  28. package/addon/components/order/details/documents.js +2 -0
  29. package/addon/components/order/details/purchase-rate.hbs +2 -2
  30. package/addon/components/order/details/route.hbs +11 -3
  31. package/addon/components/order/details/route.js +91 -14
  32. package/addon/components/order/details/tracking.hbs +101 -72
  33. package/addon/components/order/details/tracking.js +149 -2
  34. package/addon/components/order/form/details.hbs +3 -3
  35. package/addon/components/order/form/documents.js +11 -4
  36. package/addon/components/order/form/route.hbs +108 -104
  37. package/addon/components/order/form/route.js +37 -1
  38. package/addon/components/order/form/service-rate.hbs +2 -2
  39. package/addon/components/order/form.hbs +2 -2
  40. package/addon/components/order-config-manager/activity-flow.hbs +4 -1
  41. package/addon/components/order-config-manager/activity-flow.js +178 -12
  42. package/addon/components/place/address.js +1 -1
  43. package/addon/components/route-list.hbs +17 -17
  44. package/addon/components/route-list.js +42 -10
  45. package/addon/components/service-rate/details.hbs +41 -0
  46. package/addon/components/service-rate/form.hbs +118 -0
  47. package/addon/components/service-rate/form.js +55 -0
  48. package/addon/components/vehicle/form.js +1 -1
  49. package/addon/components/vehicle/pill.hbs +1 -1
  50. package/addon/components/widget/fleet-ops-key-metrics.hbs +19 -17
  51. package/addon/components/widget/fleet-ops-key-metrics.js +26 -0
  52. package/addon/components/widget/fuel-efficiency.hbs +26 -0
  53. package/addon/components/widget/fuel-efficiency.js +43 -0
  54. package/addon/components/widget/geofence-violations.hbs +44 -0
  55. package/addon/components/widget/geofence-violations.js +55 -0
  56. package/addon/components/widget/issues-insights.hbs +43 -0
  57. package/addon/components/widget/issues-insights.js +62 -0
  58. package/addon/components/widget/kpi-active-orders.hbs +10 -0
  59. package/addon/components/widget/kpi-active-orders.js +5 -0
  60. package/addon/components/widget/kpi-aov.hbs +10 -0
  61. package/addon/components/widget/kpi-aov.js +5 -0
  62. package/addon/components/widget/kpi-distance.hbs +10 -0
  63. package/addon/components/widget/kpi-distance.js +5 -0
  64. package/addon/components/widget/kpi-drivers-online.hbs +10 -0
  65. package/addon/components/widget/kpi-drivers-online.js +5 -0
  66. package/addon/components/widget/kpi-earnings.hbs +10 -0
  67. package/addon/components/widget/kpi-earnings.js +5 -0
  68. package/addon/components/widget/kpi-open-issues.hbs +11 -0
  69. package/addon/components/widget/kpi-open-issues.js +5 -0
  70. package/addon/components/widget/kpi-tile.hbs +59 -0
  71. package/addon/components/widget/kpi-tile.js +168 -0
  72. package/addon/components/widget/live-fleet.hbs +122 -0
  73. package/addon/components/widget/live-fleet.js +365 -0
  74. package/addon/components/widget/maintenance-overview.hbs +45 -0
  75. package/addon/components/widget/maintenance-overview.js +40 -0
  76. package/addon/components/widget/on-time-delivery.hbs +27 -0
  77. package/addon/components/widget/on-time-delivery.js +73 -0
  78. package/addon/components/widget/operations-pulse.hbs +51 -0
  79. package/addon/components/widget/operations-pulse.js +173 -0
  80. package/addon/components/widget/orders-by-status.hbs +26 -0
  81. package/addon/components/widget/orders-by-status.js +54 -0
  82. package/addon/components/widget/revenue-trend.hbs +34 -0
  83. package/addon/components/widget/revenue-trend.js +67 -0
  84. package/addon/components/widget/top-drivers.hbs +44 -0
  85. package/addon/components/widget/top-drivers.js +54 -0
  86. package/addon/controllers/management/vehicles/index/new.js +1 -1
  87. package/addon/controllers/operations/orders/index/details.js +4 -4
  88. package/addon/controllers/operations/orders/index.js +14 -0
  89. package/addon/controllers/settings/routing.js +26 -0
  90. package/addon/extension.js +172 -3
  91. package/addon/helpers/place-address-html.js +2 -2
  92. package/addon/routes/operations/service-rates/index.js +1 -1
  93. package/addon/services/geofence.js +163 -19
  94. package/addon/services/leaflet-contextmenu-manager.js +27 -0
  95. package/addon/services/map-adapter/google.js +13 -2
  96. package/addon/services/vehicle-actions.js +1 -1
  97. package/addon/styles/fleetops-engine.css +205 -88
  98. package/addon/templates/maintenance/equipment/index.hbs +1 -1
  99. package/addon/templates/maintenance/parts/index.hbs +1 -1
  100. package/addon/templates/maintenance/schedules/index.hbs +1 -1
  101. package/addon/templates/management/vehicles/index.hbs +1 -1
  102. package/addon/templates/settings/avatars.hbs +1 -1
  103. package/addon/templates/settings/custom-fields.hbs +1 -1
  104. package/addon/templates/settings/map.hbs +1 -1
  105. package/addon/templates/settings/navigator-app.hbs +1 -1
  106. package/addon/templates/settings/notifications.hbs +1 -1
  107. package/addon/templates/settings/orchestrator.hbs +1 -1
  108. package/addon/templates/settings/payments/index.hbs +1 -1
  109. package/addon/templates/settings/payments/onboard.hbs +1 -1
  110. package/addon/templates/settings/routing.hbs +22 -2
  111. package/addon/templates/settings/scheduling.hbs +1 -1
  112. package/addon/utils/fleet-ops-options.js +2 -1
  113. package/addon/utils/live-map-card-content.js +171 -0
  114. package/addon/utils/normalize-order-config-flow.js +41 -0
  115. package/addon/utils/place-address-html.js +3 -2
  116. package/addon/utils/route-visualization.js +54 -7
  117. package/app/components/modals/order-change-destination.js +1 -0
  118. package/app/components/modals/stop-activity.js +1 -0
  119. package/app/components/widget/fuel-efficiency.js +1 -0
  120. package/app/components/widget/geofence-violations.js +1 -0
  121. package/app/components/widget/issues-insights.js +1 -0
  122. package/app/components/widget/kpi-active-orders.js +1 -0
  123. package/app/components/widget/kpi-aov.js +1 -0
  124. package/app/components/widget/kpi-distance.js +1 -0
  125. package/app/components/widget/kpi-drivers-online.js +1 -0
  126. package/app/components/widget/kpi-earnings.js +1 -0
  127. package/app/components/widget/kpi-open-issues.js +1 -0
  128. package/app/components/widget/kpi-tile.js +1 -0
  129. package/app/components/widget/live-fleet.js +1 -0
  130. package/app/components/widget/maintenance-overview.js +1 -0
  131. package/app/components/widget/on-time-delivery.js +1 -0
  132. package/app/components/widget/operations-pulse.js +1 -0
  133. package/app/components/widget/orders-by-status.js +1 -0
  134. package/app/components/widget/revenue-trend.js +1 -0
  135. package/app/components/widget/top-drivers.js +1 -0
  136. package/app/utils/live-map-card-content.js +1 -0
  137. package/composer.json +1 -1
  138. package/extension.json +1 -1
  139. package/package.json +3 -3
  140. package/pnpm-workspace.yaml +1 -0
  141. package/server/config/telematics.php +111 -1
  142. package/server/migrations/2026_05_18_000001_add_license_expiry_to_drivers_table.php +25 -0
  143. package/server/migrations/2026_05_21_000001_add_geographic_rules_to_service_rate_fees_table.php +37 -0
  144. package/server/migrations/2026_05_25_000001_add_endpoint_tracking_refs_to_payloads_table.php +50 -0
  145. package/server/migrations/2026_05_27_000001_default_driver_vehicle_statuses_to_available.php +48 -0
  146. package/server/resources/views/labels/default.php +57 -49
  147. package/server/resources/views/labels/waypoint-label.php +27 -20
  148. package/server/seeders/Testing/Concerns/SeedsTestingData.php +183 -0
  149. package/server/seeders/Testing/ConnectivitySeeder.php +213 -0
  150. package/server/seeders/Testing/FleetSeeder.php +341 -0
  151. package/server/seeders/Testing/MaintenanceSeeder.php +238 -0
  152. package/server/seeders/Testing/NetworkSeeder.php +250 -0
  153. package/server/seeders/Testing/OrdersSeeder.php +198 -0
  154. package/server/seeders/Testing/TestingSeeder.php +40 -0
  155. package/server/seeders/{VroomOrchestrationSeeder.php → Testing/VroomOrchestrationSeeder.php} +29 -22
  156. package/server/src/Console/Commands/AuditCustomerUserConflicts.php +75 -0
  157. package/server/src/Console/Commands/ProcessOperationalAlerts.php +279 -0
  158. package/server/src/Exceptions/CustomerUserConflictException.php +13 -0
  159. package/server/src/Http/Controllers/Api/v1/ContactController.php +17 -2
  160. package/server/src/Http/Controllers/Api/v1/CustomerController.php +876 -0
  161. package/server/src/Http/Controllers/Api/v1/DriverController.php +1 -1
  162. package/server/src/Http/Controllers/Api/v1/OrderConfigController.php +54 -0
  163. package/server/src/Http/Controllers/Api/v1/OrderController.php +98 -70
  164. package/server/src/Http/Controllers/Api/v1/ServiceAreaController.php +2 -2
  165. package/server/src/Http/Controllers/Api/v1/VehicleController.php +20 -3
  166. package/server/src/Http/Controllers/Internal/v1/AnalyticsController.php +119 -0
  167. package/server/src/Http/Controllers/Internal/v1/ContactController.php +19 -0
  168. package/server/src/Http/Controllers/Internal/v1/LiveController.php +101 -66
  169. package/server/src/Http/Controllers/Internal/v1/MetricsController.php +82 -3
  170. package/server/src/Http/Controllers/Internal/v1/OrderController.php +441 -32
  171. package/server/src/Http/Controllers/Internal/v1/ServiceQuoteController.php +1 -1
  172. package/server/src/Http/Controllers/Internal/v1/SettingController.php +46 -1
  173. package/server/src/Http/Controllers/Internal/v1/VehicleController.php +54 -1
  174. package/server/src/Http/Middleware/AuthenticateCustomerToken.php +34 -0
  175. package/server/src/Http/Requests/CreateCustomerOrderRequest.php +63 -0
  176. package/server/src/Http/Requests/CreateCustomerRequest.php +48 -0
  177. package/server/src/Http/Requests/CreateDriverRequest.php +1 -1
  178. package/server/src/Http/Requests/CreateVehicleRequest.php +25 -1
  179. package/server/src/Http/Requests/Internal/CreateDriverRequest.php +1 -1
  180. package/server/src/Http/Requests/VerifyCreateCustomerRequest.php +29 -0
  181. package/server/src/Http/Resources/Internal/v1/OrderConfig.php +41 -0
  182. package/server/src/Http/Resources/v1/Customer.php +79 -0
  183. package/server/src/Http/Resources/v1/Driver.php +2 -0
  184. package/server/src/Http/Resources/v1/Fleet.php +4 -0
  185. package/server/src/Http/Resources/v1/Index/Driver.php +48 -0
  186. package/server/src/Http/Resources/v1/Index/Vehicle.php +74 -1
  187. package/server/src/Http/Resources/v1/OrderConfig.php +74 -0
  188. package/server/src/Http/Resources/v1/Payload.php +23 -20
  189. package/server/src/Http/Resources/v1/ServiceArea.php +33 -19
  190. package/server/src/Http/Resources/v1/ServiceRateFee.php +7 -0
  191. package/server/src/Listeners/HandleOrderDispatched.php +2 -2
  192. package/server/src/Models/Contact.php +92 -15
  193. package/server/src/Models/Customer.php +64 -0
  194. package/server/src/Models/Driver.php +14 -3
  195. package/server/src/Models/Entity.php +2 -2
  196. package/server/src/Models/Order.php +29 -4
  197. package/server/src/Models/OrderConfig.php +14 -11
  198. package/server/src/Models/Payload.php +17 -1
  199. package/server/src/Models/ServiceRate.php +273 -1
  200. package/server/src/Models/ServiceRateFee.php +39 -9
  201. package/server/src/Models/TrackingNumber.php +8 -2
  202. package/server/src/Models/Vehicle.php +18 -2
  203. package/server/src/Models/Waypoint.php +2 -2
  204. package/server/src/Notifications/LateDeparture.php +48 -0
  205. package/server/src/Notifications/ProlongedStoppage.php +48 -0
  206. package/server/src/Notifications/RouteDeviation.php +48 -0
  207. package/server/src/Observers/ContactObserver.php +2 -0
  208. package/server/src/Observers/ServiceRateObserver.php +6 -6
  209. package/server/src/Orchestration/Engines/VroomOrchestrationEngine.php +29 -2
  210. package/server/src/Providers/FleetOpsServiceProvider.php +6 -0
  211. package/server/src/Providers/NotificationServiceProvider.php +3 -0
  212. package/server/src/Support/Analytics/AbstractAnalytics.php +77 -0
  213. package/server/src/Support/Analytics/FuelEfficiency.php +83 -0
  214. package/server/src/Support/Analytics/GeofenceViolations.php +63 -0
  215. package/server/src/Support/Analytics/IssuesInsights.php +67 -0
  216. package/server/src/Support/Analytics/LiveFleet.php +127 -0
  217. package/server/src/Support/Analytics/MaintenanceOverview.php +70 -0
  218. package/server/src/Support/Analytics/OnTimeDelivery.php +75 -0
  219. package/server/src/Support/Analytics/OperationsPulse.php +86 -0
  220. package/server/src/Support/Analytics/OrdersByStatus.php +64 -0
  221. package/server/src/Support/Analytics/RevenueTrend.php +78 -0
  222. package/server/src/Support/Analytics/TopDrivers.php +92 -0
  223. package/server/src/Support/CustomerAuth.php +98 -0
  224. package/server/src/Support/LabelPdf.php +52 -0
  225. package/server/src/Support/Metrics/AbstractMetric.php +170 -0
  226. package/server/src/Support/Metrics/ActiveLiveOrdersMetric.php +28 -0
  227. package/server/src/Support/Metrics/AvgOrderValueMetric.php +53 -0
  228. package/server/src/Support/Metrics/DriversOnlineMetric.php +30 -0
  229. package/server/src/Support/Metrics/EarningsMetric.php +30 -0
  230. package/server/src/Support/Metrics/FuelCostsMetric.php +30 -0
  231. package/server/src/Support/Metrics/MoneyMetric.php +30 -0
  232. package/server/src/Support/Metrics/OpenIssuesMetric.php +35 -0
  233. package/server/src/Support/Metrics/OrdersCanceledMetric.php +35 -0
  234. package/server/src/Support/Metrics/OrdersCompletedMetric.php +35 -0
  235. package/server/src/Support/Metrics/OrdersInProgressMetric.php +51 -0
  236. package/server/src/Support/Metrics/OrdersScheduledMetric.php +37 -0
  237. package/server/src/Support/Metrics/Registry.php +46 -0
  238. package/server/src/Support/Metrics/ResolvedIssuesMetric.php +35 -0
  239. package/server/src/Support/Metrics/TotalCustomersMetric.php +29 -0
  240. package/server/src/Support/Metrics/TotalDistanceTraveledMetric.php +35 -0
  241. package/server/src/Support/Metrics/TotalDriversMetric.php +28 -0
  242. package/server/src/Support/Metrics/TotalTimeTraveledMetric.php +35 -0
  243. package/server/src/Support/Metrics.php +46 -249
  244. package/server/src/Support/ResolvesOrderServiceStops.php +512 -0
  245. package/server/src/Support/Telematics/Providers/AfaqyProvider.php +290 -0
  246. package/server/src/Support/Telematics/Providers/SafeeProvider.php +333 -0
  247. package/server/src/Tracking/TrackingContextBuilder.php +41 -38
  248. package/server/src/Tracking/TrackingIntelligenceService.php +109 -9
  249. package/server/src/Tracking/TrackingStop.php +13 -11
  250. package/server/src/routes.php +50 -0
  251. package/server/tests/AnalyticsRoutesTest.php +41 -0
  252. package/server/tests/CapacityAllocationEngineTest.php +10 -10
  253. package/server/tests/CustomerContactIdentitySafetyTest.php +54 -0
  254. package/server/tests/CustomerEndpointTest.php +199 -0
  255. package/server/tests/DriverVehicleStatusDefaultTest.php +39 -0
  256. package/server/tests/LabelPdfRenderingTest.php +23 -0
  257. package/server/tests/LiveControllerViewportTest.php +60 -0
  258. package/server/tests/MetricsRegistryTest.php +84 -0
  259. package/server/tests/OrchestrationPayloadBuilderTest.php +2 -2
  260. package/server/tests/OrderConfigEndpointTest.php +86 -0
  261. package/server/tests/OrderFileAttachmentTest.php +20 -0
  262. package/server/tests/ServiceAreaZoneApiShapeTest.php +34 -0
  263. package/server/tests/VehicleDriverAssignmentTest.php +18 -0
  264. package/server/tests/VroomOrchestrationEngineTest.php +91 -0
  265. package/translations/en-us.yaml +38 -0
  266. package/server/migrations/2026_05_13_000001_repair_customer_contact_user_types.php +0 -86
@@ -5,12 +5,15 @@ namespace Fleetbase\FleetOps\Tracking;
5
5
  use Fleetbase\FleetOps\Models\Order;
6
6
  use Fleetbase\FleetOps\Models\Place;
7
7
  use Fleetbase\FleetOps\Models\Waypoint;
8
+ use Fleetbase\FleetOps\Support\ResolvesOrderServiceStops;
8
9
  use Fleetbase\FleetOps\Support\Utils;
9
10
  use Illuminate\Support\Collection;
10
11
  use Illuminate\Support\Str;
11
12
 
12
13
  class TrackingContextBuilder
13
14
  {
15
+ use ResolvesOrderServiceStops;
16
+
14
17
  public function build(Order $order, TrackingOptions $options): TrackingContext
15
18
  {
16
19
  $order->loadAssignedDriver();
@@ -18,8 +21,10 @@ class TrackingContextBuilder
18
21
  'payload',
19
22
  'payload.pickup',
20
23
  'payload.dropoff',
24
+ 'payload.return',
21
25
  'payload.waypoints',
22
26
  'payload.waypointMarkers.place',
27
+ 'payload.waypointMarkers.trackingNumber.status',
23
28
  ]);
24
29
 
25
30
  $payload = $order->payload;
@@ -91,54 +96,52 @@ class TrackingContextBuilder
91
96
  $stops = collect();
92
97
  $sequence = 0;
93
98
 
94
- if ($payload->pickup instanceof Place) {
95
- $stops->push(new TrackingStop(
96
- uuid: $payload->pickup->uuid,
97
- publicId: $payload->pickup->public_id,
98
- type: 'pickup',
99
- status: null,
100
- place: $payload->pickup,
101
- completed: !in_array($order->status, ['created', 'dispatched', 'pending']),
102
- sequence: ++$sequence
103
- ));
104
- }
99
+ foreach ($this->payloadServiceStops($payload) as $serviceStop) {
100
+ $place = $serviceStop['place'] ?? null;
101
+ $waypoint = $serviceStop['waypoint'] ?? null;
102
+ $status = $waypoint instanceof Waypoint
103
+ ? $this->waypointServiceStopStatus($waypoint)
104
+ : $this->endpointServiceStopStatus($payload, $serviceStop);
105
105
 
106
- $markers = $payload->waypointMarkers instanceof Collection ? $payload->waypointMarkers : collect();
107
- if ($markers->isNotEmpty()) {
108
- foreach ($markers->sortBy('order')->values() as $waypoint) {
109
- $stops->push($this->stopFromWaypoint($waypoint, ++$sequence));
106
+ if (!$place instanceof Place) {
107
+ continue;
110
108
  }
111
- } elseif ($payload->waypoints instanceof Collection) {
112
- foreach ($payload->waypoints as $place) {
113
- if ($place instanceof Place) {
114
- $stops->push(new TrackingStop(
115
- uuid: $place->uuid,
116
- publicId: $place->public_id,
117
- type: 'waypoint',
118
- status: null,
119
- place: $place,
120
- completed: false,
121
- sequence: ++$sequence
122
- ));
123
- }
124
- }
125
- }
126
109
 
127
- if ($payload->dropoff instanceof Place) {
128
110
  $stops->push(new TrackingStop(
129
- uuid: $payload->dropoff->uuid,
130
- publicId: $payload->dropoff->public_id,
131
- type: 'dropoff',
132
- status: null,
133
- place: $payload->dropoff,
134
- completed: in_array($order->status, ['completed', 'canceled']),
135
- sequence: ++$sequence
111
+ uuid: $place->uuid,
112
+ publicId: $place->public_id,
113
+ type: $serviceStop['type'],
114
+ status: $status ?: null,
115
+ place: $place,
116
+ waypoint: $waypoint,
117
+ completed: $this->serviceStopIsComplete($order, $payload, $serviceStop),
118
+ sequence: ++$sequence,
119
+ trackingNumberUuid: $serviceStop['tracking_number_uuid'] ?? null
136
120
  ));
137
121
  }
138
122
 
139
123
  return $stops->values();
140
124
  }
141
125
 
126
+ protected function endpointServiceStopStatus($payload, array $serviceStop): ?string
127
+ {
128
+ $trackingNumberUuid = $this->serviceStopTrackingNumberUuid($payload, $serviceStop);
129
+ if (!$trackingNumberUuid) {
130
+ return null;
131
+ }
132
+
133
+ return strtolower((string) data_get($this->trackingNumberStatus($trackingNumberUuid), 'code')) ?: null;
134
+ }
135
+
136
+ protected function waypointServiceStopStatus(Waypoint $waypoint): ?string
137
+ {
138
+ if (!$waypoint->tracking_number_uuid) {
139
+ return strtolower((string) $waypoint->status_code) ?: null;
140
+ }
141
+
142
+ return strtolower((string) data_get($this->trackingNumberStatus($waypoint->tracking_number_uuid), 'code')) ?: null;
143
+ }
144
+
142
145
  protected function stopFromWaypoint(Waypoint $waypoint, int $sequence): TrackingStop
143
146
  {
144
147
  $waypoint->loadMissing('place');
@@ -8,6 +8,8 @@ use Illuminate\Support\Facades\Cache;
8
8
 
9
9
  class TrackingIntelligenceService
10
10
  {
11
+ protected const TERMINAL_STATUSES = ['completed', 'canceled'];
12
+
11
13
  public function __construct(
12
14
  protected TrackingContextBuilder $contextBuilder,
13
15
  protected TrackingProviderManager $providerManager,
@@ -34,19 +36,28 @@ class TrackingIntelligenceService
34
36
  'completion_seconds' => data_get($tracker, 'eta.completion_seconds'),
35
37
  'active_stop_at' => data_get($tracker, 'eta.active_stop_at'),
36
38
  'completion_at' => data_get($tracker, 'eta.completion_at'),
39
+ 'start_seconds' => data_get($tracker, 'eta.start_seconds'),
40
+ 'start_at' => data_get($tracker, 'eta.start_at'),
37
41
  'provider' => data_get($tracker, 'provider'),
38
42
  'confidence' => data_get($tracker, 'confidence'),
43
+ 'lifecycle' => data_get($tracker, 'lifecycle'),
39
44
  'warnings' => data_get($tracker, 'warnings', []),
40
45
  ];
41
46
  }
42
47
 
43
48
  protected function buildResult(TrackingContext $context, TrackingProviderResult $providerResult, TrackingOptions $options): array
44
49
  {
45
- $now = now();
46
- $completionSeconds = $providerResult->durationInTrafficSeconds ?? $providerResult->durationSeconds;
47
- $activeStopSeconds = data_get($providerResult->legs, '0.duration_in_traffic_s', data_get($providerResult->legs, '0.duration_s', $completionSeconds));
48
- $progress = $this->progress($context, $providerResult);
49
- $warnings = array_values(array_unique([...$context->warnings, ...$providerResult->warnings]));
50
+ $now = now();
51
+ $rawCompletionSeconds = $providerResult->durationInTrafficSeconds ?? $providerResult->durationSeconds;
52
+ $rawActiveStopSeconds = data_get($providerResult->legs, '0.duration_in_traffic_s', data_get($providerResult->legs, '0.duration_s', $rawCompletionSeconds));
53
+ $lifecycle = $this->lifecycle($context, $rawActiveStopSeconds, $now);
54
+ $showsLiveEta = (bool) data_get($lifecycle, 'show_live_eta');
55
+ $showsStartEta = (bool) data_get($lifecycle, 'show_start_eta');
56
+ $completionSeconds = $showsLiveEta ? $rawCompletionSeconds : null;
57
+ $activeStopSeconds = $showsLiveEta ? $rawActiveStopSeconds : null;
58
+ $startSeconds = $showsStartEta ? $rawActiveStopSeconds : null;
59
+ $progress = $this->progress($context, $providerResult);
60
+ $warnings = array_values(array_unique([...$context->warnings, ...$providerResult->warnings]));
50
61
 
51
62
  if ($providerResult->confidence === 'low') {
52
63
  $warnings[] = 'low_confidence_eta';
@@ -64,6 +75,7 @@ class TrackingIntelligenceService
64
75
  'online' => (bool) data_get($context->driver, 'online', false),
65
76
  ],
66
77
  'progress' => $progress,
78
+ 'lifecycle' => $lifecycle,
67
79
  'stops' => $context->stops->map(fn (TrackingStop $stop) => $stop->toArray())->values()->all(),
68
80
  'active_stop' => $context->activeStop?->toArray(),
69
81
  'next_stop' => $context->nextStop?->toArray(),
@@ -73,13 +85,15 @@ class TrackingIntelligenceService
73
85
  'duration_in_traffic_s' => $providerResult->durationInTrafficSeconds,
74
86
  'polyline' => $providerResult->polyline,
75
87
  'coordinates' => $providerResult->coordinates,
76
- 'legs' => $this->legs($context, $providerResult, $now),
88
+ 'legs' => $this->legs($context, $providerResult, $now, $showsLiveEta),
77
89
  ],
78
90
  'eta' => [
79
91
  'active_stop_seconds' => $activeStopSeconds,
80
92
  'completion_seconds' => $completionSeconds,
81
93
  'active_stop_at' => $this->addSeconds($now, $activeStopSeconds),
82
94
  'completion_at' => $this->addSeconds($now, $completionSeconds),
95
+ 'start_seconds' => $startSeconds,
96
+ 'start_at' => $this->addSeconds($now, $startSeconds),
83
97
  ],
84
98
  'insights' => [
85
99
  'is_delayed' => false,
@@ -107,17 +121,17 @@ class TrackingIntelligenceService
107
121
  ];
108
122
  }
109
123
 
110
- protected function legs(TrackingContext $context, TrackingProviderResult $providerResult, Carbon $now): array
124
+ protected function legs(TrackingContext $context, TrackingProviderResult $providerResult, Carbon $now, bool $showsLiveEta = true): array
111
125
  {
112
126
  $elapsedSeconds = 0;
113
127
 
114
- return collect($providerResult->legs)->map(function ($leg, $index) use ($context, $now, &$elapsedSeconds) {
128
+ return collect($providerResult->legs)->map(function ($leg, $index) use ($context, $now, $showsLiveEta, &$elapsedSeconds) {
115
129
  $stop = $context->remainingStops->values()->get($index);
116
130
  $legSeconds = data_get($leg, 'duration_in_traffic_s', data_get($leg, 'duration_s'));
117
131
  $etaSeconds = null;
118
132
  $etaAt = null;
119
133
 
120
- if ($legSeconds !== null) {
134
+ if ($showsLiveEta && $stop instanceof TrackingStop && $legSeconds !== null) {
121
135
  $elapsedSeconds += (float) $legSeconds;
122
136
  $etaSeconds = $elapsedSeconds;
123
137
  $etaAt = $this->addSeconds($now, $etaSeconds);
@@ -131,6 +145,92 @@ class TrackingIntelligenceService
131
145
  })->all();
132
146
  }
133
147
 
148
+ protected function lifecycle(TrackingContext $context, ?float $startSeconds, Carbon $now): array
149
+ {
150
+ $order = $context->order;
151
+ $status = strtolower((string) ($order->status ?? 'created'));
152
+ $hasAssignedDriver = !empty($order->driver_assigned_uuid);
153
+ $hasStarted = $this->hasOrderStarted($order);
154
+ $isTerminal = in_array($status, self::TERMINAL_STATUSES, true);
155
+ $isDispatched = $status === 'dispatched' || (bool) $order->dispatched;
156
+
157
+ if ($isTerminal) {
158
+ return [
159
+ 'status' => $status,
160
+ 'mode' => $status,
161
+ 'message' => $status === 'completed' ? 'Order has been completed.' : 'Order has been canceled.',
162
+ 'is_terminal' => true,
163
+ 'has_started' => $hasStarted,
164
+ 'show_live_eta' => false,
165
+ 'show_start_eta' => false,
166
+ ];
167
+ }
168
+
169
+ if (!$hasAssignedDriver) {
170
+ return [
171
+ 'status' => $status,
172
+ 'mode' => 'unassigned',
173
+ 'message' => 'Assign a driver to start live tracking and improve ETA accuracy.',
174
+ 'is_terminal' => false,
175
+ 'has_started' => $hasStarted,
176
+ 'show_live_eta' => false,
177
+ 'show_start_eta' => false,
178
+ ];
179
+ }
180
+
181
+ if (!$hasStarted && $isDispatched) {
182
+ return [
183
+ 'status' => $status,
184
+ 'mode' => 'dispatched',
185
+ 'message' => 'Order has been dispatched. Estimated start is based on the assigned driver route to the first stop.',
186
+ 'is_terminal' => false,
187
+ 'has_started' => false,
188
+ 'show_live_eta' => false,
189
+ 'show_start_eta' => $startSeconds !== null,
190
+ 'start_at' => $this->addSeconds($now, $startSeconds),
191
+ ];
192
+ }
193
+
194
+ if (!$hasStarted) {
195
+ return [
196
+ 'status' => $status,
197
+ 'mode' => 'pre_start',
198
+ 'message' => 'Live ETA will begin once the order is started.',
199
+ 'is_terminal' => false,
200
+ 'has_started' => false,
201
+ 'show_live_eta' => false,
202
+ 'show_start_eta' => false,
203
+ ];
204
+ }
205
+
206
+ return [
207
+ 'status' => $status,
208
+ 'mode' => 'active',
209
+ 'message' => null,
210
+ 'is_terminal' => false,
211
+ 'has_started' => true,
212
+ 'show_live_eta' => true,
213
+ 'show_start_eta' => false,
214
+ ];
215
+ }
216
+
217
+ protected function hasOrderStarted(Order $order): bool
218
+ {
219
+ if ((bool) $order->started || $order->started_at || strtolower((string) $order->status) === 'started') {
220
+ return true;
221
+ }
222
+
223
+ try {
224
+ if ($order->relationLoaded('trackingStatuses')) {
225
+ return $order->trackingStatuses->contains(fn ($status) => strtolower((string) data_get($status, 'code')) === 'started');
226
+ }
227
+
228
+ return $order->trackingStatuses()->whereRaw('LOWER(code) = ?', ['started'])->exists();
229
+ } catch (\Throwable) {
230
+ return false;
231
+ }
232
+ }
233
+
134
234
  protected function capabilitiesFor(string $provider): array
135
235
  {
136
236
  $registry = app(TrackingProviderRegistry::class);
@@ -18,6 +18,7 @@ class TrackingStop implements \JsonSerializable
18
18
  public ?Waypoint $waypoint = null,
19
19
  public bool $completed = false,
20
20
  public ?int $sequence = null,
21
+ public ?string $trackingNumberUuid = null,
21
22
  ) {
22
23
  }
23
24
 
@@ -35,20 +36,21 @@ class TrackingStop implements \JsonSerializable
35
36
  $point = $this->point();
36
37
 
37
38
  return [
38
- 'uuid' => $this->uuid,
39
- 'public_id' => $this->publicId,
40
- 'type' => $this->type,
41
- 'status' => $this->status,
42
- 'completed' => $this->completed,
43
- 'sequence' => $this->sequence,
44
- 'address' => data_get($this->place, 'address'),
45
- 'name' => data_get($this->place, 'name'),
46
- 'location' => $point ? [
39
+ 'uuid' => $this->uuid,
40
+ 'public_id' => $this->publicId,
41
+ 'type' => $this->type,
42
+ 'status' => $this->status,
43
+ 'completed' => $this->completed,
44
+ 'sequence' => $this->sequence,
45
+ 'tracking_number_uuid' => $this->trackingNumberUuid,
46
+ 'address' => data_get($this->place, 'address'),
47
+ 'name' => data_get($this->place, 'name'),
48
+ 'location' => $point ? [
47
49
  'type' => 'Point',
48
50
  'coordinates' => [$point->getLng(), $point->getLat()],
49
51
  ] : null,
50
- 'latitude' => $point ? $point->getLat() : null,
51
- 'longitude' => $point ? $point->getLng() : null,
52
+ 'latitude' => $point ? $point->getLat() : null,
53
+ 'longitude' => $point ? $point->getLng() : null,
52
54
  ];
53
55
  }
54
56
 
@@ -49,6 +49,38 @@ Route::prefix(config('fleetops.api.routing.prefix', null))->namespace('Fleetbase
49
49
  $router->put('{id}', 'ContactController@update');
50
50
  $router->delete('{id}', 'ContactController@delete');
51
51
  });
52
+ // order-configs — read-only public projection of the OrderConfig flow.
53
+ $router->group(['prefix' => 'order-configs'], function () use ($router) {
54
+ $router->get('/', 'OrderConfigController@query');
55
+ $router->get('{id}', 'OrderConfigController@find');
56
+ });
57
+ // customers routes — public B2C customer auth + customer-scoped orders.
58
+ // - Public endpoints: API key only (resolves company from credential)
59
+ // - Authenticated endpoints: API key + `Customer-Token` header (Sanctum)
60
+ $router->group(['prefix' => 'customers', 'middleware' => []], function () use ($router) {
61
+ // Public auth flows
62
+ $router->post('request-creation-code', 'CustomerController@requestCreationCode');
63
+ $router->post('/', 'CustomerController@create');
64
+ $router->post('login', 'CustomerController@login');
65
+ $router->post('login-with-sms', 'CustomerController@loginWithPhone');
66
+ $router->post('verify-code', 'CustomerController@verifyCode');
67
+ $router->post('forgot-password', 'CustomerController@forgotPassword');
68
+ $router->post('reset-password', 'CustomerController@resetPassword');
69
+
70
+ // Authenticated (require Customer-Token)
71
+ $router->group(['middleware' => [Fleetbase\FleetOps\Http\Middleware\AuthenticateCustomerToken::class]], function () use ($router) {
72
+ $router->get('me', 'CustomerController@me');
73
+ $router->put('me', 'CustomerController@updateMe');
74
+ $router->match(['post', 'patch'], 'me', 'CustomerController@updateMe');
75
+ $router->post('logout', 'CustomerController@logout');
76
+ $router->post('logout-all', 'CustomerController@logoutAll');
77
+ $router->post('register-device', 'CustomerController@registerDevice');
78
+ $router->get('places', 'CustomerController@places');
79
+ $router->get('orders', 'CustomerController@orders');
80
+ $router->post('orders', 'CustomerController@createOrder');
81
+ $router->get('orders/{id}', 'CustomerController@findOrder');
82
+ });
83
+ });
52
84
  // vendors routes
53
85
  $router->group(['prefix' => 'vendors'], function () use ($router) {
54
86
  $router->post('/', 'VendorController@create');
@@ -346,8 +378,10 @@ Route::prefix(config('fleetops.api.routing.prefix', null))->namespace('Fleetbase
346
378
  $router->get('{id}/tracker', 'OrderController@trackerInfo');
347
379
  $router->get('{id}/eta', 'OrderController@waypointEtas');
348
380
  $router->post('{id}/ping-driver', $controller('pingDriver'));
381
+ $router->post('{id}/capture-photo/{subjectId?}', $controller('capturePhoto'));
349
382
  $router->post('process-imports', $controller('importFromFiles'));
350
383
  $router->patch('route/{id}', $controller('editOrderRoute'));
384
+ $router->patch('set-destination/{id}/{placeId}', $controller('setDestination'));
351
385
  $router->patch('update-activity/{id}', $controller('updateActivity'));
352
386
  $router->get('{id}/proofs/{subjectId?}', $controller('proofs'));
353
387
  $router->patch('bulk-assign-driver', $controller('bulkAssignDriver'));
@@ -573,6 +607,22 @@ Route::prefix(config('fleetops.api.routing.prefix', null))->namespace('Fleetbase
573
607
  ['prefix' => 'metrics'],
574
608
  function ($router) {
575
609
  $router->get('/', 'MetricsController@all');
610
+ $router->get('{slug}', 'MetricsController@show');
611
+ }
612
+ );
613
+ $router->group(
614
+ ['prefix' => 'analytics'],
615
+ function ($router) {
616
+ $router->get('operations-pulse', 'AnalyticsController@operationsPulse');
617
+ $router->get('revenue-trend', 'AnalyticsController@revenueTrend');
618
+ $router->get('orders-by-status', 'AnalyticsController@ordersByStatus');
619
+ $router->get('on-time-delivery', 'AnalyticsController@onTimeDelivery');
620
+ $router->get('top-drivers', 'AnalyticsController@topDrivers');
621
+ $router->get('fuel-efficiency', 'AnalyticsController@fuelEfficiency');
622
+ $router->get('issues-insights', 'AnalyticsController@issuesInsights');
623
+ $router->get('maintenance-overview', 'AnalyticsController@maintenanceOverview');
624
+ $router->get('geofence-violations', 'AnalyticsController@geofenceViolations');
625
+ $router->get('live-fleet', 'AnalyticsController@liveFleet');
576
626
  }
577
627
  );
578
628
  $router->group(
@@ -0,0 +1,41 @@
1
+ <?php
2
+
3
+ test('analytics routes are registered alongside metrics routes', function () {
4
+ $routes = file_get_contents(dirname(__DIR__) . '/src/routes.php');
5
+
6
+ expect($routes)->toContain("['prefix' => 'analytics']");
7
+ expect($routes)->toContain("'AnalyticsController@operationsPulse'");
8
+ expect($routes)->toContain("'AnalyticsController@revenueTrend'");
9
+ expect($routes)->toContain("'AnalyticsController@ordersByStatus'");
10
+ expect($routes)->toContain("'AnalyticsController@onTimeDelivery'");
11
+ expect($routes)->toContain("'AnalyticsController@topDrivers'");
12
+ expect($routes)->toContain("'AnalyticsController@fuelEfficiency'");
13
+ expect($routes)->toContain("'AnalyticsController@issuesInsights'");
14
+ expect($routes)->toContain("'AnalyticsController@maintenanceOverview'");
15
+ expect($routes)->toContain("'AnalyticsController@geofenceViolations'");
16
+ expect($routes)->toContain("'AnalyticsController@liveFleet'");
17
+ });
18
+
19
+ test('per-slug metrics endpoint is registered', function () {
20
+ $routes = file_get_contents(dirname(__DIR__) . '/src/routes.php');
21
+
22
+ expect($routes)->toContain("\$router->get('{slug}', 'MetricsController@show');");
23
+ });
24
+
25
+ test('legacy metrics endpoint is preserved for backward compat', function () {
26
+ $routes = file_get_contents(dirname(__DIR__) . '/src/routes.php');
27
+
28
+ expect($routes)->toContain("\$router->get('/', 'MetricsController@all');");
29
+ });
30
+
31
+ test('analytics controller has one method per widget', function () {
32
+ $controller = file_get_contents(dirname(__DIR__) . '/src/Http/Controllers/Internal/v1/AnalyticsController.php');
33
+
34
+ foreach ([
35
+ 'operationsPulse', 'revenueTrend', 'ordersByStatus', 'onTimeDelivery',
36
+ 'topDrivers', 'fuelEfficiency', 'issuesInsights', 'maintenanceOverview',
37
+ 'geofenceViolations', 'liveFleet',
38
+ ] as $method) {
39
+ expect($controller)->toContain("public function {$method}(");
40
+ }
41
+ });
@@ -16,8 +16,8 @@ function capacityTestOrder(string $publicId, float $weightKg, float $volumeLitre
16
16
  public float $weight;
17
17
  public string $weight_unit = 'kg';
18
18
  public float $length;
19
- public float $width = 1;
20
- public float $height = 1;
19
+ public float $width = 1;
20
+ public float $height = 1;
21
21
  public string $dimensions_unit = 'm';
22
22
 
23
23
  public function __construct(float $weightKg, float $volumeLitres)
@@ -30,8 +30,8 @@ function capacityTestOrder(string $publicId, float $weightKg, float $volumeLitre
30
30
  }
31
31
  };
32
32
 
33
- $order = new Order();
34
- $order->public_id = $publicId;
33
+ $order = new Order();
34
+ $order->public_id = $publicId;
35
35
  $order->required_skills = $skills;
36
36
  $order->setRelation('payload', $payload);
37
37
 
@@ -40,14 +40,14 @@ function capacityTestOrder(string $publicId, float $weightKg, float $volumeLitre
40
40
 
41
41
  function capacityTestVehicle(string $publicId, float $weightKg, float $volumeM3 = 0, int $maxTasks = 0, array $skills = []): Vehicle
42
42
  {
43
- $vehicle = new Vehicle();
44
- $vehicle->public_id = $publicId;
45
- $vehicle->payload_capacity = $weightKg;
46
- $vehicle->payload_capacity_volume = $volumeM3;
43
+ $vehicle = new Vehicle();
44
+ $vehicle->public_id = $publicId;
45
+ $vehicle->payload_capacity = $weightKg;
46
+ $vehicle->payload_capacity_volume = $volumeM3;
47
47
  $vehicle->payload_capacity_pallets = 0;
48
48
  $vehicle->payload_capacity_parcels = 100;
49
- $vehicle->max_tasks = $maxTasks;
50
- $vehicle->skills = $skills;
49
+ $vehicle->max_tasks = $maxTasks;
50
+ $vehicle->skills = $skills;
51
51
  $vehicle->setRelation('driver', null);
52
52
 
53
53
  return $vehicle;
@@ -0,0 +1,54 @@
1
+ <?php
2
+
3
+ test('customer contacts reject existing non-customer users by identity', function () {
4
+ $contactModel = file_get_contents(__DIR__ . '/../src/Models/Contact.php');
5
+ $conflictClass = file_get_contents(__DIR__ . '/../src/Exceptions/CustomerUserConflictException.php');
6
+ $observer = file_get_contents(__DIR__ . '/../src/Observers/ContactObserver.php');
7
+
8
+ expect($contactModel)
9
+ ->toContain('assertCustomerIdentityIsAvailable')
10
+ ->toContain('assertCustomerUserCanBeAssigned')
11
+ ->toContain("orWhereHas('companyUsers'")
12
+ ->toContain("\$user->type === 'customer'")
13
+ ->toContain('cannot be used for a customer account');
14
+
15
+ expect($conflictClass)->toContain('class CustomerUserConflictException extends UserAlreadyExistsException');
16
+
17
+ expect($observer)
18
+ ->toContain('$contact->assertCustomerIdentityIsAvailable();')
19
+ ->toContain('$contact->normalizeCustomerUser();');
20
+ });
21
+
22
+ test('customer user assignment no longer promotes staff users', function () {
23
+ $contactModel = file_get_contents(__DIR__ . '/../src/Models/Contact.php');
24
+
25
+ expect($contactModel)
26
+ ->toContain('public function assignUser(User $user, bool $sendInvite = false): self')
27
+ ->toContain('$this->assertCustomerUserCanBeAssigned($user);')
28
+ ->not->toContain("if (\$this->isCustomer() && \$user->type !== 'customer') {\n \$user->setType('customer');");
29
+ });
30
+
31
+ test('customer creation entrypoints run the customer identity guard', function () {
32
+ $apiContact = file_get_contents(__DIR__ . '/../src/Http/Controllers/Api/v1/ContactController.php');
33
+ $internalContact = file_get_contents(__DIR__ . '/../src/Http/Controllers/Internal/v1/ContactController.php');
34
+ $orderController = file_get_contents(__DIR__ . '/../src/Http/Controllers/Api/v1/OrderController.php');
35
+ $customerForm = file_get_contents(__DIR__ . '/../../addon/components/customer/form.hbs');
36
+
37
+ expect($apiContact)->toContain('$contactCandidate->assertCustomerIdentityIsAvailable();');
38
+ expect($internalContact)->toContain('$this->assertCustomerIdentityIsAvailable($input');
39
+ expect($orderController)->toContain('$customerCandidate->assertCustomerIdentityIsAvailable();');
40
+ expect($customerForm)->toContain('is_customer=true');
41
+ });
42
+
43
+ test('customer conflict audit command is registered and read only', function () {
44
+ $provider = file_get_contents(__DIR__ . '/../src/Providers/FleetOpsServiceProvider.php');
45
+ $command = file_get_contents(__DIR__ . '/../src/Console/Commands/AuditCustomerUserConflicts.php');
46
+
47
+ expect($provider)->toContain('AuditCustomerUserConflicts::class');
48
+ expect($command)
49
+ ->toContain('fleetops:audit-customer-user-conflicts')
50
+ ->toContain('Reports customer contacts linked to users')
51
+ ->not->toContain('->save(')
52
+ ->not->toContain('->update(')
53
+ ->not->toContain('forceFill');
54
+ });