@fleetbase/fleetops-engine 0.4.3 → 0.4.5

package/server/src/Models/Contact.php

@@ -13,6 +13,7 @@ use Fleetbase\Traits\Searchable;
 use Fleetbase\Traits\SendsWebhooks;
 use Fleetbase\Traits\TracksApiCredential;
 use Illuminate\Notifications\Notifiable;
+use Spatie\Activitylog\LogOptions;
 use Spatie\Activitylog\Traits\CausesActivity;
 use Spatie\Activitylog\Traits\LogsActivity;
 use Spatie\Sluggable\HasSlug;
@@ -92,25 +93,12 @@ class Contact extends Model
     protected $filterParams = ['place_uuid', 'customer_type', 'facilitator_type', 'place'];
 
     /**
-     * Properties which activity needs to be logged.
-     *
-     * @var array
+     * Get the activity log options for the model.
      */
-    protected static $logAttributes = '*';
-
-    /**
-     * Do not log empty changed.
-     *
-     * @var bool
-     */
-    protected static $submitEmptyLogs = false;
-
-    /**
-     * The name of the subject to log.
-     *
-     * @var string
-     */
-    protected static $logName = 'contact';
+    public function getActivitylogOptions(): LogOptions
+    {
+        return LogOptions::defaults()->logOnly(['*'])->logOnlyDirty();
+    }
 
     /**
      * Get the options for generating the slug.

package/server/src/Models/Driver.php

@@ -7,6 +7,7 @@ use Fleetbase\FleetOps\Casts\Point;
 use Fleetbase\FleetOps\Scopes\DriverScope;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\FleetOps\Support\Utils as FleetOpsUtils;
+use Fleetbase\LaravelMysqlSpatial\Eloquent\SpatialTrait;
 use Fleetbase\Models\Model;
 use Fleetbase\Traits\HasApiModelBehavior;
 use Fleetbase\Traits\HasInternalId;
@@ -14,11 +15,11 @@ use Fleetbase\Traits\HasPublicId;
 use Fleetbase\Traits\HasUuid;
 use Fleetbase\Traits\SendsWebhooks;
 use Fleetbase\Traits\TracksApiCredential;
-use Grimzy\LaravelMysqlSpatial\Eloquent\SpatialTrait;
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;
+use Spatie\Activitylog\LogOptions;
 use Spatie\Activitylog\Traits\CausesActivity;
 use Spatie\Activitylog\Traits\LogsActivity;
 use Spatie\Sluggable\HasSlug;
@@ -157,25 +158,12 @@ class Driver extends Model
     protected $filterParams = ['vendor', 'facilitator', 'customer', 'fleet', 'photo_uuid', 'avatar_uuid'];
 
     /**
-     * Properties which activity needs to be logged.
-     *
-     * @var array
+     * Get the activity log options for the model.
      */
-    protected static $logAttributes = '*';
-
-    /**
-     * Do not log empty changed.
-     *
-     * @var bool
-     */
-    protected static $submitEmptyLogs = false;
-
-    /**
-     * The name of the subject to log.
-     *
-     * @var string
-     */
-    protected static $logName = 'driver';
+    public function getActivitylogOptions(): LogOptions
+    {
+        return LogOptions::defaults()->logOnly(['*'])->logOnlyDirty();
+    }
 
     /**
      * Get the options for generating the slug.
@@ -203,7 +191,7 @@ class Driver extends Model
      */
     public function user()
     {
-        return $this->belongsTo(\Fleetbase\Models\User::class)->select(['uuid', 'avatar_uuid', 'name', 'phone', 'email'])->without(['driver'])->withTrashed();
+        return $this->belongsTo(\Fleetbase\Models\User::class)->select(['uuid', 'company_uuid', 'avatar_uuid', 'name', 'phone', 'email'])->without(['driver'])->withTrashed();
     }
 
     /**

package/server/src/Models/Fleet.php

@@ -10,6 +10,7 @@ use Fleetbase\Traits\Searchable;
 use Fleetbase\Traits\SendsWebhooks;
 use Fleetbase\Traits\TracksApiCredential;
 use Illuminate\Notifications\Notifiable;
+use Spatie\Activitylog\LogOptions;
 use Spatie\Activitylog\Traits\LogsActivity;
 use Spatie\Sluggable\HasSlug;
 use Spatie\Sluggable\SlugOptions;
@@ -48,32 +49,12 @@ class Fleet extends Model
     protected $searchableColumns = ['name'];
 
     /**
-     * Properties which activity needs to be logged.
-     *
-     * @var array
+     * Get the activity log options for the model.
      */
-    protected static $logAttributes = ['name', 'task', 'service_area_uuid', 'zone_uuid'];
-
-    /**
-     * Do not log empty changed.
-     *
-     * @var bool
-     */
-    protected static $submitEmptyLogs = false;
-
-    /**
-     * We only want to log changed attributes.
-     *
-     * @var bool
-     */
-    protected static $logOnlyDirty = true;
-
-    /**
-     * The name of the subject to log.
-     *
-     * @var string
-     */
-    protected static $logName = 'fleet';
+    public function getActivitylogOptions(): LogOptions
+    {
+        return LogOptions::defaults()->logOnly(['name', 'task', 'service_area_uuid', 'zone_uuid'])->logOnlyDirty();
+    }
 
     /**
      * The flug options for this model.

package/server/src/Models/FuelReport.php

@@ -5,13 +5,13 @@ namespace Fleetbase\FleetOps\Models;
 use Fleetbase\Casts\Json;
 use Fleetbase\FleetOps\Casts\Point;
 use Fleetbase\FleetOps\Support\Utils;
+use Fleetbase\LaravelMysqlSpatial\Eloquent\SpatialTrait;
 use Fleetbase\Models\Model;
 use Fleetbase\Traits\HasApiModelBehavior;
 use Fleetbase\Traits\HasPublicId;
 use Fleetbase\Traits\HasUuid;
 use Fleetbase\Traits\Searchable;
 use Fleetbase\Traits\TracksApiCredential;
-use Grimzy\LaravelMysqlSpatial\Eloquent\SpatialTrait;
 
 class FuelReport extends Model
 {

package/server/src/Models/Issue.php

@@ -4,12 +4,12 @@ namespace Fleetbase\FleetOps\Models;
 
 use Fleetbase\Casts\Json;
 use Fleetbase\FleetOps\Casts\Point;
+use Fleetbase\LaravelMysqlSpatial\Eloquent\SpatialTrait;
 use Fleetbase\Models\Model;
 use Fleetbase\Traits\HasApiModelBehavior;
 use Fleetbase\Traits\HasPublicId;
 use Fleetbase\Traits\HasUuid;
 use Fleetbase\Traits\TracksApiCredential;
-use Grimzy\LaravelMysqlSpatial\Eloquent\SpatialTrait;
 use Illuminate\Support\Str;
 
 class Issue extends Model

package/server/src/Models/Order.php

@@ -12,6 +12,7 @@ use Fleetbase\FleetOps\Events\OrderDriverAssigned;
 use Fleetbase\FleetOps\Support\Flow;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\FleetOps\Traits\HasTrackingNumber;
+use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Fleetbase\Models\Model;
 use Fleetbase\Models\Transaction;
 use Fleetbase\Traits\HasApiModelBehavior;
@@ -23,9 +24,9 @@ use Fleetbase\Traits\HasUuid;
 use Fleetbase\Traits\Searchable;
 use Fleetbase\Traits\SendsWebhooks;
 use Fleetbase\Traits\TracksApiCredential;
-use Grimzy\LaravelMysqlSpatial\Types\Point;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Str;
+use Spatie\Activitylog\LogOptions;
 use Spatie\Activitylog\Traits\LogsActivity;
 
 class Order extends Model
@@ -201,25 +202,12 @@ class Order extends Model
     ];
 
     /**
-     * Properties which activity needs to be logged.
-     *
-     * @var array
-     */
-    protected static $logAttributes = '*';
-
-    /**
-     * Do not log empty changed.
-     *
-     * @var bool
-     */
-    protected static $submitEmptyLogs = false;
-
-    /**
-     * The name of the subject to log.
-     *
-     * @var string
+     * Get the activity log options for the model.
      */
-    protected static $logName = 'order';
+    public function getActivitylogOptions(): LogOptions
+    {
+        return LogOptions::defaults()->logOnly(['*'])->logOnlyDirty();
+    }
 
     /**
      * @return \Barryvdh\DomPDF\PDF
@@ -323,6 +311,30 @@ class Order extends Model
         return $this->belongsTo(Driver::class)->without(['devices', 'vendor']);
     }
 
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function comments()
+    {
+        return $this->hasMany(\Fleetbase\Models\Comment::class, 'subject_uuid')->whereNull('parent_comment_uuid')->latest();
+    }
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function files()
+    {
+        return $this->hasMany(\Fleetbase\Models\File::class, 'subject_uuid')->latest();
+    }
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function customFields()
+    {
+        return $this->hasMany(\Fleetbase\Models\CustomField::class, 'subject_uuid')->orderBy('order');
+    }
+
     /**
      * @return \Illuminate\Database\Eloquent\Relations\HasManyThrough
      */

package/server/src/Models/Payload.php

@@ -5,13 +5,13 @@ namespace Fleetbase\FleetOps\Models;
 use Fleetbase\Casts\Json;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Resources\Internal\v1\Payload as PayloadResource;
+use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Fleetbase\Models\Model;
 use Fleetbase\Traits\HasApiModelBehavior;
 use Fleetbase\Traits\HasMetaAttributes;
 use Fleetbase\Traits\HasPublicId;
 use Fleetbase\Traits\HasUuid;
 use Fleetbase\Traits\TracksApiCredential;
-use Grimzy\LaravelMysqlSpatial\Types\Point;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;
 
@@ -562,7 +562,7 @@ class Payload extends Model
     /**
      * Get the pickup location for the payload.
      *
-     * @return \Grimzy\LaravelMysqlSpatial\Types\Point
+     * @return \Fleetbase\LaravelMysqlSpatial\Types\Point
      */
     public function getPickupLocation()
     {
@@ -653,8 +653,8 @@ class Payload extends Model
     /**
      * Set the first waypoint and update activity.
      *
-     * @param array                                   $activity
-     * @param \Grimzy\LaravelMysqlSpatial\Types\Point $location
+     * @param array                                      $activity
+     * @param \Fleetbase\LaravelMysqlSpatial\Types\Point $location
      *
      * @return void
      */
@@ -682,9 +682,9 @@ class Payload extends Model
     /**
      * Update the current waypoint activity and it's entities.
      *
-     * @param array                                   $activity
-     * @param \Grimzy\LaravelMysqlSpatial\Types\Point $location
-     * @param \Fleetbase\Models\Proof|string|null     $proof    resolvable proof of delivery/activity
+     * @param array                                      $activity
+     * @param \Fleetbase\LaravelMysqlSpatial\Types\Point $location
+     * @param \Fleetbase\Models\Proof|string|null        $proof    resolvable proof of delivery/activity
      *
      * @return $this
      */

package/server/src/Models/Place.php

@@ -6,6 +6,7 @@ use Fleetbase\Casts\Json;
 use Fleetbase\FleetOps\Casts\Point;
 use Fleetbase\FleetOps\Support\Geocoding;
 use Fleetbase\FleetOps\Support\Utils;
+use Fleetbase\LaravelMysqlSpatial\Eloquent\SpatialTrait;
 use Fleetbase\Models\Model;
 use Fleetbase\Traits\HasApiModelBehavior;
 use Fleetbase\Traits\HasMetaAttributes;
@@ -14,7 +15,6 @@ use Fleetbase\Traits\HasUuid;
 use Fleetbase\Traits\Searchable;
 use Fleetbase\Traits\SendsWebhooks;
 use Fleetbase\Traits\TracksApiCredential;
-use Grimzy\LaravelMysqlSpatial\Eloquent\SpatialTrait;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;
@@ -171,7 +171,7 @@ class Place extends Model
     /**
      * Returns a Point instance from the location of the model.
      */
-    public function getLocationAsPoint(): \Grimzy\LaravelMysqlSpatial\Types\Point
+    public function getLocationAsPoint(): \Fleetbase\LaravelMysqlSpatial\Types\Point
     {
         return Utils::getPointFromCoordinates($this->location);
     }
@@ -218,7 +218,7 @@ class Place extends Model
         }
 
         if ($coordinates = $address->getCoordinates()) {
-            $this->setAttribute('location', new \Grimzy\LaravelMysqlSpatial\Types\Point($coordinates->getLatitude(), $coordinates->getLongitude()));
+            $this->setAttribute('location', new \Fleetbase\LaravelMysqlSpatial\Types\Point($coordinates->getLatitude(), $coordinates->getLongitude()));
         }
 
         return $this;
@@ -245,7 +245,7 @@ class Place extends Model
         $attributes['city']         = $address->getLocality();
         $attributes['building']     = $address->getStreetNumber();
         $attributes['country']      = $address->getCountry() instanceof \Geocoder\Model\Country ? $address->getCountry()->getCode() : null;
-        $attributes['location']     = new \Grimzy\LaravelMysqlSpatial\Types\Point($coordinates->getLatitude(), $coordinates->getLongitude());
+        $attributes['location']     = new \Fleetbase\LaravelMysqlSpatial\Types\Point($coordinates->getLatitude(), $coordinates->getLongitude());
 
         return $attributes;
     }
@@ -303,7 +303,7 @@ class Place extends Model
      *
      * @return \Fleetbase\Models\Place|null
      */
-    public static function createFromReverseGeocodingLookup(\Grimzy\LaravelMysqlSpatial\Types\Point $point, $saveInstance = false): ?Place
+    public static function createFromReverseGeocodingLookup(\Fleetbase\LaravelMysqlSpatial\Types\Point $point, $saveInstance = false): ?Place
     {
         $results = Geocoding::reverseFromCoordinates($point->getLat(), $point->getLng());
         $place   = $results->first();
@@ -322,8 +322,8 @@ class Place extends Model
     /**
      * Creates a new Place instance from given coordinates.
      *
-     * @param \Grimzy\LaravelMysqlSpatial\Types\Point|array $coordinates
-     * @param bool                                          $saveInstance
+     * @param \Fleetbase\LaravelMysqlSpatial\Types\Point|array $coordinates
+     * @param bool                                             $saveInstance
      *
      * @return \Fleetbase\Models\Place|null
      */
@@ -332,15 +332,15 @@ class Place extends Model
         $instance = new Place();
         $point    = Utils::getPointFromMixed($coordinates);
 
-        if ($coordinates instanceof \Grimzy\LaravelMysqlSpatial\Types\Point) {
+        if ($coordinates instanceof \Fleetbase\LaravelMysqlSpatial\Types\Point) {
             $latitude               = $coordinates->getLat();
             $longitude              = $coordinates->getLng();
-        } elseif ($point instanceof \Grimzy\LaravelMysqlSpatial\Types\Point) {
+        } elseif ($point instanceof \Fleetbase\LaravelMysqlSpatial\Types\Point) {
             $latitude               = $point->getLat();
             $longitude              = $point->getLng();
         }
 
-        $instance->setAttribute('location', new \Grimzy\LaravelMysqlSpatial\Types\Point($latitude, $longitude));
+        $instance->setAttribute('location', new \Fleetbase\LaravelMysqlSpatial\Types\Point($latitude, $longitude));
         $instance->fill($attributes);
 
         $results = \Geocoder\Laravel\Facades\Geocoder::reverse($latitude, $longitude)->get();
@@ -361,8 +361,8 @@ class Place extends Model
     /**
      * Inserts a new place into the database using latitude and longitude coordinates.
      *
-     * @param \Grimzy\LaravelMysqlSpatial\Types\Point|array        $coordinates
-     * @param \Grimzy\LaravelMysqlSpatial\Types\Point|string|array $coordinates the coordinates to use for the new place
+     * @param \Fleetbase\LaravelMysqlSpatial\Types\Point|array        $coordinates
+     * @param \Fleetbase\LaravelMysqlSpatial\Types\Point|string|array $coordinates the coordinates to use for the new place
      *
      * @return mixed returns the UUID of the new place on success or false on failure
      */
@@ -371,11 +371,11 @@ class Place extends Model
         $attributes = array_merge([], $attributes);
         $point      = Utils::getPointFromMixed($coordinates);
 
-        if ($coordinates instanceof \Grimzy\LaravelMysqlSpatial\Types\Point) {
+        if ($coordinates instanceof \Fleetbase\LaravelMysqlSpatial\Types\Point) {
             $attributes['location'] = $coordinates;
             $latitude               = $coordinates->getLat();
             $longitude              = $coordinates->getLng();
-        } elseif ($point instanceof \Grimzy\LaravelMysqlSpatial\Types\Point) {
+        } elseif ($point instanceof \Fleetbase\LaravelMysqlSpatial\Types\Point) {
             $attributes['location'] = $point;
             $latitude               = $point->getLat();
             $longitude              = $point->getLng();
@@ -451,8 +451,8 @@ class Place extends Model
             $uuid = data_get($place, 'uuid');
 
             // If $place has a valid uuid and a matching Place object exists, return the uuid
-            if (Str::isUuid($uuid) && $place = Place::where('uuid', $uuid)->first()) {
-                return $place;
+            if (Str::isUuid($uuid) && $existingPlace = Place::where('uuid', $uuid)->first()) {
+                return $existingPlace;
             }
 
             // Otherwise, create a new Place object with the given attributes

package/server/src/Models/Position.php

@@ -2,11 +2,11 @@
 
 namespace Fleetbase\FleetOps\Models;
 
+use Fleetbase\LaravelMysqlSpatial\Eloquent\SpatialTrait;
 use Fleetbase\Models\Model;
 use Fleetbase\Traits\HasApiModelBehavior;
 use Fleetbase\Traits\HasUuid;
 use Fleetbase\Traits\TracksApiCredential;
-use Grimzy\LaravelMysqlSpatial\Eloquent\SpatialTrait;
 
 class Position extends Model
 {

package/server/src/Models/ServiceArea.php

@@ -4,22 +4,22 @@ namespace Fleetbase\FleetOps\Models;
 
 use Fleetbase\FleetOps\Casts\MultiPolygon as MultiPolygonCast;
 use Fleetbase\FleetOps\Support\Utils;
+use Fleetbase\LaravelMysqlSpatial\Eloquent\SpatialTrait;
+use Fleetbase\LaravelMysqlSpatial\Types\LineString;
+use Fleetbase\LaravelMysqlSpatial\Types\MultiPolygon;
+use Fleetbase\LaravelMysqlSpatial\Types\Point;
+use Fleetbase\LaravelMysqlSpatial\Types\Polygon;
 use Fleetbase\Models\Model;
 use Fleetbase\Traits\HasApiModelBehavior;
 use Fleetbase\Traits\HasPublicId;
 use Fleetbase\Traits\HasUuid;
 use Fleetbase\Traits\SendsWebhooks;
 use Fleetbase\Traits\TracksApiCredential;
-use Grimzy\LaravelMysqlSpatial\Eloquent\SpatialTrait;
-use Grimzy\LaravelMysqlSpatial\Types\LineString;
-use Grimzy\LaravelMysqlSpatial\Types\MultiPolygon;
-use Grimzy\LaravelMysqlSpatial\Types\Point;
-use Grimzy\LaravelMysqlSpatial\Types\Polygon;
 use Illuminate\Support\Arr;
 
 /**
- * @var \Grimzy\LaravelMysqlSpatial\Types\Point        $location
- * @var \Grimzy\LaravelMysqlSpatial\Types\MultiPolygon $border
+ * @var \Fleetbase\LaravelMysqlSpatial\Types\Point        $location
+ * @var \Fleetbase\LaravelMysqlSpatial\Types\MultiPolygon $border
  */
 class ServiceArea extends Model
 {
@@ -130,10 +130,10 @@ class ServiceArea extends Model
     /**
      * Creates a polygon from a given point and radius.
      *
-     * @param \Grimzy\LaravelMysqlSpatial\Types\Point $point  the central point from which to create the polygon
-     * @param int                                     $meters The radius in meters for the polygon. Default is 500 meters.
+     * @param \Fleetbase\LaravelMysqlSpatial\Types\Point $point  the central point from which to create the polygon
+     * @param int                                        $meters The radius in meters for the polygon. Default is 500 meters.
      *
-     * @return \Grimzy\LaravelMysqlSpatial\Types\Polygon returns a Polygon object
+     * @return \Fleetbase\LaravelMysqlSpatial\Types\Polygon returns a Polygon object
      */
     public static function createPolygonFromPoint(Point $point, int $meters = 500): Polygon
     {
@@ -150,10 +150,10 @@ class ServiceArea extends Model
     /**
      * Creates a multi-polygon from a given point and radius.
      *
-     * @param \Grimzy\LaravelMysqlSpatial\Types\Point $point  the central point from which to create the multi-polygon
-     * @param int                                     $meters The radius in meters for the multi-polygon. Default is 500 meters.
+     * @param \Fleetbase\LaravelMysqlSpatial\Types\Point $point  the central point from which to create the multi-polygon
+     * @param int                                        $meters The radius in meters for the multi-polygon. Default is 500 meters.
      *
-     * @return \Grimzy\LaravelMysqlSpatial\Types\MultiPolygon returns a MultiPolygon object
+     * @return \Fleetbase\LaravelMysqlSpatial\Types\MultiPolygon returns a MultiPolygon object
      */
     public static function createMultiPolygonFromPoint(Point $point, int $meters = 500): MultiPolygon
     {
@@ -180,7 +180,7 @@ class ServiceArea extends Model
     /**
      * Retrieves the location attribute as a point.
      *
-     * @return \Grimzy\LaravelMysqlSpatial\Types\Point returns the centroid of the border as a Point object
+     * @return \Fleetbase\LaravelMysqlSpatial\Types\Point returns the centroid of the border as a Point object
      */
     public function getLocationAttribute(): Point
     {

package/server/src/Models/TrackingNumber.php

@@ -4,13 +4,13 @@ namespace Fleetbase\FleetOps\Models;
 
 use Fleetbase\FleetOps\Casts\Point;
 use Fleetbase\FleetOps\Support\Utils;
+use Fleetbase\LaravelMysqlSpatial\Eloquent\SpatialTrait;
 use Fleetbase\Models\Model;
 use Fleetbase\Traits\HasApiModelBehavior;
 use Fleetbase\Traits\HasPublicId;
 use Fleetbase\Traits\HasUuid;
 use Fleetbase\Traits\SendsWebhooks;
 use Fleetbase\Traits\TracksApiCredential;
-use Grimzy\LaravelMysqlSpatial\Eloquent\SpatialTrait;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;

package/server/src/Models/TrackingStatus.php

@@ -4,6 +4,7 @@ namespace Fleetbase\FleetOps\Models;
 
 use Fleetbase\Casts\Json;
 use Fleetbase\FleetOps\Casts\Point;
+use Fleetbase\LaravelMysqlSpatial\Eloquent\SpatialTrait;
 use Fleetbase\Models\Model;
 use Fleetbase\Traits\HasApiModelBehavior;
 use Fleetbase\Traits\HasMetaAttributes;
@@ -11,7 +12,6 @@ use Fleetbase\Traits\HasPublicId;
 use Fleetbase\Traits\HasUuid;
 use Fleetbase\Traits\SendsWebhooks;
 use Fleetbase\Traits\TracksApiCredential;
-use Grimzy\LaravelMysqlSpatial\Eloquent\SpatialTrait;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Str;
 

package/server/src/Models/Vehicle.php

@@ -5,6 +5,7 @@ namespace Fleetbase\FleetOps\Models;
 use Fleetbase\Casts\Json;
 use Fleetbase\FleetOps\Casts\Point;
 use Fleetbase\FleetOps\Support\Utils;
+use Fleetbase\LaravelMysqlSpatial\Eloquent\SpatialTrait;
 use Fleetbase\Models\Model;
 use Fleetbase\Traits\HasApiModelBehavior;
 use Fleetbase\Traits\HasMetaAttributes;
@@ -12,8 +13,8 @@ use Fleetbase\Traits\HasPublicId;
 use Fleetbase\Traits\HasUuid;
 use Fleetbase\Traits\Searchable;
 use Fleetbase\Traits\TracksApiCredential;
-use Grimzy\LaravelMysqlSpatial\Eloquent\SpatialTrait;
 use Illuminate\Support\Str;
+use Spatie\Activitylog\LogOptions;
 use Spatie\Activitylog\Traits\LogsActivity;
 use Spatie\Sluggable\HasSlug;
 use Spatie\Sluggable\SlugOptions;
@@ -66,25 +67,12 @@ class Vehicle extends Model
     protected $with = [];
 
     /**
-     * Properties which activity needs to be logged.
-     *
-     * @var array
+     * Get the activity log options for the model.
      */
-    protected static $logAttributes = '*';
-
-    /**
-     * Do not log empty changed.
-     *
-     * @var bool
-     */
-    protected static $submitEmptyLogs = false;
-
-    /**
-     * The name of the subject to log.
-     *
-     * @var string
-     */
-    protected static $logName = 'vehicle';
+    public function getActivitylogOptions(): LogOptions
+    {
+        return LogOptions::defaults()->logOnly(['*'])->logOnlyDirty();
+    }
 
     /**
      * Get the options for generating the slug.

package/server/src/Models/VehicleDeviceEvent.php

@@ -4,12 +4,12 @@ namespace Fleetbase\FleetOps\Models;
 
 use Fleetbase\Casts\Json;
 use Fleetbase\FleetOps\Casts\Point;
+use Fleetbase\LaravelMysqlSpatial\Eloquent\SpatialTrait;
 use Fleetbase\Models\Model;
 use Fleetbase\Traits\HasApiModelBehavior;
 use Fleetbase\Traits\HasUuid;
 use Fleetbase\Traits\Searchable;
 use Fleetbase\Traits\TracksApiCredential;
-use Grimzy\LaravelMysqlSpatial\Eloquent\SpatialTrait;
 
 class VehicleDeviceEvent extends Model
 {

package/server/src/Models/Vendor.php

@@ -11,6 +11,7 @@ use Fleetbase\Traits\HasUuid;
 use Fleetbase\Traits\Searchable;
 use Fleetbase\Traits\TracksApiCredential;
 use Illuminate\Notifications\Notifiable;
+use Spatie\Activitylog\LogOptions;
 use Spatie\Activitylog\Traits\LogsActivity;
 use Spatie\Sluggable\HasSlug;
 use Spatie\Sluggable\SlugOptions;
@@ -106,32 +107,14 @@ class Vendor extends Model
     protected $with = ['place'];
 
     /**
-     * Properties which activity needs to be logged.
-     *
-     * @var array
+     * Get the activity log options for the model.
      */
-    protected static $logAttributes = ['name', 'email', 'website_url', 'phone', 'country', 'status', 'type', 'logo_uuid', 'company_uuid'];
-
-    /**
-     * Do not log empty changed.
-     *
-     * @var bool
-     */
-    protected static $submitEmptyLogs = false;
-
-    /**
-     * We only want to log changed attributes.
-     *
-     * @var bool
-     */
-    protected static $logOnlyDirty = true;
-
-    /**
-     * The name of the subject to log.
-     *
-     * @var string
-     */
-    protected static $logName = 'vendor';
+    public function getActivitylogOptions(): LogOptions
+    {
+        return LogOptions::defaults()
+            ->logOnly(['name', 'email', 'website_url', 'phone', 'country', 'status', 'type', 'logo_uuid', 'company_uuid'])
+            ->logOnlyDirty();
+    }
 
     /**
      * Get the options for generating the slug.