@fleetbase/fleetops-engine 0.6.71 → 0.6.72
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.
- package/RELEASE.md +15 -18
- package/addon/components/admin/tracking-page-settings.hbs +56 -0
- package/addon/components/admin/tracking-page-settings.js +67 -0
- package/addon/components/device/form.hbs +2 -2
- package/addon/components/driver/details.hbs +1 -1
- package/addon/components/driver/form.hbs +1 -1
- package/addon/components/equipment/form.hbs +1 -1
- package/addon/components/layout/fleet-ops-sidebar.js +11 -3
- package/addon/components/maintenance/form.hbs +3 -3
- package/addon/components/map/google-live-map.js +2 -2
- package/addon/components/map/leaflet-live-map.js +45 -32
- package/addon/components/orchestrator/phase-builder.js +2 -1
- package/addon/components/orchestrator-workbench.hbs +7 -1
- package/addon/components/orchestrator-workbench.js +16 -2
- package/addon/components/order/form/route.hbs +1 -1
- package/addon/components/order/form/route.js +13 -1
- package/addon/components/service-rate/details.hbs +1 -1
- package/addon/components/service-rate/form.hbs +1 -1
- package/addon/components/tracking-page/full-view.hbs +276 -0
- package/addon/components/tracking-page/full-view.js +474 -0
- package/addon/components/tracking-page/locale-selector.js +30 -0
- package/addon/components/tracking-page/map.hbs +44 -0
- package/addon/components/tracking-page/map.js +328 -0
- package/addon/components/tracking-page/order-list.hbs +35 -0
- package/addon/components/tracking-page/public-view.hbs +60 -0
- package/addon/components/tracking-page/settings-preview.hbs +21 -0
- package/addon/components/tracking-page/settings-preview.js +23 -0
- package/addon/components/tracking-page/verify-panel.hbs +109 -0
- package/addon/components/tracking-page.hbs +142 -0
- package/addon/components/tracking-page.js +564 -0
- package/addon/components/trailer/form.hbs +2 -2
- package/addon/components/vehicle/form.hbs +3 -3
- package/addon/components/warranty/form.hbs +2 -2
- package/addon/components/widget/live-fleet.js +54 -6
- package/addon/components/widget/proof-of-delivery.hbs +49 -0
- package/addon/components/widget/proof-of-delivery.js +62 -0
- package/addon/components/work-order/form.hbs +3 -3
- package/addon/controllers/operations/orders/index/details.js +19 -3
- package/addon/controllers/operations/scheduler/index.js +45 -14
- package/addon/controllers/settings/index.js +6 -0
- package/addon/controllers/settings/map.js +75 -0
- package/addon/controllers/settings/orchestrator.js +8 -6
- package/addon/controllers/settings/tracking-page.js +212 -0
- package/addon/extension.js +65 -1
- package/addon/helpers/parcel-box-image.js +16 -0
- package/addon/routes/operations/orders/index/new.js +5 -4
- package/addon/routes/operations/scheduler/index.js +1 -1
- package/addon/routes/settings/tracking-page.js +31 -0
- package/addon/routes.js +1 -0
- package/addon/services/location.js +69 -21
- package/addon/services/map-settings.js +28 -0
- package/addon/services/order-allocation.js +1 -1
- package/addon/styles/fleetops-engine.css +1391 -0
- package/addon/templates/settings/map.hbs +46 -0
- package/addon/templates/settings/tracking-page.hbs +318 -0
- package/addon/utils/identity-cell-resource.js +2 -56
- package/addon/utils/map-default-view.js +132 -0
- package/addon/utils/placeholder-images.js +4 -69
- package/addon/utils/resource-descriptors/assets.js +2 -57
- package/addon/utils/resource-descriptors/helpers.js +23 -122
- package/addon/utils/resource-descriptors/operations.js +2 -61
- package/addon/utils/resource-descriptors/people.js +3 -142
- package/addon/utils/resource-descriptors/shared.js +18 -0
- package/addon/utils/tracking-live-source.js +123 -0
- package/addon/utils/tracking-page-theme.js +123 -0
- package/app/components/admin/tracking-page-settings.js +1 -0
- package/app/components/tracking-page/full-view.js +1 -0
- package/app/components/tracking-page/locale-selector.js +1 -0
- package/app/components/tracking-page/map.js +1 -0
- package/app/components/tracking-page/order-list.js +1 -0
- package/app/components/tracking-page/public-view.js +1 -0
- package/app/components/tracking-page/settings-preview.js +1 -0
- package/app/components/tracking-page/verify-panel.js +1 -0
- package/app/components/tracking-page.js +1 -0
- package/app/components/widget/proof-of-delivery.js +1 -0
- package/app/controllers/settings/tracking-page.js +1 -0
- package/app/helpers/parcel-box-image.js +1 -0
- package/app/routes/settings/tracking-page.js +1 -0
- package/app/templates/settings/tracking-page.js +1 -0
- package/app/utils/map-default-view.js +1 -0
- package/app/utils/tracking-live-source.js +1 -0
- package/app/utils/tracking-page-theme.js +1 -0
- package/composer.json +2 -2
- package/extension.json +1 -1
- package/package.json +4 -4
- package/scripts/pest-bootstrap.php +4 -0
- package/server/config/fleetops.php +4 -0
- package/server/migrations/2026_10_08_000001_create_tracking_sessions_tables.php +51 -0
- package/server/migrations/2026_10_10_000001_add_trashed_index_to_device_events.php +40 -0
- package/server/migrations/2026_10_10_000002_add_trashed_index_to_positions.php +40 -0
- package/server/migrations/2026_10_12_000001_add_deleted_at_to_tracking_sessions_tables.php +32 -0
- package/server/resources/views/labels/default.php +2 -2
- package/server/resources/views/labels/entity-label.php +2 -2
- package/server/resources/views/labels/waypoint-label.php +2 -2
- package/server/src/Auth/Schemas/FleetOps.php +5 -0
- package/server/src/Console/Commands/ProcessOperationalAlerts.php +1 -0
- package/server/src/Console/Commands/PruneTelematicsData.php +101 -26
- package/server/src/Events/OrderChanged.php +257 -0
- package/server/src/Events/OrderDriverUnassigned.php +68 -0
- package/server/src/Exceptions/OrderEditLockedException.php +32 -0
- package/server/src/Expansions/CompanyExpansion.php +3 -2
- package/server/src/Expansions/UserExpansion.php +12 -10
- package/server/src/Http/Controllers/Api/v1/CustomerController.php +108 -18
- package/server/src/Http/Controllers/Api/v1/DriverController.php +95 -10
- package/server/src/Http/Controllers/Api/v1/EntityController.php +66 -0
- package/server/src/Http/Controllers/Api/v1/FleetController.php +10 -4
- package/server/src/Http/Controllers/Api/v1/OrderController.php +139 -36
- package/server/src/Http/Controllers/Api/v1/PayloadController.php +76 -8
- package/server/src/Http/Controllers/Api/v1/PlaceController.php +3 -3
- package/server/src/Http/Controllers/Api/v1/TrackingNumberController.php +6 -32
- package/server/src/Http/Controllers/Api/v1/VehicleController.php +5 -0
- package/server/src/Http/Controllers/Internal/v1/ContactController.php +3 -0
- package/server/src/Http/Controllers/Internal/v1/DriverController.php +10 -0
- package/server/src/Http/Controllers/Internal/v1/FleetController.php +16 -2
- package/server/src/Http/Controllers/Internal/v1/InspectionSubmissionController.php +13 -8
- package/server/src/Http/Controllers/Internal/v1/IssueController.php +2 -0
- package/server/src/Http/Controllers/Internal/v1/MaintenanceController.php +4 -2
- package/server/src/Http/Controllers/Internal/v1/OrchestrationController.php +93 -11
- package/server/src/Http/Controllers/Internal/v1/OrderController.php +84 -24
- package/server/src/Http/Controllers/Internal/v1/PositionController.php +22 -0
- package/server/src/Http/Controllers/Internal/v1/ProofController.php +55 -4
- package/server/src/Http/Controllers/Internal/v1/SettingController.php +303 -10
- package/server/src/Http/Controllers/Internal/v1/TrailerController.php +1 -0
- package/server/src/Http/Controllers/Internal/v1/VehicleController.php +1 -0
- package/server/src/Http/Controllers/Public/TrackingController.php +518 -0
- package/server/src/Http/Filter/ContactFilter.php +1 -1
- package/server/src/Http/Filter/InspectionFormFilter.php +23 -0
- package/server/src/Http/Filter/InspectionSubmissionFilter.php +23 -0
- package/server/src/Http/Filter/MaintenanceFilter.php +23 -0
- package/server/src/Http/Filter/OrderFilter.php +39 -4
- package/server/src/Http/Filter/ProofFilter.php +18 -0
- package/server/src/Http/Filter/RouteFilter.php +18 -0
- package/server/src/Http/Filter/TelematicFilter.php +23 -0
- package/server/src/Http/Filter/WarrantyFilter.php +23 -0
- package/server/src/Http/Requests/CancelOrderRequest.php +2 -1
- package/server/src/Http/Resources/v1/Concerns/ResolvesPublicRelationFields.php +14 -1
- package/server/src/Http/Resources/v1/Index/Customer.php +18 -0
- package/server/src/Http/Resources/v1/Index/Order.php +11 -2
- package/server/src/Http/Resources/v1/PublicOrderTracking.php +153 -0
- package/server/src/Http/Resources/v1/TrackingNumber.php +8 -34
- package/server/src/Http/Resources/v1/Zone.php +31 -23
- package/server/src/Jobs/FinalizeApiOrderCreation.php +3 -1
- package/server/src/Jobs/ProcessAllocationJob.php +16 -6
- package/server/src/Jobs/PublishTrackingUpdate.php +50 -0
- package/server/src/Listeners/HandleGeofenceEntered.php +31 -15
- package/server/src/Listeners/HandleOrderCanceled.php +9 -1
- package/server/src/Listeners/HandleUserRemovedFromCompany.php +2 -1
- package/server/src/Listeners/PublishTrackingUpdates.php +27 -0
- package/server/src/Mail/CustomerCredentialsMail.php +4 -2
- package/server/src/Models/AssetConnection.php +3 -0
- package/server/src/Models/Contact.php +3 -0
- package/server/src/Models/Device.php +28 -0
- package/server/src/Models/DeviceEvent.php +7 -0
- package/server/src/Models/Driver.php +20 -7
- package/server/src/Models/Entity.php +12 -4
- package/server/src/Models/Fleet.php +11 -32
- package/server/src/Models/FleetDriver.php +3 -0
- package/server/src/Models/FleetVehicle.php +3 -0
- package/server/src/Models/FuelReport.php +5 -13
- package/server/src/Models/Issue.php +4 -16
- package/server/src/Models/Order.php +200 -9
- package/server/src/Models/Payload.php +227 -35
- package/server/src/Models/Place.php +7 -1
- package/server/src/Models/ServiceArea.php +7 -0
- package/server/src/Models/ServiceRate.php +7 -17
- package/server/src/Models/TrackingNumber.php +101 -2
- package/server/src/Models/TrackingSession.php +33 -0
- package/server/src/Models/TrackingSessionGrant.php +22 -0
- package/server/src/Models/TrackingStatus.php +6 -0
- package/server/src/Models/Vehicle.php +21 -2
- package/server/src/Models/Vendor.php +7 -0
- package/server/src/Models/Waypoint.php +13 -4
- package/server/src/Notifications/OrderAssigned.php +2 -1
- package/server/src/Notifications/OrderCanceled.php +7 -1
- package/server/src/Notifications/OrderChanged.php +87 -0
- package/server/src/Notifications/OrderCompleted.php +2 -1
- package/server/src/Notifications/OrderDispatchFailed.php +2 -1
- package/server/src/Notifications/OrderDispatched.php +2 -1
- package/server/src/Notifications/OrderFailed.php +2 -1
- package/server/src/Notifications/OrderUnassigned.php +66 -0
- package/server/src/Notifications/WaypointCompleted.php +2 -1
- package/server/src/Observers/CompanyUserObserver.php +8 -7
- package/server/src/Observers/DriverObserver.php +6 -1
- package/server/src/Observers/OrderObserver.php +141 -1
- package/server/src/Observers/TrackingNumberObserver.php +18 -6
- package/server/src/Observers/UserObserver.php +2 -1
- package/server/src/Observers/VehicleObserver.php +8 -3
- package/server/src/Orchestration/Engines/RouteSequencingEngine.php +21 -3
- package/server/src/Orchestration/Engines/VroomOrchestrationEngine.php +38 -8
- package/server/src/Orchestration/OrchestrationEngineRegistry.php +61 -1
- package/server/src/Orchestration/Support/OrchestratorSettings.php +61 -0
- package/server/src/Orchestration/Support/RouteMetrics.php +165 -0
- package/server/src/Providers/EventServiceProvider.php +11 -0
- package/server/src/Providers/FleetOpsServiceProvider.php +13 -0
- package/server/src/Support/ApiCacheThrottle.php +76 -0
- package/server/src/Support/LiveOrderQuery.php +3 -1
- package/server/src/Support/OrderEdit.php +365 -0
- package/server/src/Support/OrderEditPolicy.php +292 -0
- package/server/src/Support/ProfileAccountManager.php +54 -1
- package/server/src/Support/ResolvesOrderServiceStops.php +5 -0
- package/server/src/Support/SocketChannels.php +346 -0
- package/server/src/Support/Telematics/TelematicService.php +7 -2
- package/server/src/Support/Telematics/Telemetry/Inbox.php +8 -1
- package/server/src/Support/TrackingChannel.php +55 -0
- package/server/src/Support/TrackingCode.php +242 -0
- package/server/src/Support/TrackingPage/TrackingAccess.php +356 -0
- package/server/src/Support/TrackingPage/TrackingPageConfig.php +264 -0
- package/server/src/Support/TrackingPage/TrackingRecipient.php +111 -0
- package/server/src/Support/TrackingPage/TrackingResolver.php +201 -0
- package/server/src/Support/TrackingPage/TrackingTarget.php +40 -0
- package/server/src/Support/TrackingPage/TrackingView.php +543 -0
- package/server/src/Support/TrackingPublisher.php +261 -0
- package/server/src/Support/TrackingScope.php +182 -0
- package/server/src/Support/TrackingUpdate.php +402 -0
- package/server/src/Support/Utils.php +15 -3
- package/server/src/Traits/HasTrackingNumber.php +2 -0
- package/server/src/routes.php +39 -7
- package/server/tests/ApiCustomerControllerContractsTest.php +54 -7
- package/server/tests/ApiDriverPasswordContractsTest.php +25 -21
- package/server/tests/ApiEntityControllerContractsTest.php +84 -0
- package/server/tests/ApiOrderControllerContractsTest.php +245 -0
- package/server/tests/ApiPayloadControllerContractsTest.php +121 -0
- package/server/tests/ApiPlaceControllerContractsTest.php +1 -1
- package/server/tests/ApiTrackingNumberControllerContractsTest.php +6 -9
- package/server/tests/CompactResourceSerializationTest.php +23 -59
- package/server/tests/ControllerFilterContractsTest.php +1 -1
- package/server/tests/CustomerContactIdentitySafetyTest.php +1 -1
- package/server/tests/EventContractsTest.php +26 -60
- package/server/tests/ExpansionContractsTest.php +15 -2
- package/server/tests/Feature/Http/Api/CustomerControllerHelperSeamsTest.php +29 -3
- package/server/tests/Feature/Http/Api/DriverControllerAuthFlowsTest.php +23 -0
- package/server/tests/Feature/Http/Api/OrderControllerNearbyFiltersTest.php +16 -16
- package/server/tests/Feature/Http/Api/OrderControllerQueryFiltersTest.php +41 -14
- package/server/tests/Feature/Http/Api/TrackingNumberControllerHelpersTest.php +57 -22
- package/server/tests/Feature/Http/Internal/DriverControllerCreateRecordTest.php +23 -9
- package/server/tests/Feature/Http/Internal/OrchestrationControllerContractsTest.php +171 -1
- package/server/tests/Feature/Http/Internal/OrderControllerContractsTest.php +110 -14
- package/server/tests/Feature/Http/Internal/OrderControllerHelpersTest.php +7 -5
- package/server/tests/Feature/Http/Internal/PositionControllerReplayChannelTest.php +135 -0
- package/server/tests/Feature/Http/Internal/ProofControllerContractsTest.php +3 -3
- package/server/tests/Feature/Http/Internal/ProofControllerRecentTest.php +170 -0
- package/server/tests/Feature/Http/Public/TrackingControllerTest.php +495 -0
- package/server/tests/IndexCustomerPhotoTest.php +151 -0
- package/server/tests/ModelAccessorContractsTest.php +4 -3
- package/server/tests/NotificationAndMailContractsTest.php +5 -8
- package/server/tests/ObserverContractsTest.php +72 -10
- package/server/tests/OrderActivityFlowRegressionTest.php +3 -2
- package/server/tests/OrderFilterExecutionTest.php +167 -2
- package/server/tests/ProcessAllocationJobContractsTest.php +20 -0
- package/server/tests/PublicOrderTrackingResourceTest.php +221 -0
- package/server/tests/QueueJobContractsTest.php +2 -1
- package/server/tests/RequestContractsTest.php +1 -1
- package/server/tests/RouteRegistrationExecutionTest.php +26 -0
- package/server/tests/RouteSequencingEngineTest.php +17 -0
- package/server/tests/SettingControllerContractsTest.php +110 -0
- package/server/tests/Support/TrackingPageDatabase.php +200 -0
- package/server/tests/TenantScopingTest.php +206 -0
- package/server/tests/TrackingPageSettingsTest.php +343 -0
- package/server/tests/Unit/Console/PruneTelematicsDataCommandTest.php +51 -0
- package/server/tests/Unit/Http/Filter/ContactFilterAddressTest.php +61 -0
- package/server/tests/Unit/Http/Resources/IndexOrderResourceTest.php +30 -0
- package/server/tests/Unit/Jobs/FinalizeApiOrderCreationDispatchGuardTest.php +266 -0
- package/server/tests/Unit/Listeners/HandleGeofenceEnteredTest.php +182 -22
- package/server/tests/Unit/Listeners/HandleUserRemovedFromCompanyTest.php +5 -0
- package/server/tests/Unit/Models/DriverAssignVehicleTest.php +81 -0
- package/server/tests/Unit/Models/FleetTest.php +4 -3
- package/server/tests/Unit/Models/OrderCancelReasonTest.php +143 -0
- package/server/tests/Unit/Models/OrderPayloadConfigAndDistanceTest.php +60 -0
- package/server/tests/Unit/Models/OrderPayloadRouteTest.php +4 -2
- package/server/tests/Unit/Models/PayloadTest.php +18 -4
- package/server/tests/Unit/Models/ServiceRatePersistenceAndServicabilityTest.php +2 -2
- package/server/tests/Unit/Models/TrackingNumberTest.php +67 -6
- package/server/tests/Unit/Models/VehicleTest.php +16 -2
- package/server/tests/Unit/Models/WaypointTest.php +4 -3
- package/server/tests/Unit/Notifications/OrderChangeNotificationsTest.php +59 -0
- package/server/tests/Unit/Notifications/TerminalOrderNotificationsTest.php +3 -3
- package/server/tests/Unit/Observers/DriverDeletionCleanupTest.php +158 -0
- package/server/tests/Unit/Observers/FleetOpsCompanyUserAndServiceAreaObserversTest.php +20 -0
- package/server/tests/Unit/Observers/ObserverListenerSeamsTest.php +3 -3
- package/server/tests/Unit/Observers/OrderAssignmentObserverTest.php +100 -0
- package/server/tests/Unit/Observers/OrderDeleteCascadeTest.php +213 -0
- package/server/tests/Unit/Observers/VehicleObserverDeleteTest.php +67 -0
- package/server/tests/Unit/Orchestration/EngineSelectionAndRouteMetricsTest.php +336 -0
- package/server/tests/Unit/Orchestration/Engines/VroomOrchestrationEngineLifecycleTest.php +8 -1
- package/server/tests/Unit/Support/ApiCacheDependenciesTest.php +347 -0
- package/server/tests/Unit/Support/OrderEditPolicyTest.php +156 -0
- package/server/tests/Unit/Support/OrderOperationsTest.php +514 -0
- package/server/tests/Unit/Support/OsrmProofAndIssueFilterTest.php +4 -3
- package/server/tests/Unit/Support/ProfileAccountManagerTest.php +141 -0
- package/server/tests/Unit/Support/QuerySeamsTest.php +5 -1
- package/server/tests/Unit/Support/SocketChannelsTest.php +396 -0
- package/server/tests/Unit/Support/TrackingChannelTest.php +232 -0
- package/server/tests/Unit/Support/TrackingCodeTest.php +186 -0
- package/server/tests/Unit/Support/TrackingPage/TrackingAccessTest.php +200 -0
- package/server/tests/Unit/Support/TrackingPage/TrackingRecipientTest.php +51 -0
- package/server/tests/Unit/Support/TrackingPage/TrackingResolverTest.php +181 -0
- package/server/tests/Unit/Support/TrackingPage/TrackingViewTest.php +479 -0
- package/server/tests/Unit/Support/TrackingPublisherTest.php +425 -0
- package/server/tests/Unit/Support/TrackingUpdateTest.php +363 -0
- package/server/tests/Unit/Support/UtilsAdditionalTest.php +9 -0
- package/server/tests/Unit/Support/UtilsGeoMatrixAndVendorTest.php +25 -0
- package/server/tests/VehicleResourceContractsTest.php +46 -0
- package/server/tests/VroomOrchestrationEngineTest.php +34 -1
- package/server/tests/ZoneGeofenceSettingsResourceTest.php +121 -0
- package/translations/ar-ae.yml +274 -0
- package/translations/bg-bg.yaml +274 -0
- package/translations/en-us.yaml +287 -0
- package/translations/es-pa.yaml +274 -0
- package/translations/fr-fr.yaml +274 -0
- package/translations/mn-mn.yaml +274 -0
- package/translations/pt-br.yaml +274 -0
- package/translations/ru-ru.yaml +276 -2
- package/translations/uk-ua.yaml +275 -1
- package/translations/vi-vn.yaml +274 -0
- package/addon/components/cell/contact-identity.hbs +0 -1
- package/addon/components/cell/customer-identity.hbs +0 -1
- package/addon/components/cell/driver-identity.hbs +0 -1
- package/addon/components/cell/fleet-identity.hbs +0 -1
- package/addon/components/cell/order-identity.hbs +0 -1
- package/addon/components/cell/place-identity.hbs +0 -1
- package/addon/components/cell/vehicle-identity.hbs +0 -1
- package/addon/components/cell/vendor-identity.hbs +0 -1
- package/addon/components/contact/pill.hbs +0 -24
- package/addon/components/contact/summary.hbs +0 -1
- package/addon/components/customer/pill.hbs +0 -24
- package/addon/components/customer/summary.hbs +0 -1
- package/addon/components/driver/pill.hbs +0 -24
- package/addon/components/driver/summary.hbs +0 -1
- package/addon/components/fleet/pill.hbs +0 -24
- package/addon/components/fleet/summary.hbs +0 -1
- package/addon/components/order/pill.hbs +0 -24
- package/addon/components/order/summary.hbs +0 -1
- package/addon/components/place/pill.hbs +0 -24
- package/addon/components/place/summary.hbs +0 -1
- package/addon/components/select-option/contact.hbs +0 -12
- package/addon/components/select-option/customer.hbs +0 -12
- package/addon/components/select-option/driver.hbs +0 -12
- package/addon/components/select-option/fleet.hbs +0 -12
- package/addon/components/select-option/order.hbs +0 -12
- package/addon/components/select-option/place.hbs +0 -12
- package/addon/components/select-option/vehicle.hbs +0 -12
- package/addon/components/select-option/vendor.hbs +0 -12
- package/addon/components/vehicle/pill.hbs +0 -24
- package/addon/components/vehicle/summary.hbs +0 -1
- package/addon/components/vendor/pill.hbs +0 -24
- package/addon/components/vendor/summary.hbs +0 -1
- package/app/components/cell/contact-identity.js +0 -1
- package/app/components/cell/customer-identity.js +0 -1
- package/app/components/cell/driver-identity.js +0 -1
- package/app/components/cell/fleet-identity.js +0 -1
- package/app/components/cell/order-identity.js +0 -1
- package/app/components/cell/place-identity.js +0 -1
- package/app/components/cell/vehicle-identity.js +0 -1
- package/app/components/cell/vendor-identity.js +0 -1
- package/app/components/contact/pill.js +0 -1
- package/app/components/contact/summary.js +0 -1
- package/app/components/customer/pill.js +0 -1
- package/app/components/customer/summary.js +0 -1
- package/app/components/driver/pill.js +0 -1
- package/app/components/driver/summary.js +0 -1
- package/app/components/fleet/pill.js +0 -1
- package/app/components/fleet/summary.js +0 -1
- package/app/components/order/pill.js +0 -1
- package/app/components/order/summary.js +0 -1
- package/app/components/place/pill.js +0 -1
- package/app/components/place/summary.js +0 -1
- package/app/components/select-option/contact.js +0 -1
- package/app/components/select-option/customer.js +0 -1
- package/app/components/select-option/driver.js +0 -1
- package/app/components/select-option/fleet.js +0 -1
- package/app/components/select-option/order.js +0 -1
- package/app/components/select-option/place.js +0 -1
- package/app/components/select-option/vehicle.js +0 -1
- package/app/components/select-option/vendor.js +0 -1
- package/app/components/vehicle/pill.js +0 -1
- package/app/components/vehicle/summary.js +0 -1
- package/app/components/vendor/pill.js +0 -1
- package/app/components/vendor/summary.js +0 -1
|
@@ -0,0 +1,514 @@
|
|
|
1
|
+
<?php
|
|
2
|
+
|
|
3
|
+
if (!function_exists('Fleetbase\Support\session')) {
|
|
4
|
+
eval('namespace Fleetbase\Support; function session($key = null, $default = null) { if ($key === null) { return new class { public function has($k) { return \session($k) !== null; } public function get($k, $d = null) { return \session($k, $d); } }; } return \session($key, $default); }');
|
|
5
|
+
}
|
|
6
|
+
|
|
7
|
+
if (!function_exists('Fleetbase\Support\auth')) {
|
|
8
|
+
eval('namespace Fleetbase\Support; function auth() { return new class { public function user() { return null; } public function id() { return null; } }; }');
|
|
9
|
+
}
|
|
10
|
+
|
|
11
|
+
if (!function_exists('event')) {
|
|
12
|
+
function event(...$arguments)
|
|
13
|
+
{
|
|
14
|
+
return app('events')->dispatch(...$arguments);
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
use Fleetbase\FleetOps\Events\OrderChanged;
|
|
19
|
+
use Fleetbase\FleetOps\Exceptions\OrderEditLockedException;
|
|
20
|
+
use Fleetbase\FleetOps\Models\Contact;
|
|
21
|
+
use Fleetbase\FleetOps\Models\Driver;
|
|
22
|
+
use Fleetbase\FleetOps\Models\Entity;
|
|
23
|
+
use Fleetbase\FleetOps\Models\Order;
|
|
24
|
+
use Fleetbase\FleetOps\Models\Payload;
|
|
25
|
+
use Fleetbase\FleetOps\Support\OrderEdit;
|
|
26
|
+
use Illuminate\Database\ConnectionResolver;
|
|
27
|
+
use Illuminate\Database\Eloquent\Model as EloquentModel;
|
|
28
|
+
use Illuminate\Database\SQLiteConnection;
|
|
29
|
+
|
|
30
|
+
/**
|
|
31
|
+
* Covers order edits against SQLite: replacing a payload's entities, keeping the
|
|
32
|
+
* driver's stop when an in-progress route changes, and the order.changed event an
|
|
33
|
+
* edit commits.
|
|
34
|
+
*/
|
|
35
|
+
class FleetOpsOrderOpsEventRecorder
|
|
36
|
+
{
|
|
37
|
+
public array $dispatched = [];
|
|
38
|
+
|
|
39
|
+
public function dispatch($event, $payload = [], $halt = false)
|
|
40
|
+
{
|
|
41
|
+
if (is_object($event)) {
|
|
42
|
+
$this->dispatched[] = $event;
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
return $halt ? null : [];
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
public function of(string $class): array
|
|
49
|
+
{
|
|
50
|
+
return array_values(array_filter($this->dispatched, fn ($event) => $event instanceof $class));
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
public function __call($method, $arguments)
|
|
54
|
+
{
|
|
55
|
+
return null;
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
/**
|
|
60
|
+
* Runs only the uuid and public id generation the models register, none of the
|
|
61
|
+
* observers and tracking number hooks, which reach for services the harness lacks.
|
|
62
|
+
*/
|
|
63
|
+
class FleetOpsOrderOpsModelDispatcher extends Illuminate\Events\Dispatcher
|
|
64
|
+
{
|
|
65
|
+
public function listen($events, $listener = null)
|
|
66
|
+
{
|
|
67
|
+
if (!$listener instanceof Closure) {
|
|
68
|
+
return;
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
$file = (string) (new ReflectionFunction($listener))->getFileName();
|
|
72
|
+
if (str_contains($file, 'HasUuid') || str_contains($file, 'HasPublicId')) {
|
|
73
|
+
parent::listen($events, $listener);
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
class FleetOpsOrderOpsPayloadControllerProbe extends Fleetbase\FleetOps\Http\Controllers\Api\v1\PayloadController
|
|
79
|
+
{
|
|
80
|
+
public function edit(Order $order): OrderEdit
|
|
81
|
+
{
|
|
82
|
+
return $this->beginOrderEdit($order);
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
|
|
86
|
+
class FleetOpsOrderOpsEntityControllerProbe extends Fleetbase\FleetOps\Http\Controllers\Api\v1\EntityController
|
|
87
|
+
{
|
|
88
|
+
public function editFor(?string $payloadUuid): ?OrderEdit
|
|
89
|
+
{
|
|
90
|
+
return $this->orderEditForPayload($payloadUuid);
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
class FleetOpsOrderOpsApiOrderControllerProbe extends Fleetbase\FleetOps\Http\Controllers\Api\v1\OrderController
|
|
95
|
+
{
|
|
96
|
+
public function locked(OrderEditLockedException $exception): mixed
|
|
97
|
+
{
|
|
98
|
+
return $this->lockedEditResponse($exception);
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
|
|
102
|
+
class FleetOpsOrderOpsDriver extends Driver
|
|
103
|
+
{
|
|
104
|
+
public array $notified = [];
|
|
105
|
+
|
|
106
|
+
public function notify($instance)
|
|
107
|
+
{
|
|
108
|
+
$this->notified[] = $instance;
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
|
|
112
|
+
function fleetopsOrderOpsBoot(): SQLiteConnection
|
|
113
|
+
{
|
|
114
|
+
$pdo = new PDO('sqlite::memory:');
|
|
115
|
+
$pdo->sqliteCreateFunction('ST_PointFromText', fn ($wkt, $srid = 0, $axisOrder = null) => $wkt);
|
|
116
|
+
$pdo->sqliteCreateFunction('ST_GeomFromText', fn ($wkt, $srid = 0, $axisOrder = null) => $wkt);
|
|
117
|
+
$connection = new SQLiteConnection($pdo);
|
|
118
|
+
$resolver = new ConnectionResolver(['default' => $connection, 'mysql' => $connection]);
|
|
119
|
+
$resolver->setDefaultConnection('mysql');
|
|
120
|
+
EloquentModel::setConnectionResolver($resolver);
|
|
121
|
+
// models register their uuid hooks once, when first booted, so every test shares one dispatcher
|
|
122
|
+
static $modelDispatcher;
|
|
123
|
+
EloquentModel::setEventDispatcher($modelDispatcher ??= new FleetOpsOrderOpsModelDispatcher());
|
|
124
|
+
app()->instance('db', new class($connection) {
|
|
125
|
+
public function __construct(public SQLiteConnection $c)
|
|
126
|
+
{
|
|
127
|
+
}
|
|
128
|
+
|
|
129
|
+
public function connection($name = null): SQLiteConnection
|
|
130
|
+
{
|
|
131
|
+
return $this->c;
|
|
132
|
+
}
|
|
133
|
+
|
|
134
|
+
public function __call($method, $arguments)
|
|
135
|
+
{
|
|
136
|
+
return $this->c->{$method}(...$arguments);
|
|
137
|
+
}
|
|
138
|
+
});
|
|
139
|
+
Illuminate\Support\Facades\DB::clearResolvedInstance('db');
|
|
140
|
+
class_exists(Contact::class);
|
|
141
|
+
|
|
142
|
+
foreach (['DNS2D', 'DNS1D'] as $barcode) {
|
|
143
|
+
app()->instance($barcode, new class {
|
|
144
|
+
public function __call($method, $arguments)
|
|
145
|
+
{
|
|
146
|
+
return 'barcode';
|
|
147
|
+
}
|
|
148
|
+
});
|
|
149
|
+
}
|
|
150
|
+
|
|
151
|
+
app()->instance('events', new FleetOpsOrderOpsEventRecorder());
|
|
152
|
+
app()->instance('responsecache', new class {
|
|
153
|
+
public function __call($method, $arguments)
|
|
154
|
+
{
|
|
155
|
+
return null;
|
|
156
|
+
}
|
|
157
|
+
});
|
|
158
|
+
|
|
159
|
+
$schema = $connection->getSchemaBuilder();
|
|
160
|
+
$tables = [
|
|
161
|
+
'orders' => ['uuid', 'public_id', 'company_uuid', 'payload_uuid', 'tracking_number_uuid', 'driver_assigned_uuid', 'customer_uuid', 'customer_type', 'order_config_uuid', 'status', 'type', 'notes', 'scheduled_at', 'started', 'dispatched', 'adhoc', 'distance', 'time', 'meta', 'orchestrator_priority', '_key'],
|
|
162
|
+
'payloads' => ['uuid', 'public_id', 'company_uuid', 'pickup_uuid', 'dropoff_uuid', 'return_uuid', 'current_waypoint_uuid', 'cod_amount', 'cod_currency', 'type', 'meta', '_key'],
|
|
163
|
+
'places' => ['uuid', 'public_id', 'company_uuid', 'owner_uuid', 'name', 'street1', 'city', 'country', 'location', 'meta', 'type', '_key', '_import_id'],
|
|
164
|
+
'waypoints' => ['uuid', 'public_id', 'company_uuid', 'payload_uuid', 'place_uuid', 'tracking_number_uuid', 'customer_uuid', 'customer_type', 'order', 'type', '_import_id', '_key'],
|
|
165
|
+
'entities' => ['uuid', 'public_id', 'internal_id', 'company_uuid', 'payload_uuid', 'destination_uuid', 'tracking_number_uuid', 'customer_uuid', 'customer_type', 'photo_uuid', 'name', 'type', 'price', 'meta', 'qr_code', 'barcode', '_import_id', '_key'],
|
|
166
|
+
'drivers' => ['uuid', 'public_id', 'company_uuid', 'user_uuid', 'current_job_uuid', 'status', '_key'],
|
|
167
|
+
'contacts' => ['uuid', 'public_id', 'company_uuid', 'name', 'type', 'meta', '_key'],
|
|
168
|
+
'tracking_numbers' => ['uuid', 'public_id', 'company_uuid', 'tracking_number', 'owner_uuid', 'owner_type', 'region', 'qr_code', 'barcode', 'status_uuid', '_key'],
|
|
169
|
+
'companies' => ['uuid', 'public_id', 'name', 'country'],
|
|
170
|
+
'tracking_statuses' => ['uuid', 'public_id', 'company_uuid', 'tracking_number_uuid', 'code', 'status', 'details', 'location', 'city', 'province', 'postal_code', 'country', 'complete', '_key'],
|
|
171
|
+
];
|
|
172
|
+
foreach ($tables as $table => $columns) {
|
|
173
|
+
$schema->create($table, function ($blueprint) use ($columns) {
|
|
174
|
+
$blueprint->increments('id');
|
|
175
|
+
foreach ($columns as $column) {
|
|
176
|
+
$blueprint->string($column)->nullable();
|
|
177
|
+
}
|
|
178
|
+
$blueprint->timestamps();
|
|
179
|
+
$blueprint->timestamp('deleted_at')->nullable();
|
|
180
|
+
});
|
|
181
|
+
}
|
|
182
|
+
|
|
183
|
+
session(['company' => 'company-1', 'api_key' => 'console', 'user' => null]);
|
|
184
|
+
$connection->table('companies')->insert(['uuid' => 'company-1', 'name' => 'Acme', 'country' => 'SG']);
|
|
185
|
+
$connection->table('places')->insert([
|
|
186
|
+
['uuid' => 'aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa', 'public_id' => 'place_pickup', 'company_uuid' => 'company-1', 'name' => 'Store', 'street1' => '1 Store Rd'],
|
|
187
|
+
['uuid' => 'bbbbbbbb-bbbb-4bbb-8bbb-bbbbbbbbbbbb', 'public_id' => 'place_drop_old', 'company_uuid' => 'company-1', 'name' => 'Old Drop', 'street1' => '2 Old Rd'],
|
|
188
|
+
['uuid' => 'cccccccc-cccc-4ccc-8ccc-cccccccccccc', 'public_id' => 'place_drop_new', 'company_uuid' => 'company-1', 'name' => 'Tower B', 'street1' => '8 Marina View'],
|
|
189
|
+
['uuid' => 'dddddddd-dddd-4ddd-8ddd-dddddddddddd', 'public_id' => 'place_stop_d', 'company_uuid' => 'company-1', 'name' => 'Stop D', 'street1' => '4 D St'],
|
|
190
|
+
]);
|
|
191
|
+
$connection->table('drivers')->insert(['uuid' => 'driver-1', 'public_id' => 'driver_one', 'company_uuid' => 'company-1', 'current_job_uuid' => 'order-1']);
|
|
192
|
+
|
|
193
|
+
return $connection;
|
|
194
|
+
}
|
|
195
|
+
|
|
196
|
+
function fleetopsOrderOpsEvents(): FleetOpsOrderOpsEventRecorder
|
|
197
|
+
{
|
|
198
|
+
return app('events');
|
|
199
|
+
}
|
|
200
|
+
|
|
201
|
+
function fleetopsOrderOpsOrder(SQLiteConnection $connection, array $order = [], array $payload = []): Order
|
|
202
|
+
{
|
|
203
|
+
$connection->table('payloads')->insert(array_merge([
|
|
204
|
+
'uuid' => 'payload-1',
|
|
205
|
+
'public_id' => 'payload_one',
|
|
206
|
+
'company_uuid' => 'company-1',
|
|
207
|
+
'pickup_uuid' => 'aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa',
|
|
208
|
+
'dropoff_uuid' => 'bbbbbbbb-bbbb-4bbb-8bbb-bbbbbbbbbbbb',
|
|
209
|
+
'current_waypoint_uuid' => 'aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa',
|
|
210
|
+
], $payload));
|
|
211
|
+
$connection->table('orders')->insert(array_merge([
|
|
212
|
+
'uuid' => 'order-1',
|
|
213
|
+
'public_id' => 'order_one',
|
|
214
|
+
'company_uuid' => 'company-1',
|
|
215
|
+
'payload_uuid' => 'payload-1',
|
|
216
|
+
'status' => 'created',
|
|
217
|
+
], $order));
|
|
218
|
+
|
|
219
|
+
return Order::where('uuid', 'order-1')->first();
|
|
220
|
+
}
|
|
221
|
+
|
|
222
|
+
test('sync entities updates named entities creates new ones and deletes the rest while set entities appends', function () {
|
|
223
|
+
$connection = fleetopsOrderOpsBoot();
|
|
224
|
+
$order = fleetopsOrderOpsOrder($connection);
|
|
225
|
+
$payload = $order->payload;
|
|
226
|
+
|
|
227
|
+
$payload->setEntities([['name' => 'Latte', 'price' => '450'], ['name' => 'Muffin', 'price' => '300']]);
|
|
228
|
+
$latte = Entity::where('name', 'Latte')->first();
|
|
229
|
+
$muffin = Entity::where('name', 'Muffin')->first();
|
|
230
|
+
|
|
231
|
+
// resending the same list through setEntities duplicates it
|
|
232
|
+
$payload->setEntities([['name' => 'Latte', 'price' => '450']]);
|
|
233
|
+
expect(Entity::where('payload_uuid', 'payload-1')->count())->toBe(3);
|
|
234
|
+
Entity::where('name', 'Latte')->where('uuid', '!=', $latte->uuid)->get()->each->forceDelete();
|
|
235
|
+
|
|
236
|
+
expect($payload->entitiesListOnlyNamesExisting([['id' => $latte->public_id]]))->toBeTrue()
|
|
237
|
+
->and($payload->entitiesListOnlyNamesExisting([['id' => $latte->public_id], ['name' => 'New']]))->toBeFalse();
|
|
238
|
+
|
|
239
|
+
$result = $payload->syncEntities([
|
|
240
|
+
['id' => $latte->public_id, 'name' => 'Latte', 'price' => '500'],
|
|
241
|
+
['name' => 'Croissant', 'price' => '350'],
|
|
242
|
+
]);
|
|
243
|
+
|
|
244
|
+
$names = Entity::where('payload_uuid', 'payload-1')->orderBy('name')->pluck('name')->all();
|
|
245
|
+
|
|
246
|
+
expect($names)->toBe(['Croissant', 'Latte'])
|
|
247
|
+
->and(Entity::where('uuid', $latte->uuid)->value('price'))->toBe('500')
|
|
248
|
+
->and($result['updated'])->toBe([$latte->uuid])
|
|
249
|
+
->and($result['deleted'])->toBe([$muffin->uuid])
|
|
250
|
+
->and($result['created'])->toHaveCount(1)
|
|
251
|
+
->and($payload->syncEntities([['uuid' => $latte->uuid, 'name' => 'Latte', 'price' => '500']])['updated'])->toBe([])
|
|
252
|
+
// entries that are not arrays are skipped, and a list that is not an array changes nothing
|
|
253
|
+
->and($payload->syncEntities([['uuid' => $latte->uuid, 'name' => 'Latte', 'price' => '500'], 'junk'])['deleted'])->toBe([])
|
|
254
|
+
->and($payload->syncEntities('junk'))->toBe(['created' => [], 'updated' => [], 'deleted' => []])
|
|
255
|
+
->and(Entity::where('payload_uuid', 'payload-1')->count())->toBe(1);
|
|
256
|
+
});
|
|
257
|
+
|
|
258
|
+
test('route signatures report changed parts and a not started order restarts at the first stop', function () {
|
|
259
|
+
$connection = fleetopsOrderOpsBoot();
|
|
260
|
+
$order = fleetopsOrderOpsOrder($connection, [], ['current_waypoint_uuid' => 'bbbbbbbb-bbbb-4bbb-8bbb-bbbbbbbbbbbb']);
|
|
261
|
+
$payload = $order->payload;
|
|
262
|
+
$before = $payload->routeSignature();
|
|
263
|
+
|
|
264
|
+
$connection->table('payloads')->update(['dropoff_uuid' => 'cccccccc-cccc-4ccc-8ccc-cccccccccccc']);
|
|
265
|
+
$payload = Payload::where('uuid', 'payload-1')->first();
|
|
266
|
+
|
|
267
|
+
expect(Payload::routeChanges($before, $payload->routeSignature()))->toBe(['dropoff'])
|
|
268
|
+
->and(Payload::routeChanges($before, $before))->toBe([]);
|
|
269
|
+
|
|
270
|
+
$payload->reconcileCurrentWaypoint($before, false);
|
|
271
|
+
|
|
272
|
+
expect($connection->table('payloads')->value('current_waypoint_uuid'))->toBe('aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa');
|
|
273
|
+
});
|
|
274
|
+
|
|
275
|
+
test('an in progress order keeps the driver on their stop or moves them to its replacement', function () {
|
|
276
|
+
$connection = fleetopsOrderOpsBoot();
|
|
277
|
+
|
|
278
|
+
// heading to the pickup, the dropoff changes: the pickup stays current
|
|
279
|
+
$order = fleetopsOrderOpsOrder($connection, ['status' => 'driver_enroute', 'started' => '1']);
|
|
280
|
+
$before = $order->payload->routeSignature();
|
|
281
|
+
$connection->table('payloads')->update(['dropoff_uuid' => 'cccccccc-cccc-4ccc-8ccc-cccccccccccc']);
|
|
282
|
+
Payload::where('uuid', 'payload-1')->first()->reconcileCurrentWaypoint($before, true);
|
|
283
|
+
expect($connection->table('payloads')->value('current_waypoint_uuid'))->toBe('aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa');
|
|
284
|
+
|
|
285
|
+
// heading to the dropoff, the dropoff changes: the new dropoff becomes current
|
|
286
|
+
$connection->table('payloads')->update(['dropoff_uuid' => 'bbbbbbbb-bbbb-4bbb-8bbb-bbbbbbbbbbbb', 'current_waypoint_uuid' => 'bbbbbbbb-bbbb-4bbb-8bbb-bbbbbbbbbbbb']);
|
|
287
|
+
$before = Payload::where('uuid', 'payload-1')->first()->routeSignature();
|
|
288
|
+
$connection->table('payloads')->update(['dropoff_uuid' => 'cccccccc-cccc-4ccc-8ccc-cccccccccccc']);
|
|
289
|
+
Payload::where('uuid', 'payload-1')->first()->reconcileCurrentWaypoint($before, true);
|
|
290
|
+
expect($connection->table('payloads')->value('current_waypoint_uuid'))->toBe('cccccccc-cccc-4ccc-8ccc-cccccccccccc');
|
|
291
|
+
|
|
292
|
+
// a multi-stop route loses the stop the driver was heading to: the next stop takes over
|
|
293
|
+
$connection->table('payloads')->update(['pickup_uuid' => null, 'dropoff_uuid' => null, 'current_waypoint_uuid' => 'bbbbbbbb-bbbb-4bbb-8bbb-bbbbbbbbbbbb']);
|
|
294
|
+
$connection->table('waypoints')->insert([
|
|
295
|
+
['uuid' => 'wp-1', 'company_uuid' => 'company-1', 'payload_uuid' => 'payload-1', 'place_uuid' => 'bbbbbbbb-bbbb-4bbb-8bbb-bbbbbbbbbbbb', 'order' => 0],
|
|
296
|
+
['uuid' => 'wp-2', 'company_uuid' => 'company-1', 'payload_uuid' => 'payload-1', 'place_uuid' => 'dddddddd-dddd-4ddd-8ddd-dddddddddddd', 'order' => 1],
|
|
297
|
+
]);
|
|
298
|
+
$before = Payload::where('uuid', 'payload-1')->first()->routeSignature();
|
|
299
|
+
$connection->table('waypoints')->where('uuid', 'wp-1')->update(['deleted_at' => now()]);
|
|
300
|
+
Payload::where('uuid', 'payload-1')->first()->reconcileCurrentWaypoint($before, true);
|
|
301
|
+
expect($connection->table('payloads')->value('current_waypoint_uuid'))->toBe('dddddddd-dddd-4ddd-8ddd-dddddddddddd');
|
|
302
|
+
});
|
|
303
|
+
|
|
304
|
+
test('committing a dropoff change on a dispatched order keeps its stop and announces order changed', function () {
|
|
305
|
+
$connection = fleetopsOrderOpsBoot();
|
|
306
|
+
$order = fleetopsOrderOpsOrder($connection, ['status' => 'dispatched', 'driver_assigned_uuid' => 'driver-1'], ['cod_amount' => '5000']);
|
|
307
|
+
$driver = new FleetOpsOrderOpsDriver();
|
|
308
|
+
$driver->setRawAttributes(['uuid' => 'driver-1', 'public_id' => 'driver_one', 'company_uuid' => 'company-1'], true);
|
|
309
|
+
$order->setRelation('driverAssigned', $driver);
|
|
310
|
+
|
|
311
|
+
$edit = OrderEdit::begin($order);
|
|
312
|
+
|
|
313
|
+
// the edit is allowed: route changes are open while a driver has the order
|
|
314
|
+
$edit->guard($edit->requestedChanges(['dropoff' => ['id' => 'place_drop_new']]));
|
|
315
|
+
|
|
316
|
+
$connection->table('payloads')->update(['dropoff_uuid' => 'cccccccc-cccc-4ccc-8ccc-cccccccccccc']);
|
|
317
|
+
$changes = $edit->commit(['total' => 8400, 'currency' => 'SGD', 'changed_by' => 'Jon (store)']);
|
|
318
|
+
|
|
319
|
+
$events = fleetopsOrderOpsEvents()->of(OrderChanged::class);
|
|
320
|
+
|
|
321
|
+
expect($changes)->toBe(['dropoff'])
|
|
322
|
+
->and($connection->table('payloads')->value('current_waypoint_uuid'))->toBe('aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa')
|
|
323
|
+
->and($events)->toHaveCount(1)
|
|
324
|
+
->and($events[0]->broadcastAs())->toBe('order.changed')
|
|
325
|
+
->and($events[0]->channelNames)->toBe(['order.order_one', 'order.order-1', 'driver.driver_one', 'driver.driver-1', 'company.company-1'])
|
|
326
|
+
->and($events[0]->data)->toMatchArray([
|
|
327
|
+
'id' => 'order_one',
|
|
328
|
+
'changes' => ['dropoff'],
|
|
329
|
+
'summary' => 'Drop-off changed to TOWER B - 8 MARINA VIEW',
|
|
330
|
+
'cod_amount' => 5000,
|
|
331
|
+
'total' => 8400,
|
|
332
|
+
'currency' => 'SGD',
|
|
333
|
+
'changed_by' => 'Jon (store)',
|
|
334
|
+
])
|
|
335
|
+
->and($events[0]->data['dropoff']['id'])->toBe('place_drop_new')
|
|
336
|
+
->and($events[0]->broadcastWith()['data'])->toBe($events[0]->data);
|
|
337
|
+
});
|
|
338
|
+
|
|
339
|
+
test('order changed pushes the assigned driver only for changes that concern them', function () {
|
|
340
|
+
$connection = fleetopsOrderOpsBoot();
|
|
341
|
+
$order = fleetopsOrderOpsOrder($connection, ['status' => 'dispatched', 'driver_assigned_uuid' => 'driver-1']);
|
|
342
|
+
$driver = new FleetOpsOrderOpsDriver();
|
|
343
|
+
$driver->setRawAttributes(['uuid' => 'driver-1', 'public_id' => 'driver_one', 'company_uuid' => 'company-1'], true);
|
|
344
|
+
$order->setRelation('driverAssigned', $driver);
|
|
345
|
+
|
|
346
|
+
$event = OrderChanged::dispatchFor($order, ['dropoff', 'items', 'dropoff'], 'Drop-off changed', ['changed_by' => 'Jon (store)', 'dropoff' => null]);
|
|
347
|
+
|
|
348
|
+
expect($event->data['changes'])->toBe(['dropoff', 'items'])
|
|
349
|
+
->and($driver->notified)->toHaveCount(1)
|
|
350
|
+
->and($driver->notified[0])->toBeInstanceOf(Fleetbase\FleetOps\Notifications\OrderChanged::class)
|
|
351
|
+
->and($driver->notified[0]->data)->toBe(['type' => 'order_changed', 'id' => 'order_one', 'changes' => ['dropoff', 'items']])
|
|
352
|
+
->and($driver->notified[0]->message)->toBe('Drop-off changed');
|
|
353
|
+
|
|
354
|
+
OrderChanged::dispatchFor($order, ['contact'], 'Customer changed');
|
|
355
|
+
OrderChanged::dispatchFor($order, ['items'], 'Items changed', [], false);
|
|
356
|
+
|
|
357
|
+
expect($driver->notified)->toHaveCount(1)
|
|
358
|
+
->and(OrderChanged::dispatchFor($order, []))->toBeNull()
|
|
359
|
+
->and(fleetopsOrderOpsEvents()->of(OrderChanged::class))->toHaveCount(3);
|
|
360
|
+
});
|
|
361
|
+
|
|
362
|
+
test('an edit that changes nothing announces nothing and item and notes changes are detected', function () {
|
|
363
|
+
$connection = fleetopsOrderOpsBoot();
|
|
364
|
+
$order = fleetopsOrderOpsOrder($connection);
|
|
365
|
+
|
|
366
|
+
expect(OrderEdit::begin($order)->commit())->toBe([])
|
|
367
|
+
->and(fleetopsOrderOpsEvents()->of(OrderChanged::class))->toBe([]);
|
|
368
|
+
|
|
369
|
+
$edit = OrderEdit::begin($order);
|
|
370
|
+
$order->payload->setEntities([['name' => 'Latte']]);
|
|
371
|
+
$order->notes = 'Ring twice';
|
|
372
|
+
$order->save();
|
|
373
|
+
|
|
374
|
+
expect($edit->commit())->toBe(['items', 'notes'])
|
|
375
|
+
->and($connection->table('payloads')->value('current_waypoint_uuid'))->toBe('aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa')
|
|
376
|
+
->and(fleetopsOrderOpsEvents()->of(OrderChanged::class)[0]->data['summary'])->toBe('Items changed · Notes updated');
|
|
377
|
+
});
|
|
378
|
+
|
|
379
|
+
test('requested changes name the policy fields an edit touches', function () {
|
|
380
|
+
$connection = fleetopsOrderOpsBoot();
|
|
381
|
+
$order = fleetopsOrderOpsOrder($connection, ['status' => 'ready', 'scheduled_at' => '2026-10-13 12:00:00', 'notes' => 'Same'], ['cod_amount' => '0']);
|
|
382
|
+
$order->payload->setEntities([['name' => 'Latte']]);
|
|
383
|
+
$latte = Entity::where('name', 'Latte')->first();
|
|
384
|
+
$edit = OrderEdit::begin($order);
|
|
385
|
+
|
|
386
|
+
expect($edit->requestedChanges([
|
|
387
|
+
'dropoff' => ['id' => 'place_drop_new'],
|
|
388
|
+
'entities' => [['id' => $latte->public_id]],
|
|
389
|
+
'scheduled_at' => '2026-10-13 11:00:00',
|
|
390
|
+
'notes' => 'Same',
|
|
391
|
+
'cod_amount' => 0,
|
|
392
|
+
], OrderEdit::ENTITIES_REPLACE))->toBe([
|
|
393
|
+
'dropoff' => true,
|
|
394
|
+
'items' => ['adds' => false],
|
|
395
|
+
'schedule' => ['from' => '2026-10-13T12:00:00Z', 'to' => '2026-10-13 11:00:00'],
|
|
396
|
+
]);
|
|
397
|
+
|
|
398
|
+
// ready: removing items and an earlier time pass, adding an item does not
|
|
399
|
+
$edit->guard($edit->requestedChanges(['entities' => [['id' => $latte->public_id]], 'scheduled_at' => '2026-10-13 11:00:00'], OrderEdit::ENTITIES_REPLACE));
|
|
400
|
+
|
|
401
|
+
expect(fn () => $edit->guard($edit->requestedChanges(['entities' => [['name' => 'Cake']]])))
|
|
402
|
+
->toThrow(OrderEditLockedException::class, 'Once the order is ready, items can only be removed.')
|
|
403
|
+
->and(OrderEdit::entitiesMode('replace'))->toBe('replace')
|
|
404
|
+
->and(OrderEdit::entitiesMode('sync'))->toBe('replace')
|
|
405
|
+
->and(OrderEdit::entitiesMode(null))->toBe('append');
|
|
406
|
+
});
|
|
407
|
+
|
|
408
|
+
test('a driver taken off an order is told and loses it as their current job', function () {
|
|
409
|
+
$connection = fleetopsOrderOpsBoot();
|
|
410
|
+
$order = fleetopsOrderOpsOrder($connection);
|
|
411
|
+
|
|
412
|
+
expect($order->notifyDriverUnassigned('driver-1'))->toBeTrue()
|
|
413
|
+
->and($connection->table('drivers')->where('uuid', 'driver-1')->value('current_job_uuid'))->toBeNull()
|
|
414
|
+
->and($order->notifyDriverUnassigned('missing-driver'))->toBeFalse();
|
|
415
|
+
|
|
416
|
+
$events = fleetopsOrderOpsEvents()->of(Fleetbase\FleetOps\Events\OrderDriverUnassigned::class);
|
|
417
|
+
expect($events)->toHaveCount(1)
|
|
418
|
+
->and($events[0]->broadcastAs())->toBe('order.driver_unassigned')
|
|
419
|
+
->and($events[0]->channelNames)->toBe(['driver.driver_one', 'driver.driver-1', 'company.company-1'])
|
|
420
|
+
->and(array_map(fn ($channel) => $channel->name, $events[0]->broadcastOn()))->toBe($events[0]->channelNames)
|
|
421
|
+
->and($events[0]->broadcastWith()['data'])->toBe(['id' => 'order_one', 'driver' => 'driver_one']);
|
|
422
|
+
});
|
|
423
|
+
|
|
424
|
+
test('an edit exposes its policy and detects schedule cash contact and item changes, flagging the kitchen while preparing', function () {
|
|
425
|
+
$connection = fleetopsOrderOpsBoot();
|
|
426
|
+
$connection->table('contacts')->insert(['uuid' => 'contact-1', 'public_id' => 'contact_one', 'company_uuid' => 'company-1', 'name' => 'Ada', 'type' => 'customer']);
|
|
427
|
+
$order = fleetopsOrderOpsOrder($connection, [
|
|
428
|
+
'status' => 'preparing',
|
|
429
|
+
'scheduled_at' => '2026-10-13 12:00:00',
|
|
430
|
+
'notes' => 'Same',
|
|
431
|
+
'customer_uuid' => 'contact-1',
|
|
432
|
+
'customer_type' => Contact::class,
|
|
433
|
+
], ['cod_amount' => '0']);
|
|
434
|
+
$edit = OrderEdit::begin($order);
|
|
435
|
+
|
|
436
|
+
expect($edit->policy())->toBeInstanceOf(Fleetbase\FleetOps\Support\OrderEditPolicy::class)
|
|
437
|
+
->and($edit->requestedChanges([
|
|
438
|
+
// a time that does not parse is kept as given, and still counts as a change
|
|
439
|
+
'scheduled_at' => 'not a date',
|
|
440
|
+
'notes' => 'Ring twice',
|
|
441
|
+
'cod_amount' => '12.50',
|
|
442
|
+
'customer' => 'contact_two',
|
|
443
|
+
]))->toBe([
|
|
444
|
+
'schedule' => ['from' => '2026-10-13T12:00:00Z', 'to' => 'not a date'],
|
|
445
|
+
'notes' => true,
|
|
446
|
+
'cod_amount' => true,
|
|
447
|
+
'contact' => true,
|
|
448
|
+
])
|
|
449
|
+
// the customer already on the order, by public id, is not a change; anything but a public id is
|
|
450
|
+
->and($edit->requestedChanges(['customer' => 'contact_one']))->toBe([])
|
|
451
|
+
->and($edit->requestedChanges(['customer' => 'contact-1']))->toBe([])
|
|
452
|
+
->and($edit->requestedChanges(['customer' => ['id' => 'contact_one']]))->toBe(['contact' => true]);
|
|
453
|
+
|
|
454
|
+
$edit = OrderEdit::begin($order);
|
|
455
|
+
$edit->markChanged('total', 'total');
|
|
456
|
+
$connection->table('payloads')->where('uuid', 'payload-1')->update(['cod_amount' => '900']);
|
|
457
|
+
$order->payload->setEntities([['name' => 'Latte']]);
|
|
458
|
+
$order->scheduled_at = '2026-10-14 09:30:00';
|
|
459
|
+
$order->customer_uuid = 'contact-2';
|
|
460
|
+
$order->save();
|
|
461
|
+
|
|
462
|
+
expect($edit->commit())->toBe(['items', 'cod_amount', 'schedule', 'contact', 'total'])
|
|
463
|
+
->and(fleetopsOrderOpsEvents()->of(OrderChanged::class)[0]->data['summary'])->toContain('Rescheduled to 14 Oct 09:30')
|
|
464
|
+
->and(OrderEdit::summarize(['pickup', 'schedule'], null, null))->toBe('Pickup changed · Schedule cleared')
|
|
465
|
+
->and(OrderEdit::summarize(['service_type']))->toBe('Service type changed');
|
|
466
|
+
});
|
|
467
|
+
|
|
468
|
+
test('an order with no payload, or an unsaved one, commits without touching the database', function () {
|
|
469
|
+
$connection = fleetopsOrderOpsBoot();
|
|
470
|
+
$connection->table('orders')->insert(['uuid' => 'order-2', 'public_id' => 'order_two', 'company_uuid' => 'company-1', 'status' => 'created']);
|
|
471
|
+
|
|
472
|
+
$bare = Order::where('uuid', 'order-2')->first();
|
|
473
|
+
expect(OrderEdit::begin($bare)->commit())->toBe([]);
|
|
474
|
+
|
|
475
|
+
$unsaved = Order::where('uuid', 'order-2')->first();
|
|
476
|
+
$unsaved->setRelation('payload', new Payload());
|
|
477
|
+
expect(OrderEdit::begin($unsaved)->commit())->toBe([])
|
|
478
|
+
->and(fleetopsOrderOpsEvents()->of(OrderChanged::class))->toBe([]);
|
|
479
|
+
});
|
|
480
|
+
|
|
481
|
+
test('order changed names the customer channel, reads the editor from the session and copes with a driver that is gone', function () {
|
|
482
|
+
$connection = fleetopsOrderOpsBoot();
|
|
483
|
+
$connection->table('contacts')->insert(['uuid' => 'contact-1', 'public_id' => 'contact_one', 'company_uuid' => 'company-1', 'name' => 'Ada', 'type' => 'customer']);
|
|
484
|
+
$order = fleetopsOrderOpsOrder($connection, ['driver_assigned_uuid' => 'ghost-driver', 'customer_uuid' => 'contact-1', 'customer_type' => Contact::class]);
|
|
485
|
+
// No users table here: the editor's name lookup fails quietly
|
|
486
|
+
session(['user' => 'user-1']);
|
|
487
|
+
|
|
488
|
+
$event = OrderChanged::dispatchFor($order, ['dropoff'], 'Drop-off changed');
|
|
489
|
+
session(['user' => null]);
|
|
490
|
+
|
|
491
|
+
$noDriver = new Order();
|
|
492
|
+
$noDriver->setRawAttributes(['uuid' => 'order-9', 'public_id' => 'order_nine'], true);
|
|
493
|
+
|
|
494
|
+
expect($event->channelNames)->toBe(['order.order_one', 'order.order-1', 'driver.ghost-driver', 'customer.contact_one', 'company.company-1'])
|
|
495
|
+
->and(array_map(fn ($channel) => $channel->name, $event->broadcastOn()))->toBe($event->channelNames)
|
|
496
|
+
->and($event->data['changed_by'])->toBeNull()
|
|
497
|
+
->and(OrderChanged::notifyDriver($order, $event))->toBeFalse()
|
|
498
|
+
->and(OrderChanged::assignedDriver($noDriver))->toBeNull()
|
|
499
|
+
->and(OrderChanged::placeData(null))->toBeNull();
|
|
500
|
+
});
|
|
501
|
+
|
|
502
|
+
test('the api controllers begin an order edit for a payload and answer a locked edit with 422', function () {
|
|
503
|
+
$connection = fleetopsOrderOpsBoot();
|
|
504
|
+
$order = fleetopsOrderOpsOrder($connection);
|
|
505
|
+
|
|
506
|
+
$response = (new FleetOpsOrderOpsApiOrderControllerProbe())->locked(new OrderEditLockedException(['items' => 'Items cannot be changed once a driver has the order.']));
|
|
507
|
+
|
|
508
|
+
expect((new FleetOpsOrderOpsPayloadControllerProbe())->edit($order))->toBeInstanceOf(OrderEdit::class)
|
|
509
|
+
->and((new FleetOpsOrderOpsEntityControllerProbe())->editFor('payload-1'))->toBeInstanceOf(OrderEdit::class)
|
|
510
|
+
->and((new FleetOpsOrderOpsEntityControllerProbe())->editFor('payload-missing'))->toBeNull()
|
|
511
|
+
->and((new FleetOpsOrderOpsEntityControllerProbe())->editFor(null))->toBeNull()
|
|
512
|
+
->and($response->getStatusCode())->toBe(422)
|
|
513
|
+
->and($response->getData(true)['locked'])->toBe(['items' => 'Items cannot be changed once a driver has the order.']);
|
|
514
|
+
});
|
|
@@ -119,7 +119,7 @@ function fleetopsOsrmProofBoot(): SQLiteConnection
|
|
|
119
119
|
|
|
120
120
|
public function put($path, $contents, $options = [])
|
|
121
121
|
{
|
|
122
|
-
$this->writes[] = [$path];
|
|
122
|
+
$this->writes[] = [$path, $options];
|
|
123
123
|
|
|
124
124
|
return true;
|
|
125
125
|
}
|
|
@@ -200,8 +200,9 @@ test('proof subject lookups resolve by uuid and public id per type', function ()
|
|
|
200
200
|
expect($proof)->toBeInstanceOf(Proof::class)
|
|
201
201
|
->and($connection->table('proofs')->count())->toBe(1);
|
|
202
202
|
|
|
203
|
-
$probe->callHelper('storeSignature', 'signatures/proof.png', 'binary'
|
|
204
|
-
|
|
203
|
+
$probe->callHelper('storeSignature', 'signatures/proof.png', 'binary');
|
|
204
|
+
// Signatures are written without a visibility/ACL option; the media bucket rejects ACLs.
|
|
205
|
+
expect($GLOBALS['fleetopsProofStorageFake']->writes)->toBe([['signatures/proof.png', []]]);
|
|
205
206
|
|
|
206
207
|
expect($probe->callHelper('jsonResponse', ['status' => 'ok'])->getData(true))->toBe(['status' => 'ok'])
|
|
207
208
|
->and($probe->callHelper('errorResponse', 'nope')->getData(true)['error'])->toBe('nope')
|