@fleetbase/fleetops-engine 0.6.25 → 0.6.26

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

@@ -1,4 +1,30 @@
-<Layout::Section::Header @title={{t "menu.scheduler"}} />
+<Layout::Section::Header @title={{t "menu.scheduler"}}>
+    <div class="flex items-center gap-2">
+        <Button
+            @type={{if (eq this.viewMode "orders") "primary" "default"}}
+            @text="Orders"
+            @icon="box"
+            @onClick={{fn this.switchViewMode "orders"}}
+            @size="sm"
+        />
+        <Button
+            @type={{if (eq this.viewMode "drivers") "primary" "default"}}
+            @text="Driver Schedules"
+            @icon="id-card"
+            @onClick={{fn this.switchViewMode "drivers"}}
+            @size="sm"
+        />
+        {{#if (eq this.viewMode "drivers")}}
+            <Button
+                @type="success"
+                @text="Add Shift"
+                @icon="plus"
+                @onClick={{this.addDriverShift}}
+                @size="sm"
+            />
+        {{/if}}
+    </div>
+</Layout::Section::Header>
 
 <Layout::Section::Body>
     <div id="fleet-ops-scheduler-container">
@@ -46,15 +72,27 @@
                         </div>
                     </div>
                 {{/if}}
-                <FullCalendar
-                    @events={{this.events}}
-                    @editable={{true}}
-                    @onDrop={{this.scheduleEventFromDrop}}
-                    @onEventReceive={{this.receivedEvent}}
-                    @onEventDrop={{this.rescheduleEventFromDrag}}
-                    @onEventClick={{this.viewOrderAsEvent}}
-                    @onInit={{this.setCalendarApi}}
-                />
+                {{#if (eq this.viewMode "drivers")}}
+                    <FullCalendar
+                        @events={{this.events}}
+                        @resources={{this.calendarResources}}
+                        @editable={{true}}
+                        @onEventDrop={{this.rescheduleEventFromDrag}}
+                        @onEventClick={{this.viewOrderAsEvent}}
+                        @onInit={{this.setCalendarApi}}
+                        @schedulerLicenseKey="GPL-My-Project-Is-Open-Source"
+                    />
+                {{else}}
+                    <FullCalendar
+                        @events={{this.events}}
+                        @editable={{true}}
+                        @onDrop={{this.scheduleEventFromDrop}}
+                        @onEventReceive={{this.receivedEvent}}
+                        @onEventDrop={{this.rescheduleEventFromDrag}}
+                        @onEventClick={{this.viewOrderAsEvent}}
+                        @onInit={{this.setCalendarApi}}
+                    />
+                {{/if}}
                 <Spacer @height="200px" />
             </div>
         </div>

package/addon/utils/fleet-ops-options.js

@@ -492,6 +492,83 @@ export const sensorStatuses = [
     { label: 'Decommissioned', value: 'decommissioned', description: 'Sensor permanently retired, replaced, or removed from service.' },
 ];
 
+export const measurementSystems = [
+    { label: 'Metric System', value: 'metric', description: 'Internationally adopted system based on meters, liters, and kilograms; used by most countries.' },
+    { label: 'Imperial System', value: 'imperial', description: 'Traditional British system using miles, gallons, and pounds; still widely used in the United States.' },
+];
+
+export const fuelVolumeUnits = [
+    { label: 'Liters (L)', value: 'liters', description: 'Metric unit for measuring liquid fuel; standard in most of the world.' },
+    { label: 'Gallons (US gal)', value: 'gallons_us', description: 'US customary gallon, equal to 3.785 liters; commonly used in the United States.' },
+    { label: 'Gallons (Imperial gal)', value: 'gallons_imperial', description: 'UK Imperial gallon, equal to 4.546 liters; historically used in the UK and some Commonwealth countries.' },
+];
+
+export const fuelTypes = [
+    { label: 'Petrol (Gasoline)', value: 'petrol', description: 'Traditional internal combustion engine fuel, widely available.' },
+    { label: 'Diesel', value: 'diesel', description: 'Fuel for compression ignition engines, offering higher efficiency and torque.' },
+    { label: 'Electric', value: 'electric', description: 'Battery-powered vehicles producing zero tailpipe emissions.' },
+    { label: 'Hybrid', value: 'hybrid', description: 'Combines petrol/diesel engine with an electric motor for better fuel economy.' },
+    { label: 'Liquefied Petroleum Gas (LPG)', value: 'lpg', description: 'Alternative fuel derived from propane or butane, lower emissions.' },
+    { label: 'Compressed Natural Gas (CNG)', value: 'cng', description: 'Fuel stored at high pressure, cleaner than petrol or diesel.' },
+];
+
+export const vehicleUsageTypes = [
+    { label: 'Commercial', value: 'commercial', description: 'Used for business operations such as deliveries, services, or company activities.' },
+    { label: 'Personal', value: 'personal', description: 'Used by an individual for private, non-business purposes.' },
+    { label: 'Mixed', value: 'mixed', description: 'Used for both business and personal purposes.' },
+    { label: 'Rental', value: 'rental', description: 'Provided for short or long-term rental to third parties.' },
+    { label: 'Fleet', value: 'fleet', description: 'Part of a company-managed group of vehicles or assets for organizational use.' },
+    { label: 'Operational', value: 'operational', description: 'Vehicles actively in use for company operations or service delivery.' },
+    { label: 'Standby', value: 'standby', description: 'Assets kept on standby for future or emergency use.' },
+    { label: 'Under Maintenance', value: 'under_maintenance', description: 'Vehicles currently undergoing repair, inspection, or service.' },
+    { label: 'Decommissioned', value: 'decommissioned', description: 'Retired assets no longer part of active operations.' },
+    { label: 'In Transit', value: 'in_transit', description: 'Assets currently being transported between locations.' },
+    { label: 'On Loan', value: 'on_loan', description: 'Assets temporarily loaned to another department or client.' },
+];
+
+export const vehicleOwnershipTypes = [
+    { label: 'Company Owned', value: 'company_owned', description: 'Vehicles fully owned and managed by the company.' },
+    { label: 'Leased', value: 'leased', description: 'Vehicles leased from a third-party vendor or lessor under contract.' },
+    { label: 'Rented', value: 'rented', description: 'Short-term rental assets used for temporary fleet expansion or projects.' },
+    { label: 'Financed', value: 'financed', description: 'Vehicles purchased through financing or loan agreements.' },
+    { label: 'Vendor Supplied', value: 'vendor_supplied', description: 'Assets provided and maintained by external vendors.' },
+    { label: 'Customer Owned', value: 'customer_owned', description: 'Assets owned by a customer but operated or tracked within the system.' },
+];
+
+export const vehicleBodyTypes = [
+    { label: 'Sedan', value: 'sedan', description: 'Standard passenger car body with a fixed roof and trunk.' },
+    { label: 'SUV', value: 'suv', description: 'Sport utility vehicle designed for passenger and cargo versatility.' },
+    { label: 'Pickup Truck', value: 'pickup_truck', description: 'Truck with an open cargo area and enclosed cab.' },
+    { label: 'Van', value: 'van', description: 'Multi-purpose vehicle for transporting passengers or goods.' },
+    { label: 'Box Truck', value: 'box_truck', description: 'Enclosed cargo truck for logistics or delivery operations.' },
+    { label: 'Flatbed', value: 'flatbed', description: 'Truck with a flat, open platform for hauling oversized loads.' },
+    { label: 'Trailer', value: 'trailer', description: 'Unpowered vehicle towed for freight transport.' },
+    { label: 'Bus', value: 'bus', description: 'Passenger transport vehicle with multiple seating rows.' },
+];
+
+export const vehicleBodySubTypes = [
+    { label: 'Refrigerated Truck', value: 'refrigerated_truck', description: 'Temperature-controlled truck for transporting perishable goods.' },
+    { label: 'Tanker', value: 'tanker', description: 'Vehicle designed for transporting liquids such as fuel or water.' },
+    { label: 'Tipper Truck', value: 'tipper_truck', description: 'Truck equipped with a hydraulic bed for dumping bulk materials.' },
+    { label: 'Car Carrier', value: 'car_carrier', description: 'Trailer or truck configured for vehicle transport.' },
+    { label: 'Mini Van', value: 'mini_van', description: 'Compact van suitable for urban transport or light cargo.' },
+    { label: 'Panel Van', value: 'panel_van', description: 'Enclosed van used for deliveries or small logistics operations.' },
+    { label: 'Chassis Cab', value: 'chassis_cab', description: 'Truck base with customizable rear body configurations.' },
+    { label: 'Electric Bus', value: 'electric_bus', description: 'Battery-powered bus used for sustainable public or private transport.' },
+    { label: 'Motorbike', value: 'motorbike', description: 'Two-wheeled asset for rapid, lightweight transportation.' },
+];
+
+export const transmissionTypes = [
+    { label: 'Manual', value: 'manual', description: 'Vehicles requiring manual gear shifting by the driver.' },
+    { label: 'Automatic', value: 'automatic', description: 'Vehicles equipped with fully automatic transmission systems.' },
+    { label: 'Semi-Automatic', value: 'semi_automatic', description: 'Combines manual control with automatic clutch operation.' },
+    { label: 'CVT (Continuously Variable Transmission)', value: 'cvt', description: 'Uses a belt and pulley system for seamless gear ratio transitions.' },
+    { label: 'Dual-Clutch', value: 'dual_clutch', description: 'High-performance transmission with two clutches for faster shifting.' },
+    { label: 'Electric Drive', value: 'electric_drive', description: 'Single-speed transmission system used in electric vehicles (EVs).' },
+];
+
+export const odometerUnits = [...distanceUnits, { label: 'Hours', value: 'hours', description: 'Unit of time measurement, commonly used worldwide.' }];
+
 export default function fleetOpsOptions(key) {
     const allOptions = {
         driverTypes,
@@ -529,6 +606,15 @@ export default function fleetOpsOptions(key) {
         sensorTypes,
         deviceStatuses,
         sensorStatuses,
+        fuelTypes,
+        fuelVolumeUnits,
+        vehicleUsageTypes,
+        vehicleOwnershipTypes,
+        vehicleBodyTypes,
+        vehicleBodySubTypes,
+        transmissionTypes,
+        odometerUnits,
+        measurementSystems,
     };
 
     return allOptions[key] ?? [];

package/app/services/driver-scheduling.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/services/driver-scheduling';

package/composer.json

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

package/extension.json

@@ -1,6 +1,6 @@
 {
     "name": "Fleet-Ops",
-    "version": "0.6.25",
+    "version": "0.6.26",
     "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.25",
+    "version": "0.6.26",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "fleetbase": {
         "route": "fleet-ops"
@@ -43,8 +43,8 @@
     "dependencies": {
         "@babel/core": "^7.23.2",
         "@fleetbase/ember-core": "^0.3.6",
-        "@fleetbase/ember-ui": "^0.3.9",
-        "@fleetbase/fleetops-data": "^0.1.21",
+        "@fleetbase/ember-ui": "^0.3.11",
+        "@fleetbase/fleetops-data": "^0.1.23",
         "@fleetbase/leaflet-routing-machine": "^3.2.17",
         "@fortawesome/ember-fontawesome": "^2.0.0",
         "@fortawesome/fontawesome-svg-core": "6.4.0",

package/server/migrations/2025_11_17_033648_add_additional_columns_to_vehicles_table.php

@@ -0,0 +1,142 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('vehicles', function (Blueprint $table) {
+            // Financing details
+            $table->unsignedInteger('loan_number_of_payments')->nullable()->after('acquisition_cost');
+            $table->date('loan_first_payment')->nullable()->after('acquisition_cost');
+            $table->decimal('loan_amount', 12, 2)->nullable()->after('acquisition_cost');
+
+            // Service life details
+            $table->string('estimated_service_life_distance_unit', 16)->nullable()->after('acquisition_cost');
+            $table->unsignedInteger('estimated_service_life_distance')->nullable()->after('acquisition_cost');
+            $table->unsignedInteger('estimated_service_life_months')->nullable()->after('acquisition_cost');
+
+            // Odometer at purchase (lifecycle context)
+            $table->unsignedInteger('odometer_at_purchase')->nullable()->after('odometer');
+
+            // Capacity and Dimensions
+            $table->decimal('cargo_volume', 10, 2)->nullable()->after('fuel_volume_unit');
+            $table->decimal('passenger_volume', 10, 2)->nullable()->after('fuel_volume_unit');
+            $table->decimal('interior_volume', 10, 2)->nullable()->after('fuel_volume_unit');
+            $table->decimal('weight', 10, 2)->nullable()->after('fuel_volume_unit');
+            $table->decimal('width', 10, 2)->nullable()->after('fuel_volume_unit');
+            $table->decimal('length', 10, 2)->nullable()->after('fuel_volume_unit');
+            $table->decimal('height', 10, 2)->nullable()->after('fuel_volume_unit');
+            $table->decimal('towing_capacity', 10, 2)->nullable()->after('fuel_volume_unit');
+            $table->decimal('payload_capacity', 10, 2)->nullable()->after('fuel_volume_unit');
+            $table->unsignedTinyInteger('seating_capacity')->nullable()->after('fuel_volume_unit');
+            $table->decimal('ground_clearance', 10, 2)->nullable()->after('fuel_volume_unit');
+            $table->decimal('bed_length', 10, 2)->nullable()->after('fuel_volume_unit');
+            $table->decimal('fuel_capacity', 10, 2)->nullable()->after('fuel_volume_unit');
+
+            // Regulatory / compliance
+            $table->string('emission_standard', 32)->nullable()->after('payload_capacity');
+            $table->boolean('dpf_equipped')->nullable()->after('emission_standard');
+            $table->boolean('scr_equipped')->nullable()->after('dpf_equipped');
+            $table->decimal('gvwr', 10, 2)->nullable()->after('scr_equipped'); // gross vehicle weight rating
+            $table->decimal('gcwr', 10, 2)->nullable()->after('gvwr');         // gross combined weight rating
+
+            // Engine specs
+            $table->string('cylinder_arrangement', 8)->nullable()->after('serial_number');
+            $table->unsignedTinyInteger('number_of_cylinders')->nullable()->after('serial_number');
+            $table->unsignedInteger('torque_rpm')->nullable()->after('serial_number');
+            $table->decimal('torque', 10, 2)->nullable()->after('serial_number');
+            $table->unsignedInteger('horsepower_rpm')->nullable()->after('serial_number');
+            $table->decimal('horsepower', 10, 2)->nullable()->after('serial_number');
+            $table->decimal('engine_size', 5, 2)->nullable()->after('serial_number'); // e.g. 2.0 (L)
+            $table->decimal('engine_displacement', 7, 2)->nullable()->after('serial_number'); // e.g. 1998.00 cc
+            $table->string('engine_configuration', 32)->nullable()->after('serial_number'); // e.g. Inline-4
+            $table->string('engine_family', 64)->nullable()->after('serial_number');
+            $table->string('engine_make', 64)->nullable()->after('serial_number');
+            $table->string('engine_model', 64)->nullable()->after('serial_number');
+            $table->string('engine_number', 128)->nullable()->after('serial_number');
+
+            // Indexes (engine + financing + compliance)
+            $table->unique('engine_number', 'vehicles_engine_number_unique');
+            $table->index('engine_make', 'vehicles_engine_make_index');
+            $table->index('engine_model', 'vehicles_engine_model_index');
+            $table->index('engine_family', 'vehicles_engine_family_index');
+            $table->index('loan_first_payment', 'vehicles_loan_first_payment_index');
+            $table->index('emission_standard', 'vehicles_emission_standard_index');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('vehicles', function (Blueprint $table) {
+            // Drop indexes first
+            $table->dropUnique('vehicles_engine_number_unique');
+            $table->dropIndex('vehicles_engine_make_index');
+            $table->dropIndex('vehicles_engine_model_index');
+            $table->dropIndex('vehicles_engine_family_index');
+            $table->dropIndex('vehicles_loan_first_payment_index');
+            $table->dropIndex('vehicles_emission_standard_index');
+
+            // Then drop columns
+            $table->dropColumn([
+                // Financing details
+                'loan_number_of_payments',
+                'loan_first_payment',
+                'loan_amount',
+
+                // Service life details
+                'estimated_service_life_distance_unit',
+                'estimated_service_life_distance',
+                'estimated_service_life_months',
+
+                // Odometer at purchase
+                'odometer_at_purchase',
+
+                // Capacity and Dimensions
+                'cargo_volume',
+                'passenger_volume',
+                'interior_volume',
+                'weight',
+                'width',
+                'length',
+                'height',
+                'towing_capacity',
+                'payload_capacity',
+                'seating_capacity',
+                'ground_clearance',
+                'bed_length',
+                'fuel_capacity',
+
+                // Regulatory / compliance
+                'emission_standard',
+                'dpf_equipped',
+                'scr_equipped',
+                'gvwr',
+                'gcwr',
+
+                // Engine specs
+                'cylinder_arrangement',
+                'number_of_cylinders',
+                'torque_rpm',
+                'torque',
+                'horsepower_rpm',
+                'horsepower',
+                'engine_size',
+                'engine_displacement',
+                'engine_configuration',
+                'engine_family',
+                'engine_make',
+                'engine_model',
+                'engine_number',
+            ]);
+        });
+    }
+};

package/server/src/Constraints/HOSConstraint.php

@@ -0,0 +1,244 @@
+<?php
+
+namespace Fleetbase\FleetOps\Constraints;
+
+use Fleetbase\Models\ScheduleItem;
+use Fleetbase\Support\Scheduling\ConstraintResult;
+use Illuminate\Support\Carbon;
+
+/**
+ * Hours of Service (HOS) Constraint.
+ *
+ * Validates schedule items against FMCSA Hours of Service regulations.
+ *
+ * Key Regulations:
+ * - 11-hour driving limit: May drive a maximum of 11 hours after 10 consecutive hours off duty
+ * - 14-hour duty window: May not drive beyond the 14th consecutive hour after coming on duty
+ * - 60/70-hour weekly limit: May not drive after 60/70 hours on duty in 7/8 consecutive days
+ * - 30-minute break: Required after 8 cumulative hours of driving without at least a 30-minute break
+ */
+class HOSConstraint
+{
+    /**
+     * Validate a schedule item against HOS regulations.
+     */
+    public function validate(ScheduleItem $item): ConstraintResult
+    {
+        $violations = [];
+
+        // Get the driver's recent schedule items
+        $recentItems = $this->getRecentScheduleItems($item);
+
+        // Check 11-hour driving limit
+        if (!$this->check11HourDrivingLimit($item, $recentItems)) {
+            $violations[] = [
+                'constraint_key' => 'hos_11_hour_driving_limit',
+                'message'        => 'Exceeds 11-hour driving limit. Driver must have 10 consecutive hours off duty.',
+                'severity'       => 'critical',
+            ];
+        }
+
+        // Check 14-hour duty window
+        if (!$this->check14HourDutyWindow($item, $recentItems)) {
+            $violations[] = [
+                'constraint_key' => 'hos_14_hour_duty_window',
+                'message'        => 'Exceeds 14-hour duty window. Driver cannot drive beyond 14 hours after coming on duty.',
+                'severity'       => 'critical',
+            ];
+        }
+
+        // Check 60/70-hour weekly limit
+        if (!$this->check60_70HourWeeklyLimit($item, $recentItems)) {
+            $violations[] = [
+                'constraint_key' => 'hos_60_70_hour_weekly_limit',
+                'message'        => 'Exceeds 60/70-hour weekly limit. Driver has exceeded maximum hours in 7/8 consecutive days.',
+                'severity'       => 'critical',
+            ];
+        }
+
+        // Check 30-minute break requirement
+        if (!$this->check30MinuteBreak($item, $recentItems)) {
+            $violations[] = [
+                'constraint_key' => 'hos_30_minute_break',
+                'message'        => 'Missing required 30-minute break after 8 cumulative hours of driving.',
+                'severity'       => 'warning',
+            ];
+        }
+
+        if (empty($violations)) {
+            return ConstraintResult::pass();
+        }
+
+        return ConstraintResult::fail($violations);
+    }
+
+    /**
+     * Get recent schedule items for the driver.
+     *
+     * @return \Illuminate\Database\Eloquent\Collection
+     */
+    protected function getRecentScheduleItems(ScheduleItem $item)
+    {
+        $sevenDaysAgo = Carbon::parse($item->start_at)->subDays(7);
+
+        return ScheduleItem::where('assignee_uuid', $item->assignee_uuid)
+            ->where('assignee_type', $item->assignee_type)
+            ->where('start_at', '>=', $sevenDaysAgo)
+            ->where('id', '!=', $item->id)
+            ->orderBy('start_at', 'asc')
+            ->get();
+    }
+
+    /**
+     * Check 11-hour driving limit.
+     *
+     * @param \Illuminate\Database\Eloquent\Collection $recentItems
+     */
+    protected function check11HourDrivingLimit(ScheduleItem $item, $recentItems): bool
+    {
+        // Get the last 10-hour off-duty period
+        $lastOffDutyPeriod = $this->getLastOffDutyPeriod($item, $recentItems, 10);
+
+        if (!$lastOffDutyPeriod) {
+            // If no 10-hour off-duty period found, check total driving hours
+            $totalDrivingHours = $this->calculateTotalDrivingHours($item, $recentItems);
+
+            return $totalDrivingHours <= 11;
+        }
+
+        // Calculate driving hours since last 10-hour off-duty period
+        $drivingHoursSinceRest = $this->calculateDrivingHoursSince($item, $recentItems, $lastOffDutyPeriod);
+
+        return $drivingHoursSinceRest <= 11;
+    }
+
+    /**
+     * Check 14-hour duty window.
+     *
+     * @param \Illuminate\Database\Eloquent\Collection $recentItems
+     */
+    protected function check14HourDutyWindow(ScheduleItem $item, $recentItems): bool
+    {
+        $lastOffDutyPeriod = $this->getLastOffDutyPeriod($item, $recentItems, 10);
+
+        if (!$lastOffDutyPeriod) {
+            return true; // Cannot determine, allow for now
+        }
+
+        $dutyStart = Carbon::parse($lastOffDutyPeriod);
+        $itemEnd   = Carbon::parse($item->end_at);
+
+        $hoursSinceDutyStart = $dutyStart->diffInHours($itemEnd);
+
+        return $hoursSinceDutyStart <= 14;
+    }
+
+    /**
+     * Check 60/70-hour weekly limit.
+     *
+     * @param \Illuminate\Database\Eloquent\Collection $recentItems
+     */
+    protected function check60_70HourWeeklyLimit(ScheduleItem $item, $recentItems): bool
+    {
+        // Use 70-hour/8-day limit as default (can be configured)
+        $limit = 70;
+        $days  = 8;
+
+        $startDate  = Carbon::parse($item->start_at)->subDays($days);
+        $totalHours = 0;
+
+        foreach ($recentItems as $recentItem) {
+            if (Carbon::parse($recentItem->start_at)->gte($startDate)) {
+                $totalHours += $recentItem->duration / 60; // Convert minutes to hours
+            }
+        }
+
+        // Add current item duration
+        $totalHours += $item->duration / 60;
+
+        return $totalHours <= $limit;
+    }
+
+    /**
+     * Check 30-minute break requirement.
+     *
+     * @param \Illuminate\Database\Eloquent\Collection $recentItems
+     */
+    protected function check30MinuteBreak(ScheduleItem $item, $recentItems): bool
+    {
+        // Get driving hours in the current duty period
+        $drivingHours = 0;
+        $lastBreak    = null;
+
+        foreach ($recentItems as $recentItem) {
+            if ($recentItem->break_start_at && $recentItem->break_end_at) {
+                $breakDuration = Carbon::parse($recentItem->break_start_at)->diffInMinutes($recentItem->break_end_at);
+                if ($breakDuration >= 30) {
+                    $lastBreak    = $recentItem->break_end_at;
+                    $drivingHours = 0; // Reset driving hours after break
+                }
+            }
+
+            $drivingHours += $recentItem->duration / 60;
+        }
+
+        // Add current item
+        $drivingHours += $item->duration / 60;
+
+        // If more than 8 hours of driving, require a 30-minute break
+        if ($drivingHours > 8) {
+            return $item->break_start_at && $item->break_end_at
+                   && Carbon::parse($item->break_start_at)->diffInMinutes($item->break_end_at) >= 30;
+        }
+
+        return true;
+    }
+
+    /**
+     * Get the last off-duty period of specified duration.
+     *
+     * @param \Illuminate\Database\Eloquent\Collection $recentItems
+     */
+    protected function getLastOffDutyPeriod(ScheduleItem $item, $recentItems, int $hours): ?Carbon
+    {
+        // This is a simplified implementation
+        // In production, this would check actual off-duty periods from driver logs
+        return null;
+    }
+
+    /**
+     * Calculate total driving hours.
+     *
+     * @param \Illuminate\Database\Eloquent\Collection $recentItems
+     */
+    protected function calculateTotalDrivingHours(ScheduleItem $item, $recentItems): float
+    {
+        $totalMinutes = $item->duration;
+
+        foreach ($recentItems as $recentItem) {
+            $totalMinutes += $recentItem->duration;
+        }
+
+        return $totalMinutes / 60;
+    }
+
+    /**
+     * Calculate driving hours since a specific time.
+     *
+     * @param \Illuminate\Database\Eloquent\Collection $recentItems
+     */
+    protected function calculateDrivingHoursSince(ScheduleItem $item, $recentItems, Carbon $since): float
+    {
+        $totalMinutes = 0;
+
+        foreach ($recentItems as $recentItem) {
+            if (Carbon::parse($recentItem->start_at)->gte($since)) {
+                $totalMinutes += $recentItem->duration;
+            }
+        }
+
+        $totalMinutes += $item->duration;
+
+        return $totalMinutes / 60;
+    }
+}

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

@@ -1060,7 +1060,7 @@ class OrderController extends Controller
         // Handle order completion
         if (Utils::isActivity($activity) && $activity->completesOrder()) {
             // unset from driver current job
-            $order->driverAssigned->unassignCurrentOrder();
+            $order->driverAssigned->unassignCurrentJob();
             $order->complete();
         }
 

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

@@ -165,8 +165,13 @@ class OrderController extends FleetOpsController
                         );
                     }
 
-                    // dispatch if flagged true
-                    $order->firstDispatchWithActivity();
+                    // Check dispatch flag with backward compatibility (default true)
+                    $shouldDispatch = isset($input['dispatched']) ? (bool) $input['dispatched'] : true;
+
+                    // dispatch if flagged true, otherwise ensure order stays in created state
+                    if ($shouldDispatch) {
+                        $order->firstDispatchWithActivity();
+                    }
 
                     // set driving distance and time
                     $order->setPreliminaryDistanceAndTime();
@@ -190,7 +195,7 @@ class OrderController extends FleetOpsController
 
             return ['order' => new $this->resource($record)];
         } catch (QueryException $e) {
-            return response()->error(env('DEBUG') ? $e->getMessage() : 'Error occurred while trying to create a ' . $this->resourceSingularlName);
+            return response()->error(app()->hasDebugModeEnabled() ? $e->getMessage() : 'Error occurred while trying to create a ' . $this->resourceSingularlName);
         } catch (FleetbaseRequestValidationException $e) {
             return response()->error($e->getErrors());
         } catch (\Exception $e) {