@fleetbase/fleetops-engine 0.6.19 → 0.6.20

package/addon/components/order/kanban.hbs

@@ -1,10 +1,12 @@
-<Kanban
-    @columns={{this.columns}}
-    @onCardMove={{this.handleCardMove}}
-    @headerOffset={{@headerOffset}}
-    @columnIdPath="status"
-    @subject="order"
-    @cardTemplate="order/kanban-card"
-    @onCreateCard={{transition-to "operations.orders.index.new"}}
-    ...attributes
-/>
+<div {{did-update this.handleArgsChange @orderConfig @orders}}>
+    <Kanban
+        @columns={{this.columns}}
+        @onCardMove={{this.handleCardMove}}
+        @headerOffset={{@headerOffset}}
+        @columnIdPath="status"
+        @subject="order"
+        @cardTemplate="order/kanban-card"
+        @onCreateCard={{transition-to "operations.orders.index.new"}}
+        ...attributes
+    />
+</div>

package/addon/components/order/kanban.js

@@ -6,6 +6,8 @@ import { isArray } from '@ember/array';
 import { debug } from '@ember/debug';
 import { task } from 'ember-concurrency';
 import titleize from 'ember-cli-string-helpers/utils/titleize';
+import smartHumanize from '@fleetbase/ember-ui/utils/smart-humanize';
+import isUuid from '@fleetbase/ember-core/utils/is-uuid';
 
 export default class OrderKanbanComponent extends Component {
     @service fetch;
@@ -13,6 +15,7 @@ export default class OrderKanbanComponent extends Component {
     @service intl;
     @tracked statuses = [];
     @tracked orders = this.args.orders ?? [];
+    @tracked orderConfig = this.args.orderConfig ?? null;
 
     #defaultStatuses = {
         start: ['created', 'dispatched', 'started'],
@@ -48,7 +51,7 @@ export default class OrderKanbanComponent extends Component {
 
         return final.map((status, index) => ({
             id: status,
-            title: titleize(status),
+            title: titleize(smartHumanize(status)),
             position: index,
             cards: this.#getOrdersByStatus(status, this.orders),
         }));
@@ -96,13 +99,34 @@ export default class OrderKanbanComponent extends Component {
         }
     }
 
+    @action handleArgsChange(el, [orderConfig, orders = []]) {
+        if (isArray(orders)) {
+            this.orders = orders;
+        }
+
+        if (isUuid(orderConfig)) {
+            this.orderConfig = orderConfig;
+        } else {
+            this.orderConfig = null;
+        }
+        this.loadStatuses.perform();
+    }
+
     #getOrdersByStatus(status, orders = []) {
-        return orders.filter((order) => order.status === status);
+        let filteredOrders = orders.filter((order) => order.status === status);
+        if (this.orderConfig) {
+            filteredOrders = filteredOrders.filter((order) => order.order_config_uuid === this.orderConfig);
+        }
+
+        return filteredOrders;
     }
 
     @task *loadStatuses() {
+        const params = {};
+        if (this.orderConfig) params.order_config_uuid = this.orderConfig;
+
         try {
-            const statuses = yield this.fetch.get('orders/statuses');
+            const statuses = yield this.fetch.get('orders/statuses', params);
             this.statuses = isArray(statuses) ? statuses : [];
         } catch (err) {
             debug('Unable to load order statuses: ' + err.message);

package/addon/controllers/operations/orders/index/new.js

@@ -66,8 +66,10 @@ export default class OperationsOrdersIndexNewController extends Controller {
             this.universe.trigger('fleet-ops.order.creating', order);
 
             // Save custom field values
-            const { created: customFieldValues } = yield order.cfManager.saveTo(order);
-            order.custom_field_values.pushObjects(customFieldValues);
+            if (order.cfManager) {
+                const { created: customFieldValues } = yield order.cfManager.saveTo(order);
+                order.custom_field_values.pushObjects(customFieldValues);
+            }
 
             // Save order
             const createdOrder = yield order.save();

package/addon/controllers/operations/orders/index.js

@@ -63,57 +63,62 @@ export default class OperationsOrdersIndexController extends Controller {
     @tracked without_driver;
     @tracked status;
     @tracked type;
+    @tracked orderConfig;
     @tracked bulkSearchValue = '';
     @tracked bulk_query = '';
     @tracked layout = 'map';
 
     /** action buttons */
-    @tracked actionButtons = [
-        {
-            icon: 'refresh',
-            onClick: this.orderActions.refresh,
-            helpText: this.intl.t('common.refresh'),
-        },
-        {
-            text: this.intl.t('common.new'),
-            type: 'primary',
-            icon: 'plus',
-            onClick: this.orderActions.transition.create,
-        },
-        {
-            text: this.intl.t('common.export'),
-            icon: 'long-arrow-up',
-            iconClass: 'rotate-icon-45',
-            wrapperClass: 'hidden md:flex',
-            onClick: this.orderActions.export,
-        },
-    ];
+    get actionButtons() {
+        return [
+            {
+                icon: 'refresh',
+                onClick: this.orderActions.refresh,
+                helpText: this.intl.t('common.refresh'),
+            },
+            {
+                text: this.intl.t('common.new'),
+                type: 'primary',
+                icon: 'plus',
+                onClick: this.orderActions.transition.create,
+            },
+            {
+                text: this.intl.t('common.export'),
+                icon: 'long-arrow-up',
+                iconClass: 'rotate-icon-45',
+                wrapperClass: 'hidden md:flex',
+                onClick: this.orderActions.export,
+            },
+        ];
+    }
 
     /** bulk actions */
-    @tracked bulkActions = [
-        {
-            label: this.intl.t('common.cancel-resource', { resource: this.intl.t('resource.orders') }),
-            icon: 'ban',
-            fn: this.orderActions.bulkCancel,
-        },
-        {
-            label: this.intl.t('common.delete-resource', { resource: this.intl.t('resource.orders') }),
-            icon: 'trash',
-            class: 'text-red-500',
-            fn: this.orderActions.bulkDelete,
-        },
-        { separator: true },
-        {
-            label: this.intl.t('common.dispatch-orders'),
-            icon: 'rocket',
-            fn: this.orderActions.bulkDispatch,
-        },
-        {
-            label: this.intl.t('common.assign-driver'),
-            icon: 'user-plus',
-            fn: this.orderActions.bulkAssignDriver,
-        },
-    ];
+    get bulkActions() {
+        return [
+            {
+                label: this.intl.t('common.cancel-resource', { resource: this.intl.t('resource.orders') }),
+                icon: 'ban',
+                fn: this.orderActions.bulkCancel,
+            },
+            {
+                label: this.intl.t('common.delete-resource', { resource: this.intl.t('resource.orders') }),
+                icon: 'trash',
+                class: 'text-red-500',
+                fn: this.orderActions.bulkDelete,
+            },
+            { separator: true },
+            {
+                label: this.intl.t('common.dispatch-orders'),
+                icon: 'rocket',
+                fn: this.orderActions.bulkDispatch,
+            },
+            {
+                label: this.intl.t('common.assign-driver'),
+                icon: 'user-plus',
+                fn: this.orderActions.bulkAssignDriver,
+            },
+        ];
+    }
 
     /** columns */
     get columns() {
@@ -366,7 +371,7 @@ export default class OperationsOrdersIndexController extends Controller {
                 ddButtonText: false,
                 ddButtonIcon: 'ellipsis-h',
                 ddButtonIconPrefix: 'fas',
-                ddMenuLabel: this.intl.t('common.resource-actions', { resource: this.intl.t('resource.Order') }),
+                ddMenuLabel: this.intl.t('common.resource-actions', { resource: this.intl.t('resource.order') }),
                 cellClassNames: 'overflow-visible',
                 wrapperClass: 'flex items-center justify-end mx-2',
                 width: '12%',

package/addon/routes/operations/orders/index.js

@@ -30,9 +30,6 @@ export default class OperationsOrdersIndexRoute extends Route {
         before: { refreshModel: true },
         type: { refreshModel: true },
         layout: { refreshModel: false },
-        drawerOpen: { refreshModel: false },
-        drawerTab: { refreshModel: false },
-        orderPanelOpen: { refreshModel: false },
     };
 
     model(params) {

package/addon/services/order-creation.js

@@ -1,6 +1,6 @@
 import Service, { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
-import { later } from '@ember/runloop';
+import { next } from '@ember/runloop';
 
 export default class OrderCreationService extends Service {
     @service orderActions;
@@ -12,13 +12,9 @@ export default class OrderCreationService extends Service {
         const order = this.orderActions.createNewInstance(attrs);
         this.order = order;
 
-        later(
-            this,
-            () => {
-                this.addContext('order', order);
-            },
-            0
-        );
+        next(() => {
+            this.addContext('order', order);
+        });
 
         return order;
     }

package/addon/services/order-validation.js

@@ -23,7 +23,7 @@ export default class OrderValidationService extends Service {
         const hasWaypoints = order.payload.waypoints.length >= 2;
         const hasPickup = isNotEmpty(order.payload.pickup);
         const hasDropoff = isNotEmpty(order.payload.dropoff);
-        const hasValidCustomFields = cfManager ? this.isCustomFieldsValid(cfManager) : false;
+        const hasValidCustomFields = cfManager ? this.isCustomFieldsValid(cfManager) : true;
 
         if (hasWaypoints) {
             return hasOrderConfig && hasOrderType && hasValidCustomFields;
@@ -37,13 +37,13 @@ export default class OrderValidationService extends Service {
     }
 
     validateCustomFields(cfManager) {
-        if (!cfManager) return false;
+        if (!cfManager) return true;
 
         return cfManager.validateRequired();
     }
 
     isCustomFieldsValid(cfManager) {
-        if (!cfManager) return false;
+        if (!cfManager) return true;
 
         const { isValid } = this.validateCustomFields(cfManager);
         return isValid;

package/addon/styles/fleetops-engine.css

@@ -1654,3 +1654,38 @@ button.fleetops-btn-xxs,
     padding-top: 0.2rem !important;
     padding-bottom: 0.2rem !important;
 }
+
+/** css fix for operations index/kanban */
+main.console-fleet-ops-operations-orders-index-index section.next-view-section {
+    max-width: 100vw;
+    min-width: 0;
+}
+
+main.console-fleet-ops-operations-orders-index-index section.next-view-section > .next-view-section-container {
+    display: flex;
+    flex-direction: column;
+    max-width: 100vw;
+    min-width: 0;
+}
+
+main.console-fleet-ops-operations-orders-index-index section.next-view-section > .next-view-section-container > .next-view-section-subheader {
+    flex: 0 0 auto;
+    width: 100%;
+}
+
+main.console-fleet-ops-operations-orders-index-index section.next-view-section > .next-view-section-container > .next-view-section-body {
+    flex: 1 1 auto;
+    min-width: 0;
+    overflow: auto;
+}
+
+main.console-fleet-ops-operations-orders-index-index section.next-view-section > .next-view-section-container > .next-view-section-body > .kanban-board {
+    display: flex;
+}
+
+.next-view-section-subheader .next-view-section-subheader-actions .order-board-type-filter.ember-power-select-trigger.ember-basic-dropdown-trigger {
+    height: 2rem;
+    align-items: center;
+    padding-left: 0.5rem;
+    padding-right: 2rem;
+}

package/addon/templates/operations/orders/index.hbs

@@ -53,9 +53,33 @@
 {{/if}}
 
 {{#if (eq this.layout "kanban")}}
-    <Layout::Section::Header @title={{t "menu.order-board"}} @actionsWrapperClass="space-x-1" />
+    <Layout::Section::Header @title={{t "menu.order-board"}} @subtitle={{@model.length}} @subtitleClass="text-xs text-center font-semibold ml-2 w-6 h-6 rounded-full bg-blue-100 text-blue-900 dark:bg-blue-900 dark:text-blue-100 flex items-center justify-center" @actionsWrapperClass="space-x-1">
+        <div class="flex flex-row items-center space-x-2">
+            <div class="w-64">
+                <div class="fleetbase-model-select fleetbase-power-select ember-model-select">
+                    <ModelSelect
+                        @modelName="order-config"
+                        @selectedModel={{or this.orderConfig this.type}}
+                        @placeholder={{t "order.fields.order-type-placeholder"}}
+                        @triggerClass="form-select form-input order-board-type-filter"
+                        @infiniteScroll={{false}}
+                        @renderInPlace={{true}}
+                        @allowClear={{true}}
+                        @onChange={{fn (mut this.orderConfig)}}
+                        @onChangeId={{fn (mut this.type)}}
+                        as |orderConfig|
+                    >
+                        <div class="text-sm">
+                            <div class="font-semibold normalize-in-trigger">{{orderConfig.name}}</div>
+                            <div class="hide-from-trigger">{{n-a orderConfig.description}}</div>
+                        </div>
+                    </ModelSelect>
+                </div>
+            </div>
+        </div>
+    </Layout::Section::Header>
     <Layout::Section::Body>
-        <Order::Kanban @orders={{@model}} @headerOffset={{160}} />
+        <Order::Kanban @orders={{@model}} @headerOffset={{160}} @orderConfig={{this.type}} />
     </Layout::Section::Body>
 {{/if}}
 

package/addon/utils/setup-customer-portal.js

@@ -4,6 +4,8 @@ import { setOwner } from '@ember/application';
 import { debug } from '@ember/debug';
 
 export default function setupCustomerPortal(app, engine, universe) {
+    if (!customerPortalInstalled(app)) return;
+
     universe.afterBoot(function (u) {
         const portal = u.getEngineInstance('@fleetbase/customer-portal-engine');
         if (!portal) {
@@ -58,3 +60,8 @@ function createEngineBoundComponent(engineInstance, ComponentClass) {
         }
     };
 }
+
+function customerPortalInstalled(app) {
+    const extensions = app.extensions ?? [];
+    return extensions.find(({ name }) => name === '@fleetbase/customer-portal-engine');
+}

package/composer.json

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

package/extension.json

@@ -1,6 +1,6 @@
 {
     "name": "Fleet-Ops",
-    "version": "0.6.19",
+    "version": "0.6.20",
     "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.19",
+    "version": "0.6.20",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "fleetbase": {
         "route": "fleet-ops"
@@ -42,8 +42,8 @@
     },
     "dependencies": {
         "@babel/core": "^7.23.2",
-        "@fleetbase/ember-core": "latest",
-        "@fleetbase/ember-ui": "latest",
+        "@fleetbase/ember-core": "^0.3.4",
+        "@fleetbase/ember-ui": "^0.3.6",
         "@fleetbase/fleetops-data": "^0.1.20",
         "@fleetbase/leaflet-routing-machine": "^3.2.17",
         "@fortawesome/ember-fontawesome": "^2.0.0",

package/server/src/Http/Controllers/Internal/v1/OrderController.php

@@ -774,55 +774,30 @@ class OrderController extends FleetOpsController
     }
 
     /**
-     * Retrieve all distinct order statuses for the authenticated company.
-     *
-     * This endpoint compiles:
-     * 1. All unique `status` values from the `orders` table for the current company.
-     * 2. Optionally, all `Activity` codes defined in `OrderConfig` records that are
-     *    actually referenced by existing orders (via `order_config_uuid`).
-     *
-     * ---
-     * ### Query Parameters
-     * - `include_order_config_activities` (bool, optional)
-     *   When true, includes `Activity` codes from relevant `OrderConfig` instances.
-     *
-     * - `order_config_key` (string, optional)
-     *   Restricts both `orders` and `order_configs` to a specific configuration key.
-     *
-     * ---
-     * ### Behavior
-     * - Only includes order configs that are actually used by orders.
-     * - Uses the `activities()` method on each `OrderConfig` to extract all activity codes.
-     * - Merges and deduplicates both order statuses and activity codes.
-     *
-     * ---
-     * ### Example Response
-     * ```json
-     * [
-     *   "created",
-     *   "dispatched",
-     *   "completed",
-     *   "canceled",
-     *   "pickup_ready",
-     *   "awaiting_payment"
-     * ]
-     * ```
-     *
-     * @return \Illuminate\Http\JsonResponse
+     * Return distinct order statuses (and optionally activity codes) for a company,
+     * filtered by order_config_uuid or order_config_key if provided.
      */
     public function statuses(Request $request)
     {
-        $companyUuid = $request->user()->company_uuid ?? session('company');
-
+        $companyUuid       = $request->user()->company_uuid ?? session('company');
         $includeActivities = $request->boolean('include_order_config_activities', true);
-        $orderConfigKey    = trim((string) $request->string('order_config_key'));
 
-        // Get distinct statuses from orders
+        // Use input() + trim to get plain strings (Request::string() returns Stringable in newer Laravel)
+        $orderConfigKey = trim((string) $request->input('order_config_key', ''));
+        $orderConfigId  = trim((string) $request->input('order_config_uuid', ''));
+
+        // ---------------------------
+        // Build base orders query
+        // ---------------------------
         $ordersQuery = DB::table('orders')
             ->where('company_uuid', $companyUuid)
-            ->whereNotNull('status');
+            ->whereNotNull('status')
+            ->whereNull('deleted_at');
 
-        if ($orderConfigKey !== '') {
+        // Prefer filtering by UUID (most precise), else by key
+        if ($orderConfigId !== '') {
+            $ordersQuery->where('order_config_uuid', $orderConfigId);
+        } elseif ($orderConfigKey !== '') {
             $ordersQuery->whereExists(function ($q) use ($companyUuid, $orderConfigKey) {
                 $q->select(DB::raw(1))
                   ->from('order_configs as oc')
@@ -832,34 +807,38 @@ class OrderController extends FleetOpsController
             });
         }
 
+        // Distinct order statuses
         $orderStatuses = $ordersQuery->distinct()->pluck('status')->filter();
 
-        // Optionally include activity codes from used order configs
+        // ---------------------------------------
+        // Optionally include activity codes
+        // (must use the SAME target config set)
+        // ---------------------------------------
         $activityCodes = collect();
 
         if ($includeActivities) {
-            $configUuidsOnOrders = DB::table('orders')
-                ->where('company_uuid', $companyUuid)
-                ->when($orderConfigKey !== '', function ($q) use ($companyUuid, $orderConfigKey) {
-                    $q->whereExists(function ($sub) use ($companyUuid, $orderConfigKey) {
-                        $sub->select(DB::raw(1))
-                            ->from('order_configs as oc')
-                            ->whereColumn('oc.uuid', 'orders.order_config_uuid')
-                            ->where('oc.company_uuid', $companyUuid)
-                            ->where('oc.key', $orderConfigKey);
-                    });
-                })
-                ->whereNotNull('order_config_uuid')
-                ->distinct()
-                ->pluck('order_config_uuid')
-                ->filter();
+            // Determine target config UUIDs once, honoring UUID > key > all-on-company
+            if ($orderConfigId !== '') {
+                $targetConfigUuids = collect([$orderConfigId]);
+            } elseif ($orderConfigKey !== '') {
+                $targetConfigUuids = DB::table('order_configs')
+                    ->where('company_uuid', $companyUuid)
+                    ->where('key', $orderConfigKey)
+                    ->pluck('uuid');
+            } else {
+                // No filter given; derive from orders in this company
+                $targetConfigUuids = DB::table('orders')
+                    ->where('company_uuid', $companyUuid)
+                    ->whereNotNull('order_config_uuid')
+                    ->distinct()
+                    ->pluck('order_config_uuid');
+            }
 
-            if ($configUuidsOnOrders->isNotEmpty()) {
+            if ($targetConfigUuids->isNotEmpty()) {
                 $orderConfigs = OrderConfig::where('company_uuid', $companyUuid)
-                    ->whereIn('uuid', $configUuidsOnOrders)
+                    ->whereIn('uuid', $targetConfigUuids)
                     ->get();
 
-                /** @var OrderConfig $config */
                 foreach ($orderConfigs as $config) {
                     if (!method_exists($config, 'activities')) {
                         continue;
@@ -867,19 +846,22 @@ class OrderController extends FleetOpsController
 
                     $activities = $config->activities();
 
-                    if ($activities instanceof Collection) {
-                        $codes = $activities
-                            ->map(fn ($activity) => $activity->code ?? null)
-                            ->filter()
-                            ->values();
+                    // Handle Collection/array gracefully
+                    $codes = collect($activities)
+                        ->map(function ($activity) {
+                            return data_get($activity, 'code');
+                        })
+                        ->filter()
+                        ->values();
 
-                        $activityCodes = $activityCodes->merge($codes);
-                    }
+                    $activityCodes = $activityCodes->merge($codes);
                 }
             }
         }
 
-        // Merge & deduplicate everything
+        // ---------------------------------------
+        // Merge & return
+        // ---------------------------------------
         $result = $orderStatuses
             ->merge($activityCodes)
             ->unique()

package/server/src/Models/Payload.php

@@ -368,7 +368,15 @@ class Payload extends Model
             ) {
                 $placeUuid = $attributes['place_uuid'];
 
-            // Path 2: public_id under "id" -> resolve to uuid
+            // Path 2: public_id under "uuid" -> resolve to uuid
+            } elseif (
+                is_array($attributes)
+                && isset($attributes['uuid'])
+                && ($resolvedUuid = Place::where('uuid', $attributes['uuid'])->value('uuid'))
+            ) {
+                $placeUuid = $resolvedUuid;
+
+            // Path 3: public_id under "id" -> resolve to uuid
             } elseif (
                 is_array($attributes)
                 && isset($attributes['id'])
@@ -376,10 +384,11 @@ class Payload extends Model
             ) {
                 $placeUuid = $resolvedUuid;
 
-            // Path 3: create from mixed payload
+            // Path 4: create from mixed payload
             } else {
                 $place = Place::createFromMixed($attributes);
 
+
                 // Store temp search UUID for traceability if present and different
                 if ($place instanceof Place && isset($attributes['uuid']) && $place->uuid !== $attributes['uuid']) {
                     $place->updateMeta('search_uuid', $attributes['uuid']);
@@ -420,7 +429,7 @@ class Payload extends Model
             // -------- Upsert Waypoint --------
             // Uniqueness: payload + place + order for deterministic row per position.
             $unique = [
-                'payload_uuid' => $this->payload_uuid,
+                'payload_uuid' => $this->uuid,
                 'place_uuid'   => $placeUuid,
                 'order'        => $index,
             ];

package/server/src/Models/Place.php

@@ -362,7 +362,11 @@ class Place extends Model
         $results = \Geocoder\Laravel\Facades\Geocoder::geocode($address)->get();
 
         if ($results->isEmpty() || !$results->first()) {
-            return (new static())->newInstance(['street1' => $address]);
+            $place = (new static())->newInstance(['street1' => $address, 'location' => new SpatialPoint(0, 0)]);
+            if ($saveInstance) {
+                $place->save();
+            }
+            return $place;
         }
 
         return static::createFromGoogleAddress($results->first(), $saveInstance);

package/server/src/Models/Vehicle.php

@@ -8,6 +8,7 @@ use Fleetbase\FleetOps\Casts\Point;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\FleetOps\Support\VehicleData;
 use Fleetbase\LaravelMysqlSpatial\Eloquent\SpatialTrait;
+use Fleetbase\LaravelMysqlSpatial\Types\Point as SpatialPoint;
 use Fleetbase\Models\Category;
 use Fleetbase\Models\File;
 use Fleetbase\Models\Model;
@@ -23,6 +24,7 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasManyThrough;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 use Spatie\Activitylog\LogOptions;
 use Spatie\Activitylog\Traits\LogsActivity;
@@ -61,7 +63,7 @@ class Vehicle extends Model
      *
      * @var array
      */
-    protected $searchableColumns = ['make', 'model', 'year', 'plate_number', 'vin', 'public_id'];
+    protected $searchableColumns = ['name', 'description', 'make', 'model', 'trim', 'model_type', 'body_type', 'body_sub_type', 'year', 'plate_number', 'vin', 'call_sign', 'public_id'];
 
     /**
      * Attributes that is filterable on this model.
@@ -533,6 +535,34 @@ class Vehicle extends Model
         return ($isFirstPosition || $isPast50Meters) ? Position::create($positionData) : null;
     }
 
+    /**
+     * Creates a new position for the vehicle
+     *
+     * @param array $attributes
+     * @return Position|null
+     */
+    public function createPosition(array $attributes = [], Model|string|null $destination = null): ?Position
+    {
+        if (!isset($attributes['coordinates']) && isset($attributes['location'])) {
+            $attributes['coordinates'] = $attributes['location'];
+        }
+
+        if (!isset($attributes['coordinates']) && isset($attributes['latitude']) && isset($attributes['longitude'])) {
+            $attributes['coordinates'] = new SpatialPoint($attributes['latitude'], $attributes['longitude']);
+        }
+
+        // handle destination if set
+        $destinationUuid = Str::isUuid($destination) ? $destination : data_get($destination, 'uuid');
+
+        return Position::create([
+            ...Arr::only($attributes, ['coordinates', 'heading', 'bearing', 'speed', 'altitude']),
+            'subject_uuid' => $this->uuid,
+            'subject_type' => $this->getMorphClass(),
+            'company_uuid' => $this->company_uuid,
+            'destination_uuid' => $destinationUuid
+        ]);
+    }
+
     public static function createFromImport(array $row, bool $saveInstance = false): Vehicle
     {
         // Filter array for null key values
@@ -660,4 +690,80 @@ class Vehicle extends Model
 
         return $details;
     }
+
+    /**
+     * Set or update a single key/value pair in the `specs` JSON column.
+     *
+     * Uses Laravel's `data_set` helper to allow dot notation for nested keys.
+     *
+     * @param string|array $key   the key (or array path) to set within the specs
+     * @param mixed        $value the value to assign to the given key
+     *
+     * @return array the updated specs array
+     */
+    public function setSpec(string|array $key, mixed $value): array
+    {
+        $specs = is_array($this->specs) ? $this->specs : (array) $this->specs;
+        data_set($specs, $key, $value);
+        $this->specs = $specs;
+
+        return $specs;
+    }
+
+    /**
+     * Merge multiple values into the `specs` JSON column.
+     *
+     * By default this performs a shallow merge (overwrites duplicate keys).
+     * Use `array_replace_recursive` if you need nested merges.
+     *
+     * @param array $newSpecs key/value pairs to merge into specs
+     *
+     * @return array the updated specs array
+     */
+    public function setSpecs(array $newSpecs = []): array
+    {
+        $specs       = is_array($this->specs) ? $this->specs : (array) $this->specs;
+        $specs       = array_merge($specs, $newSpecs);
+        $this->specs = $specs;
+
+        return $specs;
+    }
+
+    /**
+     * Set or update a single key/value pair in the `vin_data` JSON column.
+     *
+     * Uses Laravel's `data_set` helper to allow dot notation for nested keys.
+     *
+     * @param string|array $key   the key (or array path) to set within the VIN data
+     * @param mixed        $value the value to assign to the given key
+     *
+     * @return array the updated vin_data array
+     */
+    public function setVinData(string|array $key, mixed $value): array
+    {
+        $vinData = is_array($this->vin_data) ? $this->vin_data : (array) $this->vin_data;
+        data_set($vinData, $key, $value);
+        $this->vin_data = $vinData;
+
+        return $vinData;
+    }
+
+    /**
+     * Merge multiple values into the `vin_data` JSON column.
+     *
+     * By default this performs a shallow merge (overwrites duplicate keys).
+     * Use `array_replace_recursive` if you need nested merges.
+     *
+     * @param array $newVinData key/value pairs to merge into vin_data
+     *
+     * @return array the updated vin_data array
+     */
+    public function setVinDatas(array $newVinData = []): array
+    {
+        $vinData       = is_array($this->vin_data) ? $this->vin_data : (array) $this->vin_data;
+        $vinData       = array_merge($vinData, $newVinData);
+        $this->vin_data = $vinData;
+
+        return $vinData;
+    }
 }