@fleetbase/fleetops-engine 0.6.35 → 0.6.37

package/server/src/Imports/PlaceImport.php

@@ -9,6 +9,11 @@ use Maatwebsite\Excel\Concerns\WithHeadingRow;
 
 class PlaceImport implements ToCollection, WithHeadingRow
 {
+    /**
+     * Counter for successfully imported rows.
+     */
+    public int $imported = 0;
+
     /**
      * @return Collection
      */
@@ -20,6 +25,7 @@ class PlaceImport implements ToCollection, WithHeadingRow
             }
 
             Place::createFromImport($row, true);
+            $this->imported++;
         }
     }
 }

package/server/src/Imports/VehicleImport.php

@@ -9,6 +9,11 @@ use Maatwebsite\Excel\Concerns\WithHeadingRow;
 
 class VehicleImport implements ToCollection, WithHeadingRow
 {
+    /**
+     * Counter for successfully imported rows.
+     */
+    public int $imported = 0;
+
     /**
      * @return Collection
      */
@@ -20,6 +25,7 @@ class VehicleImport implements ToCollection, WithHeadingRow
             }
 
             Vehicle::createFromImport($row, true);
+            $this->imported++;
         }
     }
 }

package/server/src/Imports/VendorImport.php

@@ -9,6 +9,11 @@ use Maatwebsite\Excel\Concerns\WithHeadingRow;
 
 class VendorImport implements ToCollection, WithHeadingRow
 {
+    /**
+     * Counter for successfully imported rows.
+     */
+    public int $imported = 0;
+
     /**
      * @return Collection
      */
@@ -20,6 +25,7 @@ class VendorImport implements ToCollection, WithHeadingRow
             }
 
             Vendor::createFromImport($row, true);
+            $this->imported++;
         }
     }
 }

package/server/src/Models/Vehicle.php

@@ -507,7 +507,7 @@ class Vehicle extends Model
      *
      * @return \Illuminate\Support\Collection
      */
-    public static function getAvatarOptions()
+    public static function getAvatarOptions(?callable $customQueryCallback = null)
     {
         $options = [
             '2_door_truck.svg',
@@ -540,8 +540,15 @@ class Vehicle extends Model
             'taxi.svg',
         ];
 
+        // Query for custom avatars
+        $customAvatarsQuery = File::where('type', 'vehicle-avatar');
+        if (is_callable($customQueryCallback)) {
+            $customQueryCallback($customAvatarsQuery);
+        }
+        $customAvatars = $customAvatarsQuery->get();
+
         // Get custom avatars
-        $customAvatars = collect(File::where('type', 'vehicle-avatar')->get()->mapWithKeys(
+        $customAvatars = collect($customAvatars->mapWithKeys(
             function ($file) {
                 $key = str_replace(['.svg', '.png'], '', 'Custom: ' . $file->original_filename);
 

package/server/src/Rules/ResolvableVehicle.php

@@ -0,0 +1,90 @@
+<?php
+
+namespace Fleetbase\FleetOps\Rules;
+
+use Fleetbase\FleetOps\Models\Vehicle;
+use Illuminate\Contracts\Validation\Rule;
+use Illuminate\Support\Str;
+
+class ResolvableVehicle implements Rule
+{
+    /**
+     * The resolved vehicle instance, if found.
+     */
+    protected ?Vehicle $resolved = null;
+
+    /**
+     * Determine if the validation rule passes.
+     *
+     * Accepts:
+     *  - A public_id string (e.g. "vehicle_abc123")
+     *  - A UUID string (e.g. "550e8400-e29b-41d4-a716-446655440000")
+     *  - An array/object containing an "id", "public_id", or "uuid" key
+     *
+     * @param string $attribute
+     *
+     * @return bool
+     */
+    public function passes($attribute, $value)
+    {
+        $identifier = $this->extractIdentifier($value);
+
+        if (empty($identifier)) {
+            return true; // nullable — let the nullable rule handle empty values
+        }
+
+        if (Str::isUuid($identifier)) {
+            $this->resolved = Vehicle::where('uuid', $identifier)->first();
+        } else {
+            $this->resolved = Vehicle::where('public_id', $identifier)->first();
+        }
+
+        return $this->resolved !== null;
+    }
+
+    /**
+     * Get the validation error message.
+     *
+     * @return string
+     */
+    public function message()
+    {
+        return 'The :attribute must be a valid vehicle public ID, UUID, or vehicle object.';
+    }
+
+    /**
+     * Extract a string identifier from the given value.
+     *
+     * Handles a plain string, an associative array, or a stdClass object.
+     */
+    protected function extractIdentifier($value): ?string
+    {
+        if (is_string($value)) {
+            return $value;
+        }
+
+        if (is_array($value)) {
+            return data_get($value, 'id')
+                ?? data_get($value, 'public_id')
+                ?? data_get($value, 'uuid')
+                ?? null;
+        }
+
+        if (is_object($value)) {
+            return data_get($value, 'id')
+                ?? data_get($value, 'public_id')
+                ?? data_get($value, 'uuid')
+                ?? null;
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the resolved Vehicle model instance after validation passes.
+     */
+    public function getResolved(): ?Vehicle
+    {
+        return $this->resolved;
+    }
+}

package/server/src/Support/Reporting/FleetOpsReportSchema.php

@@ -47,7 +47,7 @@ class FleetOpsReportSchema implements ReportSchema
             ->description('Delivery and service orders')
             ->category('Operations')
             ->extension('fleet-ops')
-            ->excludeColumns(['uuid', 'deleted_at', 'meta']) // Hide foreign keys and system columns
+            ->excludeColumns(['uuid', 'deleted_at']) // Hide foreign keys and system columns
             ->maxRows(50000)
             ->cacheTtl(3600)
             ->columns([
@@ -157,6 +157,12 @@ class FleetOpsReportSchema implements ReportSchema
                     ->description('When the order was last updated')
                     ->filterable()
                     ->sortable(),
+
+                Column::make('meta', 'json')
+                    ->label('Metadata')
+                    ->description('Order metadata and custom fields')
+                    ->searchable()
+                    ->filterable(),
             ])
             ->computedColumns([
                 Column::count('total_orders', 'id')
@@ -178,6 +184,18 @@ class FleetOpsReportSchema implements ReportSchema
                 Column::avg('average_time', 'time')
                     ->label('Average Time')
                     ->description('Average duration per order'),
+
+                Column::sum('total_transaction_amount', 'amount')
+                    ->label('Total Transaction Amount')
+                    ->description('Sum of all transaction amounts'),
+
+                Column::avg('average_transaction_amount', 'amount')
+                    ->label('Average Transaction Amount')
+                    ->description('Average transaction amount per order'),
+
+                Column::count('orders_with_transactions', 'transaction_uuid')
+                    ->label('Orders with Transactions')
+                    ->description('Count of orders that have transactions'),
             ])
             ->relationships([
                 // Auto-join relationships for seamless access
@@ -272,6 +290,116 @@ class FleetOpsReportSchema implements ReportSchema
                         Column::make('phone', 'string')->label('Phone'),
                         Column::make('type', 'string')->label('Type'),
                     ]),
+
+                Relationship::hasAutoJoin('transaction', 'transactions')
+                    ->label('Transaction')
+                    ->localKey('transaction_uuid')
+                    ->foreignKey('uuid')
+                    ->columns([
+                        Column::make('public_id', 'string')
+                            ->label('Transaction ID')
+                            ->description('Public transaction identifier')
+                            ->searchable()
+                            ->filterable()
+                            ->sortable(),
+
+                        Column::make('gateway_transaction_id', 'string')
+                            ->label('Gateway Transaction ID')
+                            ->description('Transaction ID from payment gateway')
+                            ->searchable()
+                            ->filterable()
+                            ->sortable(),
+
+                        Column::make('gateway', 'string')
+                            ->label('Payment Gateway')
+                            ->description('Payment gateway used for transaction')
+                            ->filterable()
+                            ->aggregatable(),
+
+                        Column::make('amount', 'integer')
+                            ->label('Amount')
+                            ->description('Transaction amount (in cents)')
+                            ->aggregatable()
+                            ->sortable()
+                            ->transformer(function ($value) {
+                                // Convert cents to dollars with 2 decimal places
+                                return number_format($value / 100, 2);
+                            }),
+
+                        Column::make('currency', 'string')
+                            ->label('Currency')
+                            ->description('Transaction currency code')
+                            ->filterable()
+                            ->aggregatable(),
+
+                        Column::make('description', 'string')
+                            ->label('Description')
+                            ->description('Transaction description')
+                            ->searchable()
+                            ->filterable(),
+
+                        Column::make('type', 'string')
+                            ->label('Transaction Type')
+                            ->description('Type of transaction')
+                            ->filterable()
+                            ->aggregatable(),
+
+                        Column::make('status', 'string')
+                            ->label('Transaction Status')
+                            ->description('Current transaction status')
+                            ->filterable()
+                            ->aggregatable()
+                            ->transformer(function ($value) {
+                                $labels = [
+                                    'pending'   => 'Pending',
+                                    'completed' => 'Completed',
+                                    'failed'    => 'Failed',
+                                    'refunded'  => 'Refunded',
+                                    'canceled'  => 'Canceled',
+                                ];
+
+                                return $labels[$value] ?? ucfirst($value);
+                            }),
+
+                        Column::make('created_at', 'datetime')
+                            ->label('Transaction Date')
+                            ->description('When the transaction was created')
+                            ->filterable()
+                            ->sortable()
+                            ->aggregatable(),
+                    ])
+                    ->with([
+                        // Nested relationship for transaction items
+                        Relationship::hasAutoJoin('items', 'transaction_items')
+                            ->label('Transaction Items')
+                            ->localKey('uuid')
+                            ->foreignKey('transaction_uuid')
+                            ->columns([
+                                Column::make('amount', 'string')
+                                    ->label('Item Amount')
+                                    ->description('Line item amount')
+                                    ->aggregatable()
+                                    ->sortable(),
+
+                                Column::make('currency', 'string')
+                                    ->label('Item Currency')
+                                    ->description('Line item currency code')
+                                    ->filterable(),
+
+                                Column::make('details', 'string')
+                                    ->label('Item Details')
+                                    ->description('Detailed description of the line item')
+                                    ->searchable()
+                                    ->filterable(),
+
+                                Column::make('code', 'string')
+                                    ->label('Item Code')
+                                    ->description('Item or SKU code')
+                                    ->searchable()
+                                    ->filterable()
+                                    ->sortable(),
+                            ]),
+                    ]),
             ]);
     }
 

package/translations/en-us.yaml

@@ -77,6 +77,7 @@ menu:
   routing: Routing
   custom-fields: Custom Fields
   order-board: Order Board
+  avatars: Avatars
 
 resource:
   asset: Asset
@@ -1680,6 +1681,7 @@ route-list:
   more-waypoints: more waypoints
 
 settings:
+  avatar-management: Avatar Management
   custom-fields: Custom Fields
   notifications:
     fleet-ops-notification-settings: Fleet-Ops Notification Settings

package/DRIVER_SCHEDULING.md

@@ -1,186 +0,0 @@
-# FleetOps Driver Scheduling Module
-
-This module implements driver scheduling with Hours of Service (HOS) compliance for FleetOps.
-
-## Features
-
-- **Fleet-Wide Scheduler**: Manage all drivers' schedules in a single calendar view
-- **Driver Schedule Management**: Create, edit, and manage driver shifts
-- **HOS Compliance**: Real-time validation against FMCSA regulations
-- **Calendar View**: Visual schedule management with drag-and-drop
-- **Resource Timeline**: View multiple drivers' schedules simultaneously
-- **Individual Driver Schedules**: Dedicated schedule view on driver detail pages
-- **Availability Management**: Track driver availability and time-off requests
-- **Conflict Detection**: Automatic detection of scheduling conflicts
-- **Dual View Modes**: Toggle between order scheduling and driver scheduling
-
-## Components
-
-### Operations/Scheduler (Fleet-Wide View)
-
-The main scheduler view at `operations/scheduler` now supports both order scheduling and driver scheduling.
-
-**Location**: `addon/controllers/operations/scheduler/index.js`
-
-**Features**:
-- **View Mode Toggle**: Switch between "Orders" and "Driver Schedules" modes
-- **Resource Timeline**: In driver mode, shows all drivers as resources with their shifts
-- **Drag-and-Drop**: Drag shifts between drivers or reschedule by dragging
-- **Add Shift**: Quick action button to create new driver shifts
-- **Real-Time Updates**: Calendar updates automatically when shifts are modified
-- **Status Colors**: Visual indicators for shift status (pending, confirmed, etc.)
-
-**View Modes**:
-1. **Orders Mode** (default):
-   - Month calendar view
-   - Drag unscheduled orders to calendar
-   - Manage order scheduling
-
-2. **Driver Schedules Mode**:
-   - Resource timeline view (week view with drivers as resources)
-   - View all drivers' shifts simultaneously
-   - Drag shifts between drivers
-   - Reschedule shifts by dragging
-   - Click shifts to view/edit details
-
-**Usage**:
-Navigate to Operations → Scheduler, then toggle between "Orders" and "Driver Schedules" using the header buttons.
-
-### Driver::Schedule
-
-Displays and manages a driver's schedule from their detail page.
-
-**Location**: `addon/components/driver/schedule.js`
-
-**Features**:
-- HOS compliance dashboard with visual indicators
-- Weekly calendar view of driver shifts
-- Upcoming shifts list (next 5 shifts)
-- Availability and time-off management
-- Quick actions for adding shifts and requesting time off
-
-**Usage**:
-```handlebars
-<Driver::Schedule @driver={{@model}} />
-```
-
-**Integration**: Add a "Schedule" tab to the driver detail page.
-
-## Backend Components
-
-### HOSConstraint
-
-Validates schedule items against FMCSA Hours of Service regulations.
-
-**Location**: `server/src/Constraints/HOSConstraint.php`
-
-**Regulations Enforced**:
-1. **11-Hour Driving Limit**: Maximum 11 hours driving after 10 consecutive hours off duty
-2. **14-Hour Duty Window**: Cannot drive beyond 14th hour after coming on duty
-3. **60/70-Hour Weekly Limit**: Cannot drive after 60/70 hours in 7/8 consecutive days
-4. **30-Minute Break**: Required after 8 cumulative hours of driving
-
-**Violation Severity**:
-- `critical`: Immediate compliance issue, shift cannot be scheduled
-- `warning`: Approaching limit, requires attention
-
-**Registration**:
-```php
-// In FleetOps ServiceProvider boot() method
-$constraintService = app(\Fleetbase\Services\Scheduling\ConstraintService::class);
-$constraintService->register('driver', \Fleetbase\FleetOps\Constraints\HOSConstraint::class);
-```
-
-## HOS Compliance Dashboard
-
-The HOS dashboard displays:
-- **Daily Driving Hours**: X/11 hours with circular progress indicator
-- **Weekly Hours**: X/70 hours with circular progress indicator
-- **Compliance Status**: Badge indicating compliance level
-  - Green: Compliant
-  - Yellow: Approaching Limit
-  - Red: At Limit
-
-## API Endpoints
-
-FleetOps extends the core scheduling endpoints with driver-specific functionality:
-
-- `GET /drivers/{id}/hos-status` - Get HOS compliance status for a driver
-- `GET /drivers/{id}/schedule` - Get schedule items for a driver
-- `POST /drivers/{id}/schedule` - Create a new shift for a driver
-- `PUT /schedule-items/{id}` - Update a shift (with HOS validation)
-- `DELETE /schedule-items/{id}` - Delete a shift
-
-## Workflow
-
-### Creating a Driver Shift
-
-1. User clicks "Add Shift" button
-2. Modal opens with shift form
-3. User selects date, time, vehicle, and other details
-4. System validates against HOS constraints
-5. If violations found, display warnings/errors
-6. If valid, create schedule item
-7. Update driver schedule view and HOS dashboard
-
-### HOS Validation
-
-1. When a schedule item is created/updated
-2. `HOSConstraint::validate()` is called
-3. Checks all four HOS regulations
-4. Returns violations array if any
-5. Frontend displays violations to user
-6. User can adjust shift or override (with proper permissions)
-
-## Integration with Core Scheduling
-
-FleetOps uses the core scheduling module with driver-specific customizations:
-
-**Core Components Used**:
-- `Schedule` model (subject_type: 'fleet', subject_uuid: fleet.id)
-- `ScheduleItem` model (assignee_type: 'driver', assignee_uuid: driver.id)
-- `ScheduleAvailability` model (subject_type: 'driver')
-- `ScheduleConstraint` model (subject_type: 'driver')
-
-**FleetOps Extensions**:
-- `HOSConstraint` for compliance validation
-- `Driver::Schedule` component for driver-specific UI
-- HOS status API endpoint
-- Driver-specific scheduling logic
-
-## Future Enhancements
-
-- **Automatic Schedule Generation**: AI-powered schedule optimization
-- **ELD Integration**: Sync with Electronic Logging Devices
-- **Predictive HOS**: Forecast HOS availability for future dates
-- **Mobile App**: Driver-facing mobile app for schedule viewing
-- **Notifications**: Real-time alerts for schedule changes and HOS warnings
-- **Reporting**: HOS compliance reports and analytics
-
-## Testing
-
-### HOS Constraint Tests
-
-Test cases should cover:
-- 11-hour driving limit enforcement
-- 14-hour duty window enforcement
-- 60/70-hour weekly limit enforcement
-- 30-minute break requirement
-- Edge cases (consecutive shifts, split shifts, etc.)
-
-### Integration Tests
-
-- Create driver shift via API
-- Validate HOS constraints are enforced
-- Update shift and verify re-validation
-- Delete shift and verify HOS recalculation
-- Test driver schedule view rendering
-
-## Compliance Notes
-
-This implementation follows FMCSA Hours of Service regulations as of 2025. Regulations may vary by:
-- Jurisdiction (US Federal, state-specific, Canada, etc.)
-- Vehicle type (property-carrying vs. passenger-carrying)
-- Industry (short-haul vs. long-haul)
-
-**Important**: This is a software implementation and should not be the sole method of HOS compliance. Proper driver training, ELD integration, and regular audits are essential for full compliance.