@fleetbase/fleetops-engine 0.3.4 → 0.3.6

package/server/src/Models/Payload.php

@@ -273,6 +273,17 @@ class Payload extends Model
         return $this;
     }
 
+    public function setCurrentWaypoint(Place $destination, bool $save = true): Payload
+    {
+        $this->current_waypoint_uuid = $destination->uuid;
+
+        if ($this->save) {
+            $this->save();
+        }
+
+        return $this;
+    }
+
     public function setWaypoints($waypoints = [])
     {
         if (!is_array($waypoints)) {
@@ -336,7 +347,7 @@ class Payload extends Model
                 $placeUuid = Place::insertFromMixed($attributes);
 
                 // if has a temporary uuid from search create meta attr for search_uuid
-                if (Utils::isUuid($placeUuid) && isset($attributes['uuid']) && $placeUuid !== $attributes['uuid']) {
+                if (Str::isUuid($placeUuid) && isset($attributes['uuid']) && $placeUuid !== $attributes['uuid']) {
                     $place = Place::where('uuid', $placeUuid)->first();
 
                     if ($place instanceof Place) {
@@ -544,7 +555,7 @@ class Payload extends Model
         return $this->order;
     }
 
-    public function setPlace($property, $place, $save = false)
+    public function setPlace($property, Place $place, array $options = [])
     {
         if (!$place) {
             return;
@@ -552,6 +563,8 @@ class Payload extends Model
 
         $attr     = $property . '_uuid';
         $instance = Place::createFromMixed($place);
+        $save     = data_get($options, 'save', false);
+        $callback = data_get($options, 'callback', false);
 
         if ($instance) {
             if (Str::isUuid($instance)) {
@@ -567,10 +580,14 @@ class Payload extends Model
             $this->save();
         }
 
+        if (is_callable($callback)) {
+            $callback($instance, $this);
+        }
+
         return $this;
     }
 
-    public function setPickup($place, $save = false)
+    public function setPickup($place, array $options = [])
     {
         // if using the special [driver] value, set the meta `pickup_is_driver_location`
         if ($place === '[driver]') {
@@ -579,22 +596,23 @@ class Payload extends Model
             return;
         }
 
-        return $this->setPlace('pickup', $place, $save);
+        return $this->setPlace('pickup', $place, $options);
     }
 
-    public function setDropoff($place, $save = false)
+    public function setDropoff($place, array $options = [])
     {
-        return $this->setPlace('dropoff', $place, $save);
+        return $this->setPlace('dropoff', $place, $options);
     }
 
-    public function setReturn($place, $save = false)
+    public function setReturn($place, array $options = [])
     {
-        return $this->setPlace('return', $place, $save);
+        return $this->setPlace('return', $place, $options);
     }
 
+    // when an order only has waypoints -- no pickup/dropoff
     public function getIsMultipleDropOrderAttribute()
     {
-        return $this->waypoints && $this->waypoints->count() > 0;
+        return !$this->pickup && $this->waypoints && $this->waypoints->count() > 0;
     }
 
     /**

package/server/src/Models/Place.php

@@ -562,14 +562,30 @@ class Place extends Model
             'province'      => ['alias' => ['state']],
             'postal_code'   => ['alias' => ['postal', 'zip', 'zip_code']],
             'phone'         => ['alias' => ['phone', 'mobile', 'phone_number', 'number', 'cell', 'cell_phone', 'mobile_number', 'contact_number']],
+            'location'      => ['alias' => ['position']],
+            'latitude'      => ['alias' => ['lat', 'x']],
+            'longitude'     => ['alias' => ['lon', 'lng', 'long', 'y']],
         ];
-        $address = '';
+        $address   = '';
+        $latitude  = null;
+        $longitude = null;
 
         foreach ($addressFields as $field => $options) {
             if ($field === 'phone') {
                 continue;
             }
-            $value = Utils::or($row, $options['alias']);
+
+            if ($field === 'latitude') {
+                $latitude = Utils::or($row, array_merge([$field], $options['alias']));
+                continue;
+            }
+
+            if ($field === 'longitude') {
+                $longitude = Utils::or($row, array_merge([$field], $options['alias']));
+                continue;
+            }
+
+            $value = Utils::or($row, array_merge([$field], $options['alias']));
             if ($value) {
                 $address .= $value . ' ';
             }
@@ -577,6 +593,12 @@ class Place extends Model
 
         $address = rtrim($address);
 
+        // if latitude and longitude provided
+        if ($latitude && $longitude) {
+            $address = $latitude . ', ' . $longitude;
+        }
+
+        // if no address
         if (!$address) {
             return null;
         }
@@ -584,8 +606,9 @@ class Place extends Model
         $place = Place::createFromGeocodingLookup($address, false);
 
         foreach ($addressFields as $field => $options) {
-            if (empty($place->{$field})) {
-                $value = Utils::or($row, $options['alias']);
+            if ($place->isFillable($field) && empty($place->{$field})) {
+                $value = Utils::or($row, array_merge([$field], $options['alias']));
+
                 if ($value) {
                     $place->{$field} = $value;
                 }
@@ -601,7 +624,7 @@ class Place extends Model
 
         // set meta data
         $meta = collect($row)->except(['name', ...$addressFields['street_number']['alias'], ...$addressFields['street2']['alias'], ...$addressFields['city']['alias'], ...$addressFields['neighborhood']['alias'], ...$addressFields['province']['alias'], ...$addressFields['postal_code']['alias'], ...$addressFields['phone']['alias']])->toArray();
-        $place->setMetas($meta);
+        $place->setMeta($meta);
 
         // set the import id
         $place->setAttribute('_import_id', $importId);

package/server/src/Models/TrackingStatus.php

@@ -3,6 +3,7 @@
 namespace Fleetbase\FleetOps\Models;
 
 use Fleetbase\Casts\Json;
+use Fleetbase\FleetOps\Casts\Point;
 use Fleetbase\Models\Model;
 use Fleetbase\Traits\HasApiModelBehavior;
 use Fleetbase\Traits\HasMetaAttributes;
@@ -80,8 +81,8 @@ class TrackingStatus extends Model
      * @var array
      */
     protected $casts = [
-        'meta' => Json::class,
-        // 'location' => Point::class,
+        'meta'     => Json::class,
+        'location' => Point::class,
     ];
 
     /**
@@ -133,10 +134,15 @@ class TrackingStatus extends Model
         $this->attributes['code'] = static::prepareCode($code);
     }
 
+    public function setStatusAttribute($status)
+    {
+        $this->attributes['status'] = Str::title($status);
+    }
+
     public static function prepareCode($string)
     {
         $string = str_replace(' ', '_', $string);
-        $string = preg_replace('/[^A-Za-z0-9\-]/', '', $string);
+        $string = preg_replace('/[^A-Za-z0-9\-_]/', '', $string);
         $string = strtoupper($string);
 
         return $string;

package/server/src/Models/Vehicle.php

@@ -7,6 +7,7 @@ use Fleetbase\FleetOps\Casts\Point;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Models\Model;
 use Fleetbase\Traits\HasApiModelBehavior;
+use Fleetbase\Traits\HasMetaAttributes;
 use Fleetbase\Traits\HasPublicId;
 use Fleetbase\Traits\HasUuid;
 use Fleetbase\Traits\Searchable;
@@ -27,6 +28,7 @@ class Vehicle extends Model
     use Searchable;
     use HasSlug;
     use LogsActivity;
+    use HasMetaAttributes;
 
     /**
      * The database table used by the model.
@@ -54,7 +56,7 @@ class Vehicle extends Model
      *
      * @var array
      */
-    protected $filterParams = ['vendor', 'driver', 'driver_uuid'];
+    protected $filterParams = ['vendor', 'driver', 'driver_uuid', 'vehicle_make', 'vehicle_model'];
 
     /**
      * Relationships to auto load with driver.
@@ -165,7 +167,7 @@ class Vehicle extends Model
         'location'   => Point::class,
         'meta'       => Json::class,
         'telematics' => Json::class,
-        'model'      => Json::class,
+        'model_data' => Json::class,
         'vin_data'   => Json::class,
         'online'     => 'boolean',
     ];

package/server/src/Models/VehicleDevice.php

@@ -92,4 +92,32 @@ class VehicleDevice extends Model
     {
         return $this->hasMany(VehicleDeviceEvent::class);
     }
+
+    /**
+     * Retrieve the associated Vehicle model for the current instance.
+     *
+     * @param \Closure|null $callback a callback function to be executed if a Vehicle model is found
+     *
+     * @return \App\Models\Vehicle|null the associated Vehicle model, or null if not found
+     */
+    public function getVehicle(?\Closure $callback): ?Vehicle
+    {
+        $this->load(['vehicle']);
+        $vehicle = null;
+
+        if ($this->vehicle instanceof Vehicle) {
+            $vehicle = $this->vehicle;
+        }
+
+        // check if id is set
+        if (!$vehicle && $this->vehicle_uuid) {
+            $vehicle = Vehicle::where('uuid', $this->vehicle_uuid)->first();
+        }
+
+        if ($vehicle && is_callable($callback)) {
+            $callback($vehicle);
+        }
+
+        return $vehicle;
+    }
 }

package/server/src/Models/VehicleDeviceEvent.php

@@ -44,7 +44,7 @@ class VehicleDeviceEvent extends Model
         'state',
         'code',
         'reason',
-        'comment'
+        'comment',
     ];
     /**
      * The attributes that should be cast to native types.

package/server/src/Models/Vendor.php

@@ -182,6 +182,22 @@ class Vendor extends Model
         return $this->belongsTo(\Fleetbase\Models\File::class);
     }
 
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function facilitatorOrders()
+    {
+        return $this->hasMany(Order::class, 'facilitator_uuid', 'uuid');
+    }
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function customerOrders()
+    {
+        return $this->hasMany(Order::class, 'customer_uuid')->whereNull('deleted_at')->withoutGlobalScopes();
+    }
+
     /**
      * Get the vendor logo url.
      *

package/server/src/Observers/DriverObserver.php

@@ -44,6 +44,6 @@ class DriverObserver
         User::where(['uuid' => $driver->user_uuid, 'type' => 'driver'])->delete();
 
         // also unassign them from any order they are assigned to
-        Order::where(['driver_assigned_uui' => $driver->uuid])->update(['driver_assigned_uui' => null]);
+        Order::where(['driver_assigned_uuid' => $driver->uuid])->update(['driver_assigned_uuid' => null]);
     }
 }

package/server/src/routes.php

@@ -184,6 +184,14 @@ Route::prefix(config('fleetops.api.routing.prefix', null))->namespace('Fleetbase
         */
         $router->prefix(config('fleetops.api.routing.internal_prefix', 'int'))->namespace('Internal')->group(
             function ($router) {
+                $router->group(
+                    ['prefix' => 'v1/fleet-ops/navigator', 'namespace' => 'v1'],
+                    function ($router) {
+                        $router->get('get-link-app', 'NavigatorController@getLinkAppUrl');
+                        $router->get('link-app', 'NavigatorController@linkApp');
+                    }
+                );
+
                 $router->group(
                     ['prefix' => 'v1', 'namespace' => 'v1', 'middleware' => ['fleetbase.protected', \Fleetbase\FleetOps\Http\Middleware\TransformLocationMiddleware::class]],
                     function ($router) {

package/tsconfig.declarations.json

@@ -0,0 +1,10 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "declarationDir": "declarations",
+    "emitDeclarationOnly": true,
+    "noEmit": false,
+    "rootDir": "."
+  },
+  "include": ["addon", "addon-test-support"]
+}

package/addon/components/file-icon.js

@@ -1 +0,0 @@
-export { default } from '@fleetbase/console/components/file-icon';