@fleetbase/fleetops-engine 0.6.51 → 0.6.53

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 (396) hide show
  1. package/README.md +0 -2
  2. package/addon/components/cell/telematic-provider.hbs +16 -0
  3. package/addon/components/cell/telematic-provider.js +36 -0
  4. package/addon/components/cell/telematic-status.hbs +1 -0
  5. package/addon/components/cell/telematic-status.js +39 -0
  6. package/addon/components/device/manager.hbs +5 -6
  7. package/addon/components/device/manager.js +12 -15
  8. package/addon/components/driver/details.hbs +1 -1
  9. package/addon/components/fleet/vehicle-listing.js +1 -0
  10. package/addon/components/fuel-integration/form.hbs +200 -0
  11. package/addon/components/fuel-integration/form.js +242 -0
  12. package/addon/components/fuel-integration/hub.hbs +154 -0
  13. package/addon/components/fuel-integration/hub.js +165 -0
  14. package/addon/components/fuel-integration/matching-priority.hbs +76 -0
  15. package/addon/components/fuel-integration/matching-priority.js +145 -0
  16. package/addon/components/fuel-report/details.hbs +13 -1
  17. package/addon/components/issue/details.hbs +3 -57
  18. package/addon/components/issue/details.js +0 -96
  19. package/addon/components/layout/fleet-ops-sidebar/operations-monitor.hbs +201 -0
  20. package/addon/components/layout/fleet-ops-sidebar/operations-monitor.js +589 -0
  21. package/addon/components/layout/fleet-ops-sidebar.hbs +19 -233
  22. package/addon/components/layout/fleet-ops-sidebar.js +287 -376
  23. package/addon/components/maintenance-schedule/form.js +1 -0
  24. package/addon/components/map/drawer/device-event-listing.hbs +12 -2
  25. package/addon/components/map/drawer/driver-listing.hbs +14 -1
  26. package/addon/components/map/drawer/place-listing.hbs +14 -1
  27. package/addon/components/map/drawer/position-listing.hbs +12 -2
  28. package/addon/components/map/drawer/vehicle-listing.hbs +14 -1
  29. package/addon/components/modals/assigned-orders.hbs +40 -0
  30. package/addon/components/modals/attach-device.hbs +4 -3
  31. package/addon/components/modals/attach-telematic-device.hbs +25 -0
  32. package/addon/components/modals/attach-telematic-device.js +3 -0
  33. package/addon/components/modals/driver-assign-order.hbs +7 -58
  34. package/addon/components/modals/driver-assign-vehicle.hbs +10 -2
  35. package/addon/components/modals/fleet-assign-driver.hbs +18 -0
  36. package/addon/components/modals/fleet-assign-driver.js +3 -0
  37. package/addon/components/modals/fleet-assign-vehicle.hbs +18 -0
  38. package/addon/components/modals/fleet-assign-vehicle.js +3 -0
  39. package/addon/components/modals/telematic-connection-diagnostics.hbs +75 -0
  40. package/addon/components/modals/telematic-connection-diagnostics.js +287 -0
  41. package/addon/components/modals/vehicle-details.hbs +6 -1
  42. package/addon/components/modals/vehicle-form.hbs +8 -1
  43. package/addon/components/order/card.hbs +106 -0
  44. package/addon/components/order/card.js +257 -0
  45. package/addon/components/order/form/payload.js +3 -1
  46. package/addon/components/order/form/service-rate.hbs +2 -0
  47. package/addon/components/service-rate/form.hbs +3 -2
  48. package/addon/components/telematic/details.hbs +98 -87
  49. package/addon/components/telematic/details.js +230 -1
  50. package/addon/components/telematic/form.hbs +303 -72
  51. package/addon/components/telematic/form.js +519 -3
  52. package/addon/components/telematic/hub.hbs +149 -0
  53. package/addon/components/telematic/hub.js +142 -0
  54. package/addon/components/telematic/settings.hbs +152 -0
  55. package/addon/components/telematic/settings.js +45 -0
  56. package/addon/components/telematic/tab-empty-state.hbs +29 -0
  57. package/addon/components/telematic/tab-empty-state.js +33 -0
  58. package/addon/components/vehicle/details.hbs +6 -1
  59. package/addon/components/vehicle/form.hbs +2 -1
  60. package/addon/components/widget/fuel-providers.hbs +43 -0
  61. package/addon/components/widget/fuel-providers.js +27 -0
  62. package/addon/controllers/connectivity/devices/index/details.js +27 -1
  63. package/addon/controllers/connectivity/devices/index.js +18 -1
  64. package/addon/controllers/connectivity/fuel-providers/details/sync.js +18 -0
  65. package/addon/controllers/connectivity/fuel-providers/details/transactions.js +24 -0
  66. package/addon/controllers/connectivity/fuel-providers/details.js +69 -0
  67. package/addon/controllers/connectivity/fuel-providers/edit.js +24 -0
  68. package/addon/controllers/connectivity/fuel-providers/index.js +177 -0
  69. package/addon/controllers/connectivity/fuel-providers/new.js +37 -0
  70. package/addon/controllers/connectivity/telematics/details/attachments.js +247 -0
  71. package/addon/controllers/connectivity/telematics/details/devices.js +368 -0
  72. package/addon/controllers/connectivity/telematics/details/events.js +244 -0
  73. package/addon/controllers/connectivity/telematics/details/index.js +3 -0
  74. package/addon/controllers/connectivity/telematics/details/logs.js +43 -0
  75. package/addon/controllers/connectivity/telematics/details/sensors.js +270 -0
  76. package/addon/controllers/connectivity/telematics/details.js +149 -0
  77. package/addon/controllers/connectivity/telematics/{index/edit.js → edit.js} +15 -4
  78. package/addon/controllers/connectivity/telematics/index.js +25 -5
  79. package/addon/controllers/connectivity/telematics/{index/new.js → new.js} +8 -2
  80. package/addon/controllers/maintenance/index.js +100 -0
  81. package/addon/controllers/management/drivers/index/details.js +78 -1
  82. package/addon/controllers/management/drivers/index.js +39 -0
  83. package/addon/controllers/management/fleets/index/details.js +23 -1
  84. package/addon/controllers/management/fleets/index.js +6 -1
  85. package/addon/controllers/management/fuel-reports/index.js +37 -1
  86. package/addon/controllers/management/fuel-transactions/index/details.js +70 -0
  87. package/addon/controllers/management/fuel-transactions/index.js +240 -0
  88. package/addon/controllers/management/index.js +88 -0
  89. package/addon/controllers/management/vehicles/index/details.js +32 -0
  90. package/addon/controllers/management/vehicles/index.js +26 -0
  91. package/addon/controllers/operations/orders/index.js +4 -0
  92. package/addon/controllers/settings/index.js +142 -0
  93. package/addon/controllers/settings/payments/index.js +5 -0
  94. package/addon/extension.js +31 -0
  95. package/addon/routes/analytics/index.js +3 -0
  96. package/addon/routes/connectivity/devices/index.js +3 -0
  97. package/addon/routes/connectivity/fuel-providers/details/index.js +7 -0
  98. package/addon/routes/connectivity/fuel-providers/details/matching.js +7 -0
  99. package/addon/routes/connectivity/fuel-providers/details/settings.js +7 -0
  100. package/addon/routes/connectivity/fuel-providers/details/sync.js +18 -0
  101. package/addon/routes/connectivity/fuel-providers/details/transactions.js +14 -0
  102. package/addon/routes/connectivity/fuel-providers/details.js +18 -0
  103. package/addon/routes/connectivity/fuel-providers/edit.js +18 -0
  104. package/addon/routes/connectivity/fuel-providers/index.js +20 -0
  105. package/addon/routes/connectivity/fuel-providers/new.js +3 -0
  106. package/addon/routes/connectivity/fuel-providers.js +3 -0
  107. package/addon/routes/connectivity/telematics/details/attachments.js +28 -0
  108. package/addon/routes/connectivity/telematics/details/devices.js +30 -0
  109. package/addon/routes/connectivity/telematics/details/events.js +33 -0
  110. package/addon/routes/connectivity/telematics/details/index.js +3 -0
  111. package/addon/routes/connectivity/telematics/details/logs.js +17 -0
  112. package/addon/routes/connectivity/telematics/details/sensors.js +29 -0
  113. package/addon/routes/connectivity/telematics/{index/details.js → details.js} +1 -1
  114. package/addon/routes/connectivity/telematics/{index/edit.js → edit.js} +1 -1
  115. package/addon/routes/connectivity/telematics/new.js +3 -0
  116. package/addon/routes/maintenance/index.js +3 -0
  117. package/addon/routes/maintenance/work-orders/index.js +2 -0
  118. package/addon/routes/management/drivers/index/details/activity.js +3 -0
  119. package/addon/routes/management/fuel-reports/index.js +2 -0
  120. package/addon/routes/management/fuel-transactions/index/details.js +18 -0
  121. package/addon/routes/management/fuel-transactions/index.js +21 -0
  122. package/addon/routes/management/fuel-transactions.js +3 -0
  123. package/addon/routes/settings/index.js +3 -0
  124. package/addon/routes.js +28 -9
  125. package/addon/services/device-actions.js +64 -1
  126. package/addon/services/device-event-actions.js +12 -1
  127. package/addon/services/driver-actions.js +147 -11
  128. package/addon/services/fleet-actions.js +66 -1
  129. package/addon/services/fuel-integration-actions.js +31 -0
  130. package/addon/services/issue-actions.js +1 -1
  131. package/addon/services/telematic-actions.js +9 -3
  132. package/addon/services/vehicle-actions.js +125 -0
  133. package/addon/styles/fleetops-engine.css +2237 -162
  134. package/addon/templates/analytics/index.hbs +14 -0
  135. package/addon/templates/analytics/reports/index.hbs +19 -1
  136. package/addon/templates/connectivity/devices/index.hbs +19 -1
  137. package/addon/templates/connectivity/events/index.hbs +16 -1
  138. package/addon/templates/connectivity/fuel-providers/details/index.hbs +38 -0
  139. package/addon/templates/connectivity/fuel-providers/details/matching.hbs +13 -0
  140. package/addon/templates/connectivity/fuel-providers/details/settings.hbs +11 -0
  141. package/addon/templates/connectivity/fuel-providers/details/sync.hbs +48 -0
  142. package/addon/templates/connectivity/fuel-providers/details/transactions.hbs +21 -0
  143. package/addon/templates/connectivity/fuel-providers/details.hbs +51 -0
  144. package/addon/templates/connectivity/fuel-providers/edit.hbs +24 -0
  145. package/addon/templates/connectivity/fuel-providers/index.hbs +12 -0
  146. package/addon/templates/connectivity/fuel-providers/new.hbs +22 -0
  147. package/addon/templates/connectivity/fuel-providers.hbs +1 -0
  148. package/addon/templates/connectivity/sensors/index.hbs +19 -1
  149. package/addon/templates/connectivity/telematics/details/attachments.hbs +163 -0
  150. package/addon/templates/connectivity/telematics/details/devices.hbs +88 -0
  151. package/addon/templates/connectivity/telematics/details/events.hbs +101 -0
  152. package/addon/templates/connectivity/telematics/{index/details → details}/index.hbs +0 -1
  153. package/addon/templates/connectivity/telematics/details/logs.hbs +69 -0
  154. package/addon/templates/connectivity/telematics/details/sensors.hbs +88 -0
  155. package/addon/templates/connectivity/telematics/details.hbs +53 -0
  156. package/addon/templates/connectivity/telematics/edit.hbs +27 -0
  157. package/addon/templates/connectivity/telematics/index.hbs +6 -8
  158. package/addon/templates/connectivity/telematics/new.hbs +24 -0
  159. package/addon/templates/maintenance/equipment/index.hbs +19 -1
  160. package/addon/templates/maintenance/index.hbs +113 -0
  161. package/addon/templates/maintenance/maintenances/index.hbs +15 -1
  162. package/addon/templates/maintenance/parts/index.hbs +19 -1
  163. package/addon/templates/maintenance/schedules/index.hbs +19 -1
  164. package/addon/templates/maintenance/work-orders/index.hbs +19 -1
  165. package/addon/templates/management/contacts/customers.hbs +15 -1
  166. package/addon/templates/management/contacts/index.hbs +19 -1
  167. package/addon/templates/management/drivers/index/details/activity.hbs +1 -0
  168. package/addon/templates/management/drivers/index.hbs +19 -1
  169. package/addon/templates/management/fleets/index.hbs +19 -1
  170. package/addon/templates/management/fuel-reports/index.hbs +19 -1
  171. package/addon/templates/management/fuel-transactions/index/details.hbs +73 -0
  172. package/addon/templates/management/fuel-transactions/index.hbs +58 -0
  173. package/addon/templates/management/fuel-transactions.hbs +1 -0
  174. package/addon/templates/management/index.hbs +109 -73
  175. package/addon/templates/management/issues/index.hbs +19 -1
  176. package/addon/templates/management/places/index.hbs +19 -1
  177. package/addon/templates/management/vehicles/index.hbs +19 -1
  178. package/addon/templates/management/vendors/index.hbs +19 -1
  179. package/addon/templates/management/vendors/integrated.hbs +13 -1
  180. package/addon/templates/operations/orders/index.hbs +19 -1
  181. package/addon/templates/operations/service-rates/index.hbs +19 -1
  182. package/addon/templates/settings/index.hbs +83 -0
  183. package/addon/templates/settings/payments/index.hbs +15 -1
  184. package/addon/templates/settings/routing.hbs +2 -2
  185. package/addon/utils/fleet-ops-options.js +3 -0
  186. package/app/components/cell/telematic-provider.js +1 -0
  187. package/app/components/cell/telematic-status.js +1 -0
  188. package/app/components/fuel-integration/form.js +1 -0
  189. package/app/components/fuel-integration/hub.js +1 -0
  190. package/app/components/fuel-integration/matching-priority.js +1 -0
  191. package/app/components/modals/assigned-orders.js +1 -0
  192. package/app/components/modals/attach-telematic-device.js +1 -0
  193. package/app/components/modals/fleet-assign-driver.js +1 -0
  194. package/app/components/modals/fleet-assign-vehicle.js +1 -0
  195. package/app/components/modals/telematic-connection-diagnostics.js +1 -0
  196. package/app/components/order/card.js +1 -0
  197. package/app/components/telematic/hub.js +1 -0
  198. package/app/components/telematic/settings.js +1 -0
  199. package/app/components/telematic/tab-empty-state.js +1 -0
  200. package/app/components/widget/fuel-providers.js +1 -0
  201. package/app/controllers/connectivity/fuel-providers/details/sync.js +1 -0
  202. package/app/controllers/connectivity/{telematics/index/details/devices.js → fuel-providers/details/transactions.js} +1 -1
  203. package/app/controllers/connectivity/{telematics/index → fuel-providers}/details.js +1 -1
  204. package/app/controllers/connectivity/{telematics/index → fuel-providers}/edit.js +1 -1
  205. package/app/controllers/connectivity/{telematics/index/details → fuel-providers}/index.js +1 -1
  206. package/app/controllers/connectivity/{telematics/index → fuel-providers}/new.js +1 -1
  207. package/app/controllers/connectivity/telematics/details/attachments.js +1 -0
  208. package/app/controllers/connectivity/telematics/details/devices.js +1 -0
  209. package/app/controllers/connectivity/telematics/details/events.js +1 -0
  210. package/app/controllers/connectivity/telematics/details/index.js +1 -0
  211. package/app/controllers/connectivity/telematics/details/logs.js +1 -0
  212. package/app/controllers/connectivity/telematics/details/sensors.js +1 -0
  213. package/app/controllers/connectivity/telematics/details.js +1 -0
  214. package/app/controllers/connectivity/telematics/edit.js +1 -0
  215. package/app/controllers/connectivity/telematics/new.js +1 -0
  216. package/app/controllers/maintenance/index.js +1 -0
  217. package/app/controllers/management/fuel-transactions/index/details.js +1 -0
  218. package/app/controllers/management/fuel-transactions/index.js +1 -0
  219. package/app/controllers/management/index.js +1 -0
  220. package/app/controllers/settings/index.js +1 -0
  221. package/app/routes/analytics/index.js +1 -0
  222. package/app/routes/connectivity/{telematics/index → fuel-providers}/details/index.js +1 -1
  223. package/app/routes/connectivity/{telematics/index/details/events.js → fuel-providers/details/matching.js} +1 -1
  224. package/app/routes/connectivity/fuel-providers/details/settings.js +1 -0
  225. package/app/routes/connectivity/fuel-providers/details/sync.js +1 -0
  226. package/app/routes/connectivity/{telematics/index/details/devices.js → fuel-providers/details/transactions.js} +1 -1
  227. package/app/routes/connectivity/{telematics/index → fuel-providers}/details.js +1 -1
  228. package/app/routes/connectivity/{telematics/index → fuel-providers}/edit.js +1 -1
  229. package/app/routes/connectivity/fuel-providers/index.js +1 -0
  230. package/app/routes/connectivity/{telematics/index → fuel-providers}/new.js +1 -1
  231. package/app/routes/connectivity/fuel-providers.js +1 -0
  232. package/app/routes/connectivity/telematics/details/attachments.js +1 -0
  233. package/app/routes/connectivity/telematics/details/devices.js +1 -0
  234. package/app/routes/connectivity/telematics/details/events.js +1 -0
  235. package/app/routes/connectivity/telematics/details/index.js +1 -0
  236. package/app/routes/connectivity/telematics/details/logs.js +1 -0
  237. package/app/routes/connectivity/telematics/details/sensors.js +1 -0
  238. package/app/routes/connectivity/telematics/details.js +1 -0
  239. package/app/routes/connectivity/telematics/edit.js +1 -0
  240. package/app/routes/connectivity/telematics/new.js +1 -0
  241. package/app/routes/maintenance/index.js +1 -0
  242. package/app/routes/management/drivers/index/details/activity.js +1 -0
  243. package/app/routes/management/fuel-transactions/index/details.js +1 -0
  244. package/app/routes/management/fuel-transactions/index.js +1 -0
  245. package/app/routes/management/fuel-transactions.js +1 -0
  246. package/app/routes/settings/index.js +1 -0
  247. package/app/services/fuel-integration-actions.js +1 -0
  248. package/app/templates/analytics/index.js +1 -0
  249. package/app/templates/connectivity/{telematics/index → fuel-providers}/details/index.js +1 -1
  250. package/app/templates/connectivity/{telematics/index/details/events.js → fuel-providers/details/matching.js} +1 -1
  251. package/app/templates/connectivity/fuel-providers/details/settings.js +1 -0
  252. package/app/templates/connectivity/fuel-providers/details/sync.js +1 -0
  253. package/app/templates/connectivity/{telematics/index/details/devices.js → fuel-providers/details/transactions.js} +1 -1
  254. package/app/templates/connectivity/{telematics/index → fuel-providers}/details.js +1 -1
  255. package/app/templates/connectivity/{telematics/index → fuel-providers}/edit.js +1 -1
  256. package/app/templates/connectivity/fuel-providers/index.js +1 -0
  257. package/app/templates/connectivity/{telematics/index → fuel-providers}/new.js +1 -1
  258. package/app/templates/connectivity/fuel-providers.js +1 -0
  259. package/app/templates/connectivity/telematics/details/attachments.js +1 -0
  260. package/app/templates/connectivity/telematics/details/devices.js +1 -0
  261. package/app/templates/connectivity/telematics/details/events.js +1 -0
  262. package/app/templates/connectivity/telematics/details/index.js +1 -0
  263. package/app/templates/connectivity/telematics/details/logs.js +1 -0
  264. package/app/templates/connectivity/telematics/details/sensors.js +1 -0
  265. package/app/templates/connectivity/telematics/details.js +1 -0
  266. package/app/templates/connectivity/telematics/edit.js +1 -0
  267. package/app/templates/connectivity/telematics/new.js +1 -0
  268. package/app/templates/maintenance/index.js +1 -0
  269. package/app/templates/management/drivers/index/details/activity.js +1 -0
  270. package/app/templates/management/fuel-transactions/index/details.js +1 -0
  271. package/app/templates/management/fuel-transactions/index.js +1 -0
  272. package/app/templates/management/fuel-transactions.js +1 -0
  273. package/app/templates/management/index.js +1 -0
  274. package/app/templates/settings/index.js +1 -0
  275. package/assets/images/telematics/providers/afaqy.webp +0 -0
  276. package/assets/images/telematics/providers/default.webp +0 -0
  277. package/assets/images/telematics/providers/flespi.webp +0 -0
  278. package/assets/images/telematics/providers/geotab.webp +0 -0
  279. package/assets/images/telematics/providers/safee.webp +0 -0
  280. package/assets/images/telematics/providers/samsara.webp +0 -0
  281. package/composer.json +1 -1
  282. package/extension.json +1 -1
  283. package/package.json +4 -4
  284. package/server/config/fuel-providers.php +42 -0
  285. package/server/config/telematics.php +139 -130
  286. package/server/migrations/2026_06_06_000001_harden_device_events_telematics_contract.php +59 -0
  287. package/server/migrations/2026_06_08_000001_create_fuel_provider_connections_table.php +37 -0
  288. package/server/migrations/2026_06_08_000002_create_fuel_provider_transactions_table.php +53 -0
  289. package/server/migrations/2026_06_08_000003_create_fuel_provider_sync_runs_table.php +40 -0
  290. package/server/migrations/2026_06_10_000001_add_fuel_card_number_to_vehicles_table.php +25 -0
  291. package/server/migrations/2026_06_10_000002_add_vehicle_identity_columns_to_fuel_provider_transactions_table.php +39 -0
  292. package/server/migrations/2026_06_15_000001_normalize_device_attachable_vehicle_morph_types.php +30 -0
  293. package/server/src/Console/Commands/FixInvalidPolymorphicRelationTypeNamespaces.php +1 -0
  294. package/server/src/Contracts/FuelProvider.php +30 -0
  295. package/server/src/Contracts/TelematicProviderDescriptor.php +3 -1
  296. package/server/src/Events/FuelProviderTransactionImported.php +17 -0
  297. package/server/src/Events/FuelProviderTransactionMatched.php +17 -0
  298. package/server/src/Events/FuelProviderTransactionUnmatched.php +17 -0
  299. package/server/src/Events/FuelReportCreatedFromProvider.php +18 -0
  300. package/server/src/Http/Controllers/Internal/v1/AnalyticsController.php +6 -0
  301. package/server/src/Http/Controllers/Internal/v1/DeviceController.php +140 -2
  302. package/server/src/Http/Controllers/Internal/v1/DeviceEventController.php +44 -0
  303. package/server/src/Http/Controllers/Internal/v1/DriverController.php +158 -7
  304. package/server/src/Http/Controllers/Internal/v1/FuelProviderConnectionController.php +124 -0
  305. package/server/src/Http/Controllers/Internal/v1/FuelProviderSyncRunController.php +10 -0
  306. package/server/src/Http/Controllers/Internal/v1/FuelProviderTransactionController.php +76 -0
  307. package/server/src/Http/Controllers/Internal/v1/HubController.php +300 -0
  308. package/server/src/Http/Controllers/Internal/v1/SearchController.php +506 -0
  309. package/server/src/Http/Controllers/Internal/v1/SensorController.php +1 -1
  310. package/server/src/Http/Controllers/Internal/v1/TelematicController.php +179 -16
  311. package/server/src/Http/Controllers/Internal/v1/VehicleController.php +249 -0
  312. package/server/src/Http/Controllers/TelematicWebhookController.php +103 -19
  313. package/server/src/Http/Filter/DeviceFilter.php +74 -0
  314. package/server/src/Http/Filter/DriverFilter.php +6 -0
  315. package/server/src/Http/Filter/FuelProviderConnectionFilter.php +33 -0
  316. package/server/src/Http/Filter/FuelProviderSyncRunFilter.php +28 -0
  317. package/server/src/Http/Filter/FuelProviderTransactionFilter.php +59 -0
  318. package/server/src/Http/Filter/FuelReportFilter.php +10 -0
  319. package/server/src/Http/Filter/VehicleFilter.php +6 -0
  320. package/server/src/Http/Resources/v1/Driver.php +15 -0
  321. package/server/src/Http/Resources/v1/FuelProviderConnection.php +30 -0
  322. package/server/src/Http/Resources/v1/FuelProviderSyncRun.php +36 -0
  323. package/server/src/Http/Resources/v1/FuelProviderTransaction.php +54 -0
  324. package/server/src/Http/Resources/v1/FuelReport.php +28 -22
  325. package/server/src/Http/Resources/v1/Index/Driver.php +26 -20
  326. package/server/src/Http/Resources/v1/Index/Vehicle.php +29 -22
  327. package/server/src/Http/Resources/v1/Vehicle.php +17 -0
  328. package/server/src/Http/Resources/v1/VehicleWithoutDriver.php +2 -0
  329. package/server/src/Jobs/SyncFuelProviderTransactionsJob.php +57 -0
  330. package/server/src/Jobs/SyncTelematicDevicesJob.php +105 -17
  331. package/server/src/Jobs/TestTelematicConnectionJob.php +9 -22
  332. package/server/src/Models/Asset.php +2 -1
  333. package/server/src/Models/Contact.php +2 -1
  334. package/server/src/Models/Device.php +27 -4
  335. package/server/src/Models/DeviceEvent.php +40 -3
  336. package/server/src/Models/Driver.php +3 -2
  337. package/server/src/Models/Equipment.php +2 -1
  338. package/server/src/Models/Fleet.php +2 -1
  339. package/server/src/Models/FuelProviderConnection.php +60 -0
  340. package/server/src/Models/FuelProviderSyncRun.php +58 -0
  341. package/server/src/Models/FuelProviderTransaction.php +119 -0
  342. package/server/src/Models/FuelReport.php +16 -1
  343. package/server/src/Models/Part.php +2 -1
  344. package/server/src/Models/Sensor.php +21 -4
  345. package/server/src/Models/ServiceRate.php +39 -2
  346. package/server/src/Models/Vehicle.php +14 -2
  347. package/server/src/Models/Vendor.php +2 -1
  348. package/server/src/Providers/FleetOpsServiceProvider.php +20 -0
  349. package/server/src/Support/Analytics/FuelProviderSummary.php +42 -0
  350. package/server/src/Support/FuelProviders/FuelProviderDescriptor.php +55 -0
  351. package/server/src/Support/FuelProviders/FuelProviderRegistry.php +75 -0
  352. package/server/src/Support/FuelProviders/FuelProviderService.php +447 -0
  353. package/server/src/Support/FuelProviders/Providers/AbstractFuelProvider.php +98 -0
  354. package/server/src/Support/FuelProviders/Providers/PetroAppFuelProvider.php +167 -0
  355. package/server/src/Support/Telematics/Providers/AbstractProvider.php +27 -6
  356. package/server/src/Support/Telematics/Providers/AfaqyProvider.php +105 -38
  357. package/server/src/Support/Telematics/Providers/FlespiProvider.php +1 -0
  358. package/server/src/Support/Telematics/Providers/GeotabProvider.php +1 -0
  359. package/server/src/Support/Telematics/Providers/SafeeProvider.php +32 -22
  360. package/server/src/Support/Telematics/Providers/SamsaraProvider.php +3 -1
  361. package/server/src/Support/Telematics/TelematicService.php +340 -21
  362. package/server/src/routes.php +50 -4
  363. package/server/tests/FuelProviderRegistryTest.php +416 -0
  364. package/server/tests/HubRoutesTest.php +62 -0
  365. package/server/tests/ServiceRateAlgorithmWeightVariablesTest.php +44 -0
  366. package/server/tests/TelematicsHardeningTest.php +359 -0
  367. package/server/tests/VehicleDriverAssignmentTest.php +51 -0
  368. package/translations/ar-ae.yml +23 -1
  369. package/translations/bg-bg.yaml +72 -0
  370. package/translations/en-us.yaml +83 -0
  371. package/translations/es-pa.yaml +72 -0
  372. package/translations/fr-fr.yaml +72 -0
  373. package/translations/mn-mn.yaml +72 -0
  374. package/translations/pt-br.yaml +72 -0
  375. package/translations/ru-ru.yaml +72 -0
  376. package/translations/vi-vn.yaml +98 -1
  377. package/addon/controllers/connectivity/telematics/index/details/devices.js +0 -3
  378. package/addon/controllers/connectivity/telematics/index/details/events.js +0 -3
  379. package/addon/controllers/connectivity/telematics/index/details/index.js +0 -3
  380. package/addon/controllers/connectivity/telematics/index/details/sensors.js +0 -3
  381. package/addon/controllers/connectivity/telematics/index/details.js +0 -24
  382. package/addon/routes/connectivity/telematics/index/details/devices.js +0 -3
  383. package/addon/routes/connectivity/telematics/index/details/events.js +0 -3
  384. package/addon/routes/connectivity/telematics/index/details/index.js +0 -3
  385. package/addon/routes/connectivity/telematics/index/details/sensors.js +0 -3
  386. package/addon/routes/connectivity/telematics/index/new.js +0 -3
  387. package/addon/templates/connectivity/telematics/index/details/devices.hbs +0 -1
  388. package/addon/templates/connectivity/telematics/index/details/events.hbs +0 -1
  389. package/addon/templates/connectivity/telematics/index/details/sensors.hbs +0 -1
  390. package/addon/templates/connectivity/telematics/index/details.hbs +0 -14
  391. package/addon/templates/connectivity/telematics/index/edit.hbs +0 -12
  392. package/addon/templates/connectivity/telematics/index/new.hbs +0 -12
  393. package/app/controllers/connectivity/telematics/index/details/events.js +0 -1
  394. package/app/controllers/connectivity/telematics/index/details/sensors.js +0 -1
  395. package/app/routes/connectivity/telematics/index/details/sensors.js +0 -1
  396. package/app/templates/connectivity/telematics/index/details/sensors.js +0 -1
@@ -23,26 +23,27 @@ class Driver extends FleetbaseResource
23
23
  $isInternal = Http::isInternalRequest();
24
24
 
25
25
  return [
26
- 'id' => $this->when($isInternal, $this->id, $this->public_id),
27
- 'uuid' => $this->when($isInternal, $this->uuid),
28
- 'public_id' => $this->when($isInternal, $this->public_id),
29
- 'company_uuid' => $this->when($isInternal, $this->company_uuid),
30
- 'user_uuid' => $this->when($isInternal, $this->user_uuid),
31
- 'vehicle_uuid' => $this->when($isInternal, $this->vehicle_uuid),
32
- 'vendor_uuid' => $this->when($isInternal, $this->vendor_uuid),
33
- 'current_job_uuid'=> $this->when($isInternal, $this->current_job_uuid),
34
- 'name' => $this->name,
35
- 'vehicle_name' => $this->when($isInternal, $this->vehicle_name),
36
- 'email' => $this->email,
37
- 'phone' => $this->phone,
38
- 'photo_url' => $this->photo_url,
39
- 'status' => $this->status,
40
- 'location' => $this->wasRecentlyCreated ? new Point(0, 0) : Utils::castPoint($this->location),
41
- 'heading' => (int) data_get($this, 'heading', 0),
42
- 'altitude' => (int) data_get($this, 'altitude', 0),
43
- 'speed' => (int) data_get($this, 'speed', 0),
44
- 'online' => data_get($this, 'online', false),
45
- 'meta' => [
26
+ 'id' => $this->when($isInternal, $this->id, $this->public_id),
27
+ 'uuid' => $this->when($isInternal, $this->uuid),
28
+ 'public_id' => $this->when($isInternal, $this->public_id),
29
+ 'company_uuid' => $this->when($isInternal, $this->company_uuid),
30
+ 'user_uuid' => $this->when($isInternal, $this->user_uuid),
31
+ 'vehicle_uuid' => $this->when($isInternal, $this->vehicle_uuid),
32
+ 'vendor_uuid' => $this->when($isInternal, $this->vendor_uuid),
33
+ 'current_job_uuid' => $this->when($isInternal, $this->current_job_uuid),
34
+ 'assigned_orders_count' => $this->when($isInternal, $this->assignedOrdersCount()),
35
+ 'name' => $this->name,
36
+ 'vehicle_name' => $this->when($isInternal, $this->vehicle_name),
37
+ 'email' => $this->email,
38
+ 'phone' => $this->phone,
39
+ 'photo_url' => $this->photo_url,
40
+ 'status' => $this->status,
41
+ 'location' => $this->wasRecentlyCreated ? new Point(0, 0) : Utils::castPoint($this->location),
42
+ 'heading' => (int) data_get($this, 'heading', 0),
43
+ 'altitude' => (int) data_get($this, 'altitude', 0),
44
+ 'speed' => (int) data_get($this, 'speed', 0),
45
+ 'online' => data_get($this, 'online', false),
46
+ 'meta' => [
46
47
  '_index_resource' => true,
47
48
  'location_coordinates' => $this->locationCoordinates(),
48
49
  'current_order_reference' => $this->currentOrderReference(),
@@ -53,6 +54,11 @@ class Driver extends FleetbaseResource
53
54
  ];
54
55
  }
55
56
 
57
+ protected function assignedOrdersCount(): int
58
+ {
59
+ return $this->orders()->count();
60
+ }
61
+
56
62
  protected function currentOrderReference(): ?string
57
63
  {
58
64
  $this->loadMissing('currentOrder');
@@ -23,28 +23,30 @@ class Vehicle extends FleetbaseResource
23
23
  $isInternal = Http::isInternalRequest();
24
24
 
25
25
  return [
26
- 'id' => $this->when($isInternal, $this->id, $this->public_id),
27
- 'uuid' => $this->when($isInternal, $this->uuid),
28
- 'public_id' => $this->when($isInternal, $this->public_id),
29
- 'company_uuid' => $this->when($isInternal, $this->company_uuid),
30
- 'vendor_uuid' => $this->when($isInternal, $this->vendor_uuid),
31
- 'photo_uuid' => $this->when($isInternal, $this->photo_uuid),
32
- 'internal_id' => $this->internal_id,
33
- 'display_name' => $this->display_name,
34
- 'driver_name' => $this->driver_name,
35
- 'plate_number' => $this->plate_number,
36
- 'serial_number' => $this->serial_number,
37
- 'vin' => $this->vin,
38
- 'make' => $this->make,
39
- 'model' => $this->model,
40
- 'year' => $this->year,
41
- 'photo_url' => $this->photo_url,
42
- 'status' => $this->status,
43
- 'location' => Utils::castPoint($this->location),
44
- 'heading' => (int) data_get($this, 'heading', 0),
45
- 'altitude' => (int) data_get($this, 'altitude', 0),
46
- 'speed' => (int) data_get($this, 'speed', 0),
47
- 'online' => (bool) data_get($this, 'online', false),
26
+ 'id' => $this->when($isInternal, $this->id, $this->public_id),
27
+ 'uuid' => $this->when($isInternal, $this->uuid),
28
+ 'public_id' => $this->when($isInternal, $this->public_id),
29
+ 'company_uuid' => $this->when($isInternal, $this->company_uuid),
30
+ 'vendor_uuid' => $this->when($isInternal, $this->vendor_uuid),
31
+ 'photo_uuid' => $this->when($isInternal, $this->photo_uuid),
32
+ 'internal_id' => $this->internal_id,
33
+ 'display_name' => $this->display_name,
34
+ 'driver_name' => $this->driver_name,
35
+ 'plate_number' => $this->plate_number,
36
+ 'serial_number' => $this->serial_number,
37
+ 'fuel_card_number' => $this->fuel_card_number,
38
+ 'vin' => $this->vin,
39
+ 'make' => $this->make,
40
+ 'model' => $this->model,
41
+ 'year' => $this->year,
42
+ 'photo_url' => $this->photo_url,
43
+ 'status' => $this->status,
44
+ 'location' => Utils::castPoint($this->location),
45
+ 'heading' => (int) data_get($this, 'heading', 0),
46
+ 'altitude' => (int) data_get($this, 'altitude', 0),
47
+ 'speed' => (int) data_get($this, 'speed', 0),
48
+ 'online' => (bool) data_get($this, 'online', false),
49
+ 'assigned_orders_count' => $this->when($isInternal, $this->assignedOrdersCount()),
48
50
 
49
51
  // Meta flag to indicate this is an index resource
50
52
  'meta' => [
@@ -58,6 +60,11 @@ class Vehicle extends FleetbaseResource
58
60
  ];
59
61
  }
60
62
 
63
+ protected function assignedOrdersCount(): int
64
+ {
65
+ return Order::where('vehicle_assigned_uuid', $this->uuid)->count();
66
+ }
67
+
61
68
  protected function currentOrderReference(): ?string
62
69
  {
63
70
  $this->loadMissing('driver.currentOrder');
@@ -39,6 +39,8 @@ class Vehicle extends FleetbaseResource
39
39
  'description' => $this->description,
40
40
  'driver_name' => $this->when(Http::isInternalRequest(), $this->driver_name),
41
41
  'vendor_name' => $this->when(Http::isInternalRequest(), $this->vendor_name),
42
+ 'assigned_orders_count' => $this->when(Http::isInternalRequest(), $this->assignedOrdersCount()),
43
+ 'current_order_reference'=> $this->when(Http::isInternalRequest(), $this->currentOrderReference()),
42
44
  // Relationships
43
45
  'driver' => $this->whenLoaded('driver', fn () => new Driver($this->driver)),
44
46
  'devices' => $this->whenLoaded('devices', fn () => $this->devices),
@@ -54,6 +56,7 @@ class Vehicle extends FleetbaseResource
54
56
  'serial_number' => $this->serial_number,
55
57
  'plate_number' => $this->plate_number,
56
58
  'call_sign' => $this->call_sign,
59
+ 'fuel_card_number' => $this->fuel_card_number,
57
60
  // VIN & specs blobs
58
61
  'vin' => $this->vin ?? null,
59
62
  'vin_data' => data_get($this, 'vin_data', Utils::createObject()),
@@ -142,6 +145,19 @@ class Vehicle extends FleetbaseResource
142
145
  ]);
143
146
  }
144
147
 
148
+ protected function assignedOrdersCount(): int
149
+ {
150
+ return \Fleetbase\FleetOps\Models\Order::where('vehicle_assigned_uuid', $this->uuid)->count();
151
+ }
152
+
153
+ protected function currentOrderReference(): ?string
154
+ {
155
+ $this->loadMissing('driver.currentOrder');
156
+ $order = data_get($this, 'driver.currentOrder');
157
+
158
+ return data_get($order, 'tracking') ?? data_get($order, 'public_id');
159
+ }
160
+
145
161
  /**
146
162
  * Transform the resource into a webhook payload.
147
163
  *
@@ -161,6 +177,7 @@ class Vehicle extends FleetbaseResource
161
177
  'vin' => $this->vin,
162
178
  'plate_number' => $this->plate_number,
163
179
  'serial_number' => $this->serial_number,
180
+ 'fuel_card_number' => $this->fuel_card_number,
164
181
  'make' => $this->make,
165
182
  'model' => $this->model,
166
183
  'model_type' => $this->model_type,
@@ -53,6 +53,7 @@ class VehicleWithoutDriver extends FleetbaseResource
53
53
  'serial_number' => $this->serial_number,
54
54
  'plate_number' => $this->plate_number,
55
55
  'call_sign' => $this->call_sign,
56
+ 'fuel_card_number' => $this->fuel_card_number,
56
57
  // VIN & specs blobs
57
58
  'vin' => $this->vin ?? null,
58
59
  'vin_data' => data_get($this, 'vin_data', Utils::createObject()),
@@ -160,6 +161,7 @@ class VehicleWithoutDriver extends FleetbaseResource
160
161
  'vin' => $this->vin,
161
162
  'plate_number' => $this->plate_number,
162
163
  'serial_number' => $this->serial_number,
164
+ 'fuel_card_number' => $this->fuel_card_number,
163
165
  'make' => $this->make,
164
166
  'model' => $this->model,
165
167
  'model_type' => $this->model_type,
@@ -0,0 +1,57 @@
1
+ <?php
2
+
3
+ namespace Fleetbase\FleetOps\Jobs;
4
+
5
+ use Fleetbase\FleetOps\Models\FuelProviderConnection;
6
+ use Fleetbase\FleetOps\Models\FuelProviderSyncRun;
7
+ use Fleetbase\FleetOps\Support\FuelProviders\FuelProviderService;
8
+ use Illuminate\Bus\Queueable;
9
+ use Illuminate\Contracts\Queue\ShouldQueue;
10
+ use Illuminate\Foundation\Bus\Dispatchable;
11
+ use Illuminate\Queue\InteractsWithQueue;
12
+ use Illuminate\Queue\SerializesModels;
13
+ use Illuminate\Support\Carbon;
14
+
15
+ class SyncFuelProviderTransactionsJob implements ShouldQueue
16
+ {
17
+ use Dispatchable;
18
+ use InteractsWithQueue;
19
+ use Queueable;
20
+ use SerializesModels;
21
+
22
+ public function __construct(public string $connectionUuid, public ?string $from = null, public ?string $to = null, public array $options = [], public ?string $syncRunUuid = null)
23
+ {
24
+ }
25
+
26
+ public function handle(FuelProviderService $fuelProviderService): void
27
+ {
28
+ $connection = FuelProviderConnection::where('uuid', $this->connectionUuid)->firstOrFail();
29
+ $syncRun = $this->syncRunUuid ? FuelProviderSyncRun::where('uuid', $this->syncRunUuid)->first() : null;
30
+
31
+ try {
32
+ $fuelProviderService->syncTransactions(
33
+ $connection,
34
+ $this->from ? Carbon::parse($this->from) : null,
35
+ $this->to ? Carbon::parse($this->to) : null,
36
+ $this->options,
37
+ $syncRun
38
+ );
39
+ } catch (\Throwable $e) {
40
+ $syncRun?->update([
41
+ 'status' => 'error',
42
+ 'finished_at' => now(),
43
+ 'error' => $e->getMessage(),
44
+ ]);
45
+ $connection->update([
46
+ 'status' => 'error',
47
+ 'last_error' => $e->getMessage(),
48
+ 'last_sync_state' => [
49
+ 'failed_at' => now()->toIso8601String(),
50
+ 'message' => $e->getMessage(),
51
+ ],
52
+ ]);
53
+
54
+ throw $e;
55
+ }
56
+ }
57
+ }
@@ -3,6 +3,7 @@
3
3
  namespace Fleetbase\FleetOps\Jobs;
4
4
 
5
5
  use Fleetbase\FleetOps\Models\Telematic;
6
+ use Fleetbase\FleetOps\Support\Telematics\TelematicProviderRegistry;
6
7
  use Fleetbase\FleetOps\Support\Telematics\TelematicService;
7
8
  use Illuminate\Bus\Queueable;
8
9
  use Illuminate\Contracts\Queue\ShouldQueue;
@@ -25,23 +26,24 @@ class SyncTelematicDevicesJob implements ShouldQueue
25
26
 
26
27
  public Telematic $telematic;
27
28
  public array $options;
29
+ public string $jobId;
28
30
  public int $tries = 3;
29
31
  public int $timeout = 300;
30
32
 
31
33
  /**
32
34
  * Create a new job instance.
33
35
  */
34
- public function __construct(Telematic $telematic, array $options = [])
36
+ public function __construct(Telematic $telematic, array $options = [], ?string $jobId = null)
35
37
  {
36
38
  $this->telematic = $telematic;
37
39
  $this->options = $options;
38
- $this->queue = 'telematics-sync';
40
+ $this->jobId = $jobId ?? \Illuminate\Support\Str::uuid()->toString();
39
41
  }
40
42
 
41
43
  /**
42
44
  * Execute the job.
43
45
  */
44
- public function handle(ProviderRegistry $registry, TelematicService $service): void
46
+ public function handle(TelematicProviderRegistry $registry, TelematicService $service): void
45
47
  {
46
48
  $correlationId = \Illuminate\Support\Str::uuid()->toString();
47
49
 
@@ -51,46 +53,132 @@ class SyncTelematicDevicesJob implements ShouldQueue
51
53
  'provider' => $this->telematic->provider,
52
54
  ]);
53
55
 
56
+ $cursor = null;
57
+ $totalFetched = 0;
58
+ $totalLinked = 0;
59
+ $totalSkipped = 0;
60
+ $pageCount = 0;
61
+ $lastProviderAllCount = null;
62
+ $lastProviderFiltersCount = null;
63
+
54
64
  try {
55
65
  $provider = $registry->resolve($this->telematic->provider);
56
66
  $provider->connect($this->telematic);
57
67
 
58
- $cursor = null;
59
- $totalSynced = 0;
60
-
61
68
  do {
62
69
  $response = $provider->fetchDevices([
63
- 'limit' => $this->options['limit'] ?? 100,
70
+ 'limit' => $this->options['limit'] ?? null,
64
71
  'cursor' => $cursor,
65
72
  'filters' => $this->options['filters'] ?? [],
66
73
  ]);
67
74
 
68
- foreach ($response['devices'] as $devicePayload) {
75
+ $devices = $response['devices'] ?? [];
76
+ $pagination = $response['pagination'] ?? [];
77
+ $pageCount++;
78
+ $totalFetched += count($devices);
79
+
80
+ if (isset($pagination['allCount'])) {
81
+ $lastProviderAllCount = $pagination['allCount'];
82
+ }
83
+
84
+ if (isset($pagination['filtersCount'])) {
85
+ $lastProviderFiltersCount = $pagination['filtersCount'];
86
+ }
87
+
88
+ Log::info('Device discovery page fetched', [
89
+ 'correlation_id' => $correlationId,
90
+ 'telematic_uuid' => $this->telematic->uuid,
91
+ 'provider' => $this->telematic->provider,
92
+ 'page' => $pageCount,
93
+ 'cursor' => $cursor,
94
+ 'limit' => $pagination['limit'] ?? ($this->options['limit'] ?? null),
95
+ 'result_count' => count($devices),
96
+ 'all_count' => $lastProviderAllCount,
97
+ 'filters_count' => $lastProviderFiltersCount,
98
+ 'next_cursor' => $response['next_cursor'] ?? null,
99
+ 'has_more' => $response['has_more'] ?? false,
100
+ ]);
101
+
102
+ foreach ($devices as $devicePayload) {
69
103
  $normalizedDevice = $provider->normalizeDevice($devicePayload);
70
- $service->linkDevice($this->telematic, $normalizedDevice);
71
- $totalSynced++;
104
+ try {
105
+ $service->linkDevice($this->telematic, $normalizedDevice);
106
+ $totalLinked++;
107
+ } catch (\Illuminate\Validation\ValidationException $e) {
108
+ $totalSkipped++;
109
+ Log::warning('Skipping telematics device without provider identity', [
110
+ 'correlation_id' => $correlationId,
111
+ 'provider' => $this->telematic->provider,
112
+ 'provider_unit_id' => $devicePayload['_id'] ?? $devicePayload['id'] ?? null,
113
+ 'device_id' => $normalizedDevice['device_id'] ?? null,
114
+ 'name' => $normalizedDevice['name'] ?? $devicePayload['name'] ?? null,
115
+ 'imei' => $devicePayload['imei'] ?? null,
116
+ ]);
117
+ }
72
118
  }
73
119
 
74
- $cursor = $response['next_cursor'];
120
+ $cursor = $response['next_cursor'] ?? null;
75
121
 
76
122
  Log::info('Device discovery progress', [
77
123
  'correlation_id' => $correlationId,
78
- 'synced' => $totalSynced,
79
- 'has_more' => $response['has_more'],
124
+ 'fetched' => $totalFetched,
125
+ 'linked' => $totalLinked,
126
+ 'skipped' => $totalSkipped,
127
+ 'has_more' => $response['has_more'] ?? false,
80
128
  ]);
81
129
 
82
130
  // Broadcast progress (TODO: implement WebSocket broadcasting)
83
- } while ($response['has_more'] && $cursor);
131
+ } while (($response['has_more'] ?? false) && $cursor);
84
132
 
85
133
  Log::info('Device discovery completed', [
86
- 'correlation_id' => $correlationId,
87
- 'total_synced' => $totalSynced,
134
+ 'correlation_id' => $correlationId,
135
+ 'total_fetched' => $totalFetched,
136
+ 'total_linked' => $totalLinked,
137
+ 'total_skipped' => $totalSkipped,
138
+ 'page_count' => $pageCount,
139
+ 'provider_all_count' => $lastProviderAllCount,
140
+ 'provider_filter_count' => $lastProviderFiltersCount,
88
141
  ]);
142
+
143
+ $this->telematic->status = 'active';
144
+ $this->telematic->meta = array_merge($this->telematic->meta ?? [], [
145
+ 'last_sync_job_id' => $this->jobId,
146
+ 'last_sync_completed_at' => now()->toDateTimeString(),
147
+ 'last_sync_result' => 'success',
148
+ 'last_sync_total' => $totalLinked,
149
+ 'last_sync_fetched_total' => $totalFetched,
150
+ 'last_sync_linked_total' => $totalLinked,
151
+ 'last_sync_skipped_total' => $totalSkipped,
152
+ 'last_sync_page_count' => $pageCount,
153
+ 'last_sync_provider_total' => $lastProviderFiltersCount ?? $lastProviderAllCount,
154
+ 'last_sync_provider_all_count' => $lastProviderAllCount,
155
+ 'last_sync_provider_filters_count' => $lastProviderFiltersCount,
156
+ 'last_sync_error' => null,
157
+ ]);
158
+ $this->telematic->save();
89
159
  } catch (\Exception $e) {
90
160
  Log::error('Device discovery failed', [
91
161
  'correlation_id' => $correlationId,
92
162
  'error' => $e->getMessage(),
163
+ 'exception' => get_class($e),
164
+ ]);
165
+
166
+ $this->telematic->status = 'error';
167
+ $this->telematic->meta = array_merge($this->telematic->meta ?? [], [
168
+ 'last_sync_job_id' => $this->jobId,
169
+ 'last_sync_result' => 'failed',
170
+ 'last_sync_fetched_total' => $totalFetched,
171
+ 'last_sync_linked_total' => $totalLinked,
172
+ 'last_sync_skipped_total' => $totalSkipped,
173
+ 'last_sync_page_count' => $pageCount,
174
+ 'last_sync_provider_total' => $lastProviderFiltersCount ?? $lastProviderAllCount,
175
+ 'last_sync_provider_all_count' => $lastProviderAllCount,
176
+ 'last_sync_provider_filters_count' => $lastProviderFiltersCount,
177
+ 'last_sync_error' => 'Device sync failed. Review the provider connection and server logs, then try again.',
178
+ 'last_sync_error_type' => class_basename($e),
179
+ 'last_sync_failed_at' => now()->toDateTimeString(),
93
180
  ]);
181
+ $this->telematic->save();
94
182
 
95
183
  throw $e;
96
184
  }
@@ -101,6 +189,6 @@ class SyncTelematicDevicesJob implements ShouldQueue
101
189
  */
102
190
  public function getJobId(): string
103
191
  {
104
- return $this->job->getJobId() ?? \Illuminate\Support\Str::uuid()->toString();
192
+ return $this->jobId;
105
193
  }
106
194
  }
@@ -3,12 +3,13 @@
3
3
  namespace Fleetbase\FleetOps\Jobs;
4
4
 
5
5
  use Fleetbase\FleetOps\Models\Telematic;
6
+ use Fleetbase\FleetOps\Support\Telematics\TelematicProviderRegistry;
7
+ use Fleetbase\FleetOps\Support\Telematics\TelematicService;
6
8
  use Illuminate\Bus\Queueable;
7
9
  use Illuminate\Contracts\Queue\ShouldQueue;
8
10
  use Illuminate\Foundation\Bus\Dispatchable;
9
11
  use Illuminate\Queue\InteractsWithQueue;
10
12
  use Illuminate\Queue\SerializesModels;
11
- use Illuminate\Support\Facades\Crypt;
12
13
  use Illuminate\Support\Facades\Log;
13
14
  use Illuminate\Support\Str;
14
15
 
@@ -25,22 +26,23 @@ class TestTelematicConnectionJob implements ShouldQueue
25
26
  use SerializesModels;
26
27
 
27
28
  public Telematic $telematic;
29
+ public string $jobId;
28
30
  public int $tries = 1;
29
31
  public int $timeout = 30;
30
32
 
31
33
  /**
32
34
  * Create a new job instance.
33
35
  */
34
- public function __construct(Telematic $telematic)
36
+ public function __construct(Telematic $telematic, ?string $jobId = null)
35
37
  {
36
38
  $this->telematic = $telematic;
37
- $this->queue = 'telematics-priority';
39
+ $this->jobId = $jobId ?? Str::uuid()->toString();
38
40
  }
39
41
 
40
42
  /**
41
43
  * Execute the job.
42
44
  */
43
- public function handle(ProviderRegistry $registry): void
45
+ public function handle(TelematicProviderRegistry $registry, TelematicService $service): void
44
46
  {
45
47
  $correlationId = Str::uuid()->toString();
46
48
 
@@ -52,26 +54,11 @@ class TestTelematicConnectionJob implements ShouldQueue
52
54
 
53
55
  try {
54
56
  $provider = $registry->resolve($this->telematic->provider);
55
- $credentials = json_decode(Crypt::decryptString($this->telematic->credentials), true);
57
+ $credentials = $service->getCredentials($this->telematic);
56
58
 
57
59
  $result = $provider->testConnection($credentials);
58
60
 
59
- if ($result['success']) {
60
- $this->telematic->status = 'active';
61
- $this->telematic->meta = array_merge($this->telematic->meta ?? [], [
62
- 'last_connection_test' => now()->toDateTimeString(),
63
- 'last_test_result' => 'success',
64
- ]);
65
- } else {
66
- $this->telematic->status = 'error';
67
- $this->telematic->meta = array_merge($this->telematic->meta ?? [], [
68
- 'last_connection_test' => now()->toDateTimeString(),
69
- 'last_test_result' => 'failed',
70
- 'last_error' => $result['message'],
71
- ]);
72
- }
73
-
74
- $this->telematic->save();
61
+ $service->recordConnectionTest($this->telematic, $result);
75
62
 
76
63
  Log::info('Connection test completed', [
77
64
  'correlation_id' => $correlationId,
@@ -97,6 +84,6 @@ class TestTelematicConnectionJob implements ShouldQueue
97
84
  */
98
85
  public function getJobId(): string
99
86
  {
100
- return $this->job->getJobId() ?? Str::uuid()->toString();
87
+ return $this->jobId;
101
88
  }
102
89
  }
@@ -197,7 +197,8 @@ class Asset extends Model
197
197
  {
198
198
  return SlugOptions::create()
199
199
  ->generateSlugsFrom(['name', 'code'])
200
- ->saveSlugsTo('slug');
200
+ ->saveSlugsTo('slug')
201
+ ->doNotGenerateSlugsOnUpdate();
201
202
  }
202
203
 
203
204
  /**
@@ -143,7 +143,8 @@ class Contact extends Model
143
143
  {
144
144
  return SlugOptions::create()
145
145
  ->generateSlugsFrom('name')
146
- ->saveSlugsTo('slug');
146
+ ->saveSlugsTo('slug')
147
+ ->doNotGenerateSlugsOnUpdate();
147
148
  }
148
149
 
149
150
  public function company(): BelongsTo
@@ -67,14 +67,14 @@ class Device extends Model
67
67
  *
68
68
  * @var array
69
69
  */
70
- protected $searchableColumns = ['name', 'model', 'serial_number', 'manufacturer', 'public_id'];
70
+ protected $searchableColumns = ['name', 'model', 'serial_number', 'manufacturer', 'device_id', 'internal_id', 'imei', 'public_id'];
71
71
 
72
72
  /**
73
73
  * The attributes that can be used for filtering.
74
74
  *
75
75
  * @var array
76
76
  */
77
- protected $filterParams = ['status', 'warranty_uuid', 'attachable_type'];
77
+ protected $filterParams = ['status', 'attachment_state', 'warranty_uuid', 'attachable_type', 'attachable_uuid', 'telematic', 'telematic_uuid', 'provider'];
78
78
 
79
79
  /**
80
80
  * The attributes that are mass assignable.
@@ -187,7 +187,8 @@ class Device extends Model
187
187
  {
188
188
  return SlugOptions::create()
189
189
  ->generateSlugsFrom(['name', 'serial_number'])
190
- ->saveSlugsTo('slug');
190
+ ->saveSlugsTo('slug')
191
+ ->doNotGenerateSlugsOnUpdate();
191
192
  }
192
193
 
193
194
  /**
@@ -195,7 +196,29 @@ class Device extends Model
195
196
  */
196
197
  public function getActivitylogOptions(): LogOptions
197
198
  {
198
- return LogOptions::defaults()->logAll();
199
+ return LogOptions::defaults()
200
+ ->logOnly([
201
+ 'company_uuid',
202
+ 'telematic_uuid',
203
+ 'attachable_uuid',
204
+ 'attachable_type',
205
+ 'device_id',
206
+ 'internal_id',
207
+ 'imei',
208
+ 'imsi',
209
+ 'firmware_version',
210
+ 'provider',
211
+ 'name',
212
+ 'model',
213
+ 'manufacturer',
214
+ 'serial_number',
215
+ 'installation_date',
216
+ 'last_maintenance_date',
217
+ 'online',
218
+ 'status',
219
+ 'last_online_at',
220
+ ])
221
+ ->logOnlyDirty();
199
222
  }
200
223
 
201
224
  public function telematic(): BelongsTo