@fleetbase/fleetops-engine 0.6.55 → 0.6.56

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/fleetops-engine",
-    "version": "0.6.55",
+    "version": "0.6.56",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "fleetbase": {
         "route": "fleet-ops"
@@ -43,7 +43,7 @@
     "dependencies": {
         "@babel/core": "^7.23.2",
         "@fleetbase/ember-core": "^0.3.23",
-        "@fleetbase/ember-ui": "^0.3.37",
+        "@fleetbase/ember-ui": "^0.3.38",
         "@fleetbase/fleetops-data": "^0.1.40",
         "@fleetbase/leaflet-routing-machine": "^3.2.17",
         "@fortawesome/ember-fontawesome": "^2.0.0",

package/server/migrations/2026_06_23_000001_delete_bad_afaqy_telematics_sensors.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\DB;
+
+return new class extends Migration {
+    /**
+     * Delete malformed AFAQY telematics sensor rows created before sensor identities
+     * were normalized. AFAQY remains the source of truth and the next sync recreates
+     * one clean latest-state row per real provider sensor.
+     */
+    public function up(): void
+    {
+        DB::table('sensors')
+            ->whereIn('telematic_uuid', function ($query) {
+                $query->select('uuid')
+                    ->from('telematics')
+                    ->where('provider', 'afaqy');
+            })
+            ->delete();
+
+        DB::table('sensors')
+            ->whereRaw("LOWER(JSON_UNQUOTE(JSON_EXTRACT(meta, '$.provider'))) = ?", ['afaqy'])
+            ->delete();
+    }
+
+    /**
+     * This cleanup cannot restore deleted rows. Run an AFAQY sync to recreate
+     * current sensor state from the provider.
+     */
+    public function down(): void
+    {
+    }
+};

package/server/src/Exports/ContactExport.php

@@ -25,10 +25,13 @@ class ContactExport implements FromCollection, WithHeadings, WithMapping, WithCo
             $contact->public_id,
             $contact->internal_id,
             $contact->name,
-            $contact->address ? $contact->address->address : null,
+            $contact->title,
+            $contact->type,
+            $contact->address,
             $contact->email,
             $contact->phone,
             $contact->created_at,
+            $contact->updated_at,
         ];
     }
 
@@ -38,18 +41,22 @@ class ContactExport implements FromCollection, WithHeadings, WithMapping, WithCo
             'ID',
             'Internal ID',
             'Name',
+            'Title',
+            'Type',
             'Address',
             'Email',
             'Phone',
             'Date Created',
+            'Date Updated',
         ];
     }
 
     public function columnFormats(): array
     {
         return [
-            'F' => '+#',
-            'G' => NumberFormat::FORMAT_DATE_DDMMYYYY,
+            'H' => '+#',
+            'I' => NumberFormat::FORMAT_DATE_DDMMYYYY,
+            'J' => NumberFormat::FORMAT_DATE_DDMMYYYY,
         ];
     }
 
@@ -59,9 +66,9 @@ class ContactExport implements FromCollection, WithHeadings, WithMapping, WithCo
     public function collection()
     {
         if ($this->selections) {
-            return Contact::where('company_uuid', session('company'))->whereIn('uuid', $this->selections)->get();
+            return Contact::where('company_uuid', session('company'))->whereIn('uuid', $this->selections)->with(['place'])->get();
         }
 
-        return Contact::where('company_uuid', session('company'))->get();
+        return Contact::where('company_uuid', session('company'))->with(['place'])->get();
     }
 }

package/server/src/Exports/DeviceExport.php

@@ -0,0 +1,92 @@
+<?php
+
+namespace Fleetbase\FleetOps\Exports;
+
+use Fleetbase\FleetOps\Models\Device;
+use Maatwebsite\Excel\Concerns\FromCollection;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+use Maatwebsite\Excel\Concerns\WithColumnFormatting;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+
+class DeviceExport implements FromCollection, WithHeadings, WithMapping, WithColumnFormatting, ShouldAutoSize
+{
+    protected array $selections = [];
+
+    public function __construct(array $selections = [])
+    {
+        $this->selections = $selections;
+    }
+
+    public function map($device): array
+    {
+        return [
+            $device->public_id,
+            $device->name,
+            $device->device_id,
+            $device->connection_status,
+            $device->attached_to_name,
+            $device->telematic_name,
+            $device->sensors_count,
+            $device->last_online_at,
+            $device->provider,
+            $device->type,
+            $device->serial_number,
+            $device->imei,
+            $device->status,
+            $device->attachable_uuid ? 'Attached' : 'Unattached',
+            $this->yesNo($device->online),
+            $device->created_at,
+            $device->updated_at,
+        ];
+    }
+
+    public function headings(): array
+    {
+        return [
+            'ID',
+            'Name',
+            'Provider ID / IMEI',
+            'Connection Status',
+            'Attached To',
+            'Telematic Provider',
+            'Sensors Count',
+            'Last Seen',
+            'Provider',
+            'Type',
+            'Serial Number',
+            'IMEI',
+            'Status',
+            'Attachment State',
+            'Online',
+            'Date Created',
+            'Date Updated',
+        ];
+    }
+
+    public function columnFormats(): array
+    {
+        return [
+            'H' => NumberFormat::FORMAT_DATE_DDMMYYYY,
+            'P' => NumberFormat::FORMAT_DATE_DDMMYYYY,
+            'Q' => NumberFormat::FORMAT_DATE_DDMMYYYY,
+        ];
+    }
+
+    public function collection()
+    {
+        $query = Device::where('company_uuid', session('company'))->with(['telematic', 'attachable'])->withCount('sensors');
+
+        if ($this->selections) {
+            $query->whereIn('uuid', $this->selections);
+        }
+
+        return $query->get();
+    }
+
+    protected function yesNo($value): string
+    {
+        return $value ? 'Yes' : 'No';
+    }
+}

package/server/src/Exports/DriverExport.php

@@ -25,12 +25,21 @@ class DriverExport implements FromCollection, WithHeadings, WithMapping, WithCol
             $driver->public_id,
             $driver->internal_id,
             $driver->name,
+            $driver->email,
             $driver->vendor_name,
             $driver->vehicle_name,
             $driver->phone,
             $driver->drivers_license_number,
+            $driver->license_expiry,
             $driver->country,
+            $driver->city,
+            $driver->currency,
+            $this->yesNo($driver->online),
+            $driver->status,
+            $driver->orders()->count(),
+            data_get($driver, 'currentOrder.tracking') ?? data_get($driver, 'currentOrder.public_id'),
             $driver->created_at,
+            $driver->updated_at,
         ];
     }
 
@@ -40,32 +49,48 @@ class DriverExport implements FromCollection, WithHeadings, WithMapping, WithCol
             'ID',
             'Internal ID',
             'Name',
+            'Email',
             'Vendor',
             'Vehicle',
             'Phone',
             'License #',
+            'License Expiry',
             'Country',
+            'City',
+            'Currency',
+            'Online',
+            'Status',
+            'Assigned Orders Count',
+            'Current Order',
             'Date Created',
+            'Date Updated',
         ];
     }
 
     public function columnFormats(): array
     {
         return [
-            'F' => '+#',
+            'G' => '+#',
             'I' => NumberFormat::FORMAT_DATE_DDMMYYYY,
+            'Q' => NumberFormat::FORMAT_DATE_DDMMYYYY,
+            'R' => NumberFormat::FORMAT_DATE_DDMMYYYY,
         ];
     }
 
+    protected function yesNo($value): string
+    {
+        return $value ? 'Yes' : 'No';
+    }
+
     /**
      * @return \Illuminate\Support\Collection
      */
     public function collection()
     {
         if ($this->selections) {
-            return Driver::where('company_uuid', session('company'))->whereIn('uuid', $this->selections)->get();
+            return Driver::where('company_uuid', session('company'))->whereIn('uuid', $this->selections)->with(['vehicle', 'currentOrder'])->get();
         }
 
-        return Driver::where('company_uuid', session('company'))->get();
+        return Driver::where('company_uuid', session('company'))->with(['vehicle', 'currentOrder'])->get();
     }
 }

package/server/src/Exports/EquipmentExport.php

@@ -0,0 +1,94 @@
+<?php
+
+namespace Fleetbase\FleetOps\Exports;
+
+use Fleetbase\FleetOps\Models\Equipment;
+use Maatwebsite\Excel\Concerns\FromCollection;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+use Maatwebsite\Excel\Concerns\WithColumnFormatting;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+
+class EquipmentExport implements FromCollection, WithHeadings, WithMapping, WithColumnFormatting, ShouldAutoSize
+{
+    protected array $selections = [];
+
+    public function __construct(array $selections = [])
+    {
+        $this->selections = $selections;
+    }
+
+    public function map($equipment): array
+    {
+        return [
+            $equipment->public_id,
+            $equipment->name,
+            $equipment->code,
+            $equipment->type,
+            $equipment->status,
+            $equipment->serial_number,
+            $equipment->manufacturer,
+            $equipment->model,
+            $equipment->equipped_to_name,
+            $this->yesNo($equipment->is_equipped),
+            $equipment->warranty_name,
+            $equipment->purchased_at,
+            $equipment->purchase_price,
+            $equipment->currency,
+            $equipment->age_in_days,
+            $equipment->depreciated_value,
+            $equipment->created_at,
+            $equipment->updated_at,
+        ];
+    }
+
+    public function headings(): array
+    {
+        return [
+            'ID',
+            'Name',
+            'Code',
+            'Type',
+            'Status',
+            'Serial Number',
+            'Manufacturer',
+            'Model',
+            'Equipped To',
+            'Is Equipped',
+            'Warranty',
+            'Purchased At',
+            'Purchase Price',
+            'Currency',
+            'Age In Days',
+            'Depreciated Value',
+            'Date Created',
+            'Date Updated',
+        ];
+    }
+
+    public function columnFormats(): array
+    {
+        return [
+            'L' => NumberFormat::FORMAT_DATE_DDMMYYYY,
+            'Q' => NumberFormat::FORMAT_DATE_DDMMYYYY,
+            'R' => NumberFormat::FORMAT_DATE_DDMMYYYY,
+        ];
+    }
+
+    public function collection()
+    {
+        $query = Equipment::where('company_uuid', session('company'))->with(['warranty', 'equipable']);
+
+        if ($this->selections) {
+            $query->whereIn('uuid', $this->selections);
+        }
+
+        return $query->get();
+    }
+
+    protected function yesNo($value): string
+    {
+        return $value ? 'Yes' : 'No';
+    }
+}

package/server/src/Exports/FleetExport.php

@@ -23,12 +23,19 @@ class FleetExport implements FromCollection, WithHeadings, WithMapping, WithColu
     {
         return [
             $fleet->public_id,
-            $fleet->internal_id,
             $fleet->name,
+            data_get($fleet, 'serviceArea.name'),
+            data_get($fleet, 'parentFleet.name'),
+            data_get($fleet, 'vendor.name'),
+            data_get($fleet, 'zone.name'),
             $fleet->drivers_count,
+            $fleet->drivers_online_count,
             $fleet->vehicles_count,
-            $fleet->zone_uuid,
+            $fleet->vehicles_online_count,
+            $fleet->task,
+            $fleet->status,
             $fleet->created_at,
+            $fleet->updated_at,
         ];
     }
 
@@ -36,19 +43,27 @@ class FleetExport implements FromCollection, WithHeadings, WithMapping, WithColu
     {
         return [
             'ID',
-            'Internal ID',
             'Name',
+            'Service Area',
+            'Parent Fleet',
+            'Vendor',
+            'Zone',
             'Drivers Count',
+            'Drivers Online Count',
             'Vehicles Count',
-            'Zone Assigned',
+            'Vehicles Online Count',
+            'Task',
+            'Status',
             'Date Created',
+            'Date Updated',
         ];
     }
 
     public function columnFormats(): array
     {
         return [
-            'G' => NumberFormat::FORMAT_DATE_DDMMYYYY,
+            'L' => NumberFormat::FORMAT_DATE_DDMMYYYY,
+            'M' => NumberFormat::FORMAT_DATE_DDMMYYYY,
         ];
     }
 
@@ -58,9 +73,9 @@ class FleetExport implements FromCollection, WithHeadings, WithMapping, WithColu
     public function collection()
     {
         if ($this->selections) {
-            return Fleet::where('company_uuid', session('company'))->whereIn('uuid', $this->selections)->get();
+            return Fleet::where('company_uuid', session('company'))->whereIn('uuid', $this->selections)->with(['serviceArea', 'parentFleet', 'vendor', 'zone'])->get();
         }
 
-        return Fleet::where('company_uuid', session('company'))->get();
+        return Fleet::where('company_uuid', session('company'))->with(['serviceArea', 'parentFleet', 'vendor', 'zone'])->get();
     }
 }

package/server/src/Exports/FuelReportExport.php

@@ -27,9 +27,16 @@ class FuelReportExport implements FromCollection, WithHeadings, WithMapping, Wit
             $fuelReport->driver_name,
             $fuelReport->vehicle_name,
             $fuelReport->status,
+            $fuelReport->amount,
+            $fuelReport->currency,
             $fuelReport->volume,
+            $fuelReport->metric_unit,
             $fuelReport->odometer,
+            $fuelReport->type,
+            $fuelReport->source,
+            $fuelReport->provider,
             $fuelReport->created_at,
+            $fuelReport->updated_at,
         ];
     }
 
@@ -41,16 +48,24 @@ class FuelReportExport implements FromCollection, WithHeadings, WithMapping, Wit
             'Driver',
             'Vehicle',
             'Status',
+            'Amount',
+            'Currency',
             'Volume',
+            'Metric Unit',
             'Odometer',
+            'Type',
+            'Source',
+            'Provider',
             'Date Created',
+            'Date Updated',
         ];
     }
 
     public function columnFormats(): array
     {
         return [
-            'H' => NumberFormat::FORMAT_DATE_DDMMYYYY,
+            'M' => NumberFormat::FORMAT_DATE_DDMMYYYY,
+            'N' => NumberFormat::FORMAT_DATE_DDMMYYYY,
         ];
     }
 

package/server/src/Exports/IssueExport.php

@@ -23,15 +23,25 @@ class IssueExport implements FromCollection, WithHeadings, WithMapping, WithColu
     {
         return [
             $issue->public_id,
+            $issue->issue_id,
+            $issue->title,
+            $issue->report,
             $issue->priority,
             $issue->type,
             $issue->category,
+            collect($issue->tags ?? [])->join(', '),
             $issue->reporter_name,
+            $issue->reporter_id,
             $issue->assignee_name,
+            $issue->assignee_id,
             $issue->driver_name,
             $issue->vehicle_name,
+            $issue->vehicle_id,
+            data_get($issue, 'order.public_id') ?? data_get($issue, 'order.tracking'),
             $issue->status,
+            $issue->resolved_at,
             $issue->created_at,
+            $issue->updated_at,
         ];
     }
 
@@ -39,22 +49,34 @@ class IssueExport implements FromCollection, WithHeadings, WithMapping, WithColu
     {
         return [
             'ID',
+            'Issue ID',
+            'Title',
+            'Report',
             'Priority',
             'Type',
             'Category',
+            'Tags',
             'Reporter',
+            'Reporter ID',
             'Assignee',
+            'Assignee ID',
             'Driver',
             'Vehicle',
+            'Vehicle ID',
+            'Linked Order',
             'Status',
+            'Resolved At',
             'Date Created',
+            'Date Updated',
         ];
     }
 
     public function columnFormats(): array
     {
         return [
-            'J' => NumberFormat::FORMAT_DATE_DDMMYYYY,
+            'R' => NumberFormat::FORMAT_DATE_DDMMYYYY,
+            'S' => NumberFormat::FORMAT_DATE_DDMMYYYY,
+            'T' => NumberFormat::FORMAT_DATE_DDMMYYYY,
         ];
     }
 
@@ -64,9 +86,9 @@ class IssueExport implements FromCollection, WithHeadings, WithMapping, WithColu
     public function collection()
     {
         if (!empty($this->selections)) {
-            return Issue::where('company_uuid', session('company'))->whereIn('uuid', $this->selections)->get();
+            return Issue::where('company_uuid', session('company'))->whereIn('uuid', $this->selections)->with(['order'])->get();
         }
 
-        return Issue::where('company_uuid', session('company'))->get();
+        return Issue::where('company_uuid', session('company'))->with(['order'])->get();
     }
 }

package/server/src/Exports/MaintenanceExport.php

@@ -0,0 +1,106 @@
+<?php
+
+namespace Fleetbase\FleetOps\Exports;
+
+use Fleetbase\FleetOps\Models\Maintenance;
+use Maatwebsite\Excel\Concerns\FromCollection;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+use Maatwebsite\Excel\Concerns\WithColumnFormatting;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+
+class MaintenanceExport implements FromCollection, WithHeadings, WithMapping, WithColumnFormatting, ShouldAutoSize
+{
+    protected array $selections = [];
+
+    public function __construct(array $selections = [])
+    {
+        $this->selections = $selections;
+    }
+
+    public function map($maintenance): array
+    {
+        return [
+            $maintenance->public_id,
+            $maintenance->summary,
+            $maintenance->maintainable_name,
+            $maintenance->performed_by_name,
+            $maintenance->work_order_subject,
+            $maintenance->type,
+            $maintenance->status,
+            $maintenance->priority,
+            $maintenance->odometer,
+            $maintenance->engine_hours,
+            $maintenance->scheduled_at,
+            $maintenance->started_at,
+            $maintenance->completed_at,
+            $maintenance->labor_cost,
+            $maintenance->parts_cost,
+            $maintenance->tax,
+            $maintenance->total_cost,
+            $maintenance->currency,
+            $maintenance->duration_hours,
+            $this->yesNo($maintenance->is_overdue),
+            $maintenance->days_until_due,
+            $maintenance->created_at,
+            $maintenance->updated_at,
+        ];
+    }
+
+    public function headings(): array
+    {
+        return [
+            'ID',
+            'Summary',
+            'Asset',
+            'Performed By',
+            'Work Order',
+            'Type',
+            'Status',
+            'Priority',
+            'Odometer',
+            'Engine Hours',
+            'Scheduled At',
+            'Started At',
+            'Completed At',
+            'Labor Cost',
+            'Parts Cost',
+            'Tax',
+            'Total Cost',
+            'Currency',
+            'Duration Hours',
+            'Overdue',
+            'Days Until Due',
+            'Date Created',
+            'Date Updated',
+        ];
+    }
+
+    public function columnFormats(): array
+    {
+        return [
+            'K' => NumberFormat::FORMAT_DATE_DDMMYYYY,
+            'L' => NumberFormat::FORMAT_DATE_DDMMYYYY,
+            'M' => NumberFormat::FORMAT_DATE_DDMMYYYY,
+            'V' => NumberFormat::FORMAT_DATE_DDMMYYYY,
+            'W' => NumberFormat::FORMAT_DATE_DDMMYYYY,
+        ];
+    }
+
+    public function collection()
+    {
+        $query = Maintenance::where('company_uuid', session('company'))->with(['maintainable', 'performedBy', 'workOrder']);
+
+        if ($this->selections) {
+            $query->whereIn('uuid', $this->selections);
+        }
+
+        return $query->get();
+    }
+
+    protected function yesNo($value): string
+    {
+        return $value ? 'Yes' : 'No';
+    }
+}