@fleetbase/fleetops-engine 0.6.24 → 0.6.25

package/composer.json

@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/fleetops-api",
-    "version": "0.6.24",
+    "version": "0.6.25",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "keywords": [
         "fleetbase-extension",

package/extension.json

@@ -1,6 +1,6 @@
 {
     "name": "Fleet-Ops",
-    "version": "0.6.24",
+    "version": "0.6.25",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "repository": "https://github.com/fleetbase/fleetops",
     "license": "AGPL-3.0-or-later",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/fleetops-engine",
-    "version": "0.6.24",
+    "version": "0.6.25",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "fleetbase": {
         "route": "fleet-ops"

package/server/src/Http/Controllers/Api/v1/DriverController.php

@@ -323,8 +323,8 @@ class DriverController extends Controller
      */
     public function track(string $id, Request $request)
     {
-        $latitude  = $request->input('latitude');
-        $longitude = $request->input('longitude');
+        $latitude  = (float) $request->input('latitude');
+        $longitude = (float) $request->input('longitude');
         $altitude  = $request->input('altitude');
         $heading   = $request->input('heading');
         $speed     = $request->input('speed');
@@ -365,7 +365,11 @@ class DriverController extends Controller
 
         $driver->loadMissing('vehicle');
         if ($vehicle = $driver->vehicle) {
-            $vehicle->updateQuietly($positionData);
+            $vehicleUpdateData = [...$positionData];
+            if ($vehicle->online !== $driver->online) {
+                $vehicleUpdateData['online'] = $driver->online;
+            }
+            $vehicle->updateQuietly($vehicleUpdateData);
             $vehicle->createPosition($positionData);
             broadcast(new VehicleLocationChanged($vehicle, ['driver' => $driver->public_id]));
         }
@@ -420,7 +424,13 @@ class DriverController extends Controller
         $onlineValue = is_null($onlineParam) ? !$driver->online : Utils::castBoolean($onlineParam);
 
         // Perform a single update call
-        $driver->update(['online' => $onlineValue]);
+        $driver->updateQuietly(['online' => $onlineValue]);
+
+        // Update vehicle online too
+        $driver->loadMissing('vehicle');
+        if ($vehicle = $driver->vehicle) {
+            $vehicle->updateQuietly(['online' => $onlineValue]);
+        }
 
         // Return the updated resource
         return new DriverResource($driver);

package/server/src/Http/Controllers/Api/v1/VehicleController.php

@@ -218,8 +218,8 @@ class VehicleController extends Controller
      */
     public function track(string $id, Request $request)
     {
-        $latitude  = $request->input('latitude');
-        $longitude = $request->input('longitude');
+        $latitude  = (float) $request->input('latitude');
+        $longitude = (float) $request->input('longitude');
         $altitude  = $request->input('altitude');
         $heading   = $request->input('heading');
         $speed     = $request->input('speed');

package/server/src/Http/Resources/v1/Driver.php

@@ -46,7 +46,7 @@ class Driver extends FleetbaseResource
             'vendor_name'                   => $this->when(Http::isInternalRequest(), $this->vendor_name),
             'vehicle'                       => $this->whenLoaded('vehicle', fn () => new VehicleWithoutDriver($this->vehicle)),
             'current_job'                   => $this->whenLoaded('currentJob', fn () => new Order($this->currentJob)),
-            'current_job_id'                => $this->when(Http::isInternalRequest(), data_get($this, 'currentJob.public_id')),
+            'current_job_id'                => $this->when(Http::isInternalRequest(), data_get($this, 'currentJob.tracking')),
             'jobs'                          => $this->whenLoaded('jobs', fn () => $this->getJobs()),
             'vendor'                        => $this->whenLoaded('vendor', fn () => new Vendor($this->vendor)),
             'fleets'                        => $this->whenLoaded('fleets', fn () => Fleet::collection($this->fleets()->without('drivers')->get())),

package/server/src/Models/Driver.php

@@ -234,6 +234,9 @@ class Driver extends Model
             'avatar_url',
             'public_id',
             'location',
+            'online',
+            'updated_at',
+            'created_at',
             'speed',
             'heading',
             'altitude',