@fleetbase/fleetops-engine 0.6.58 → 0.6.60

package/server/src/Http/Requests/Internal/CreateDriverRequest.php

@@ -12,20 +12,16 @@ class CreateDriverRequest extends CreateDriverApiRequest
 {
     /**
      * Determine if the user is authorized to make this request.
-     *
-     * @return bool
      */
-    public function authorize()
+    public function authorize(): bool
     {
         return Auth::can('fleet-ops create driver');
     }
 
     /**
      * Get the validation rules that apply to the request.
-     *
-     * @return array
      */
-    public function rules()
+    public function rules(): array
     {
         $isCreating                   = $this->isMethod('POST');
         $isCreatingWithUser           = $this->filled('driver.user_uuid');
@@ -67,10 +63,8 @@ class CreateDriverRequest extends CreateDriverApiRequest
 
     /**
      * Get custom attributes for validator errors.
-     *
-     * @return array
      */
-    public function attributes()
+    public function attributes(): array
     {
         return [
             'name'                   => 'driver name',
@@ -85,10 +79,8 @@ class CreateDriverRequest extends CreateDriverApiRequest
 
     /**
      * Get custom messages for validator errors.
-     *
-     * @return array
      */
-    public function messages()
+    public function messages(): array
     {
         return [
             'name.required'  => 'Driver name is required.',

package/server/src/Http/Requests/Internal/CreateOrderConfigRequest.php

@@ -10,20 +10,16 @@ class CreateOrderConfigRequest extends FleetbaseRequest
 {
     /**
      * Determine if the user is authorized to make this request.
-     *
-     * @return bool
      */
-    public function authorize()
+    public function authorize(): bool
     {
         return Auth::can('fleet-ops create order-config');
     }
 
     /**
      * Get the validation rules that apply to the request.
-     *
-     * @return array
      */
-    public function rules()
+    public function rules(): array
     {
         return [
             'name' => [

package/server/src/Http/Requests/Internal/CreateOrderRequest.php

@@ -11,28 +11,27 @@ class CreateOrderRequest extends FleetbaseRequest
 {
     /**
      * Determine if the user is authorized to make this request.
-     *
-     * @return bool
      */
-    public function authorize()
+    public function authorize(): bool
     {
         return Auth::can('fleet-ops create order');
     }
 
     /**
      * Get the validation rules that apply to the request.
-     *
-     * @return array
      */
-    public function rules()
+    public function rules(): array
     {
+        $podMethods = config('fleetops.pod_methods');
+        $podMethods = is_array($podMethods) ? implode(',', $podMethods) : (string) $podMethods;
+
         $validations = [
             'order_config_uuid' => ['required'],
             'adhoc'             => ['nullable', 'boolean'],
             'dispatch'          => ['nullable', 'boolean'],
             'adhoc_distance'    => ['nullable', 'numeric'],
             'pod_required'      => ['nullable', 'boolean'],
-            'pod_method'        => ['nullable', 'in:' . config('fleetops.pod_methods')],
+            'pod_method'        => ['nullable', 'in:' . $podMethods],
             'scheduled_at'      => ['nullable', 'date'],
             'driver'            => ['nullable', 'exists:drivers,uuid'],
             'service_quote'     => ['nullable', 'exists:service_quotes,uuid'],
@@ -45,7 +44,7 @@ class CreateOrderRequest extends FleetbaseRequest
 
         // Conditionally require 'pod_method' if 'pod_required' is truthy
         if (Utils::isTrue($this->input('order.pod_required'))) {
-            $validations['pod_method'] = ['required', 'in:' . config('fleetops.pod_methods')];
+            $validations['pod_method'] = ['required', 'in:' . $podMethods];
         }
 
         if ($this->has('payload')) {

package/server/src/Http/Requests/Internal/FleetActionRequest.php

@@ -9,38 +9,34 @@ class FleetActionRequest extends FleetbaseRequest
 {
     /**
      * Determine if the user is authorized to make this request.
-     *
-     * @return bool
      */
-    public function authorize()
+    public function authorize(): bool
     {
-        $action = $this->route()->getActionMethod();
+        $action = $this->actionMethod();
 
         if ($action === 'assignVehicle') {
-            return Auth::can('fleet-ops assign-vehicle-for fleet');
+            return $this->can('fleet-ops assign-vehicle-for fleet');
         }
 
         if ($action === 'assignDriver') {
-            return Auth::can('fleet-ops assign-driver-for fleet');
+            return $this->can('fleet-ops assign-driver-for fleet');
         }
 
         if ($action === 'removeVehicle') {
-            return Auth::can('fleet-ops remove-vehicle-for fleet');
+            return $this->can('fleet-ops remove-vehicle-for fleet');
         }
 
         if ($action === 'removeDriver') {
-            return Auth::can('fleet-ops remove-driver-for fleet');
+            return $this->can('fleet-ops remove-driver-for fleet');
         }
 
-        return Auth::can('fleet-ops update fleet');
+        return $this->can('fleet-ops update fleet');
     }
 
     /**
      * Get the validation rules that apply to the request.
-     *
-     * @return array
      */
-    public function rules()
+    public function rules(): array
     {
         return [
             'fleet'   => 'string|exists:fleets,uuid',
@@ -48,4 +44,14 @@ class FleetActionRequest extends FleetbaseRequest
             'vehicle' => 'nullable|string|exists:vehicles,uuid',
         ];
     }
+
+    protected function actionMethod(): string
+    {
+        return $this->route()->getActionMethod();
+    }
+
+    protected function can(string $permission): bool
+    {
+        return Auth::can($permission);
+    }
 }

package/server/src/Http/Requests/Internal/UpdateDriverRequest.php

@@ -8,10 +8,13 @@ class UpdateDriverRequest extends CreateDriverRequest
 {
     /**
      * Determine if the user is authorized to make this request.
-     *
-     * @return bool
      */
-    public function authorize()
+    public function authorize(): bool
+    {
+        return $this->canUpdateDriver();
+    }
+
+    protected function canUpdateDriver(): bool
     {
         return Auth::can('fleet-ops update driver');
     }

package/server/src/Http/Requests/QueryServiceQuotesRequest.php

@@ -10,20 +10,16 @@ class QueryServiceQuotesRequest extends FleetbaseRequest
 {
     /**
      * Determine if the user is authorized to make this request.
-     *
-     * @return bool
      */
-    public function authorize()
+    public function authorize(): bool
     {
         return request()->session()->has('api_credential');
     }
 
     /**
      * Get the validation rules that apply to the request.
-     *
-     * @return array
      */
-    public function rules()
+    public function rules(): array
     {
         return [
             'payload'      => ['nullable', 'required_without_all:waypoints,pickup,dropoff', Rule::exists('payloads', 'public_id')->whereNull('deleted_at')],

package/server/src/Http/Requests/ScheduleOrderRequest.php

@@ -8,20 +8,16 @@ class ScheduleOrderRequest extends FleetbaseRequest
 {
     /**
      * Determine if the user is authorized to make this request.
-     *
-     * @return bool
      */
-    public function authorize()
+    public function authorize(): bool
     {
         return request()->session()->has('api_credential');
     }
 
     /**
      * Get the validation rules that apply to the request.
-     *
-     * @return array
      */
-    public function rules()
+    public function rules(): array
     {
         return [
             'date'     => 'required|date_format:Y-m-d',

package/server/src/Http/Requests/UpdateIssueRequest.php

@@ -6,10 +6,8 @@ class UpdateIssueRequest extends CreateIssueRequest
 {
     /**
      * Get the validation rules that apply to the request.
-     *
-     * @return array
      */
-    public function rules()
+    public function rules(): array
     {
         return [
             'report'       => ['required'],

package/server/src/Http/Resources/v1/Customer.php

@@ -46,7 +46,7 @@ class Customer extends FleetbaseResource
         ];
     }
 
-    private function getOrdersCount(Request $request): int
+    protected function getOrdersCount(Request $request): int
     {
         return Order::where('customer_uuid', $this->uuid)
             ->whereNull('deleted_at')
@@ -61,7 +61,7 @@ class Customer extends FleetbaseResource
      * Currency falls back through company.currency → ledger base_currency
      * → "USD" via {@see Utils::getCompanyTransactionCurrency}.
      */
-    private function buildCompanyPayload(): ?array
+    protected function buildCompanyPayload(): ?array
     {
         $company = Company::find($this->company_uuid);
         if (!$company) {

package/server/src/Http/Resources/v1/Maintenance.php

@@ -128,11 +128,10 @@ class Maintenance extends FleetbaseResource
             return null;
         }
 
+        // Find::httpResourceForModel() always resolves a class, falling back to
+        // FleetbaseResource, so there is no un-resolvable case to handle here
         $resourceClass = \Fleetbase\Support\Find::httpResourceForModel($model);
-        if ($resourceClass) {
-            return (new $resourceClass($model))->resolve();
-        }
 
-        return (new \Illuminate\Http\Resources\Json\JsonResource($model))->resolve();
+        return (new $resourceClass($model))->resolve();
     }
 }

package/server/src/Http/Resources/v1/MaintenanceSchedule.php

@@ -127,11 +127,10 @@ class MaintenanceSchedule extends FleetbaseResource
             return null;
         }
 
+        // Find::httpResourceForModel() always resolves a class, falling back to
+        // FleetbaseResource, so there is no un-resolvable case to handle here
         $resourceClass = \Fleetbase\Support\Find::httpResourceForModel($model);
-        if ($resourceClass) {
-            return (new $resourceClass($model))->resolve();
-        }
 
-        return (new \Illuminate\Http\Resources\Json\JsonResource($model))->resolve();
+        return (new $resourceClass($model))->resolve();
     }
 }

package/server/src/Http/Resources/v1/Order.php

@@ -161,15 +161,11 @@ class Order extends FleetbaseResource
             return null;
         }
 
-        // Use Find to get the appropriate resource class for this model
+        // Find::httpResourceForModel() always resolves a class, falling back to
+        // FleetbaseResource, so there is no un-resolvable case to handle here
         $resourceClass = \Fleetbase\Support\Find::httpResourceForModel($model);
 
-        if ($resourceClass) {
-            return (new $resourceClass($model))->resolve();
-        }
-
-        // Fallback to generic resource
-        return (new \Illuminate\Http\Resources\Json\JsonResource($model))->resolve();
+        return (new $resourceClass($model))->resolve();
     }
 
     /**

package/server/src/Http/Resources/v1/PurchaseRate.php

@@ -67,12 +67,10 @@ class PurchaseRate extends FleetbaseResource
             return $this->resource->serviceQuote ? new ServiceQuote($this->resource->serviceQuote) : null;
         }
 
-        if (method_exists($this, 'loadMissing')) {
-            $this->loadMissing('serviceQuote');
-
-            return $this->serviceQuote ? new ServiceQuote($this->serviceQuote) : null;
-        }
-
+        // A `loadMissing` fallback used to live here, guarded by
+        // method_exists($this, 'loadMissing'). No class in this resource's
+        // hierarchy declares that method — it only resolves through __call,
+        // which method_exists cannot see — so the branch never ran.
         return null;
     }
 }

package/server/src/Http/Resources/v1/TrackingNumber.php

@@ -30,6 +30,17 @@ class TrackingNumber extends FleetbaseResource
             'status'          => $this->last_status,
             'status_code'     => $this->last_status_code,
             'qr_code'         => $this->qr_code,
+            // The raw text encoded inside qr_code, exposed ONLY in debug mode.
+            //
+            // qr_code is a base64 PNG generated from owner_uuid (TrackingNumber::newBarcode),
+            // and the endpoints that consume a scanned code match on that uuid. A client
+            // scans the image to obtain it; an automated contract run cannot, so debug
+            // builds publish the value beside the image rather than the API growing a
+            // decode endpoint or handing out uuids generally.
+            //
+            // `when()` omits the key entirely when false — it is absent, not null — so a
+            // production response is byte-identical to before.
+            'qr_code_content' => $this->when(static::exposesQrCodeContent(), fn () => $this->owner_uuid),
             'barcode'         => $this->barcode,
             'url'             => Utils::consoleUrl('track-order', ['order' => $this->tracking_number]),
             'type'            => Utils::getTypeFromClassName($this->owner_type),
@@ -38,6 +49,28 @@ class TrackingNumber extends FleetbaseResource
         ];
     }
 
+    /**
+     * Whether the QR code's decoded content may be published.
+     *
+     * Debug mode only, and fails closed: any failure to determine the debug state — no
+     * container, an application without the accessor — answers false rather than
+     * defaulting to exposure.
+     */
+    protected static function exposesQrCodeContent(): bool
+    {
+        try {
+            $app = app();
+
+            if (!is_object($app) || !method_exists($app, 'hasDebugModeEnabled')) {
+                return false;
+            }
+
+            return (bool) $app->hasDebugModeEnabled();
+        } catch (\Throwable $e) {
+            return false;
+        }
+    }
+
     /**
      * Transform the resource into an webhook payload.
      *

package/server/src/Http/Resources/v1/TrackingStatus.php

@@ -74,12 +74,10 @@ class TrackingStatus extends FleetbaseResource
             return $this->resource->trackingNumber ? new TrackingNumber($this->resource->trackingNumber) : null;
         }
 
-        if (method_exists($this, 'loadMissing')) {
-            $this->loadMissing('trackingNumber');
-
-            return $this->trackingNumber ? new TrackingNumber($this->trackingNumber) : null;
-        }
-
+        // A `loadMissing` fallback used to live here, guarded by
+        // method_exists($this, 'loadMissing'). No class in this resource's
+        // hierarchy declares that method — it only resolves through __call,
+        // which method_exists cannot see — so the branch never ran.
         return null;
     }
 }

package/server/src/Http/Resources/v1/WorkOrder.php

@@ -127,11 +127,10 @@ class WorkOrder extends FleetbaseResource
             return null;
         }
 
+        // Find::httpResourceForModel() always resolves a class, falling back to
+        // FleetbaseResource, so there is no un-resolvable case to handle here
         $resourceClass = \Fleetbase\Support\Find::httpResourceForModel($model);
-        if ($resourceClass) {
-            return (new $resourceClass($model))->resolve();
-        }
 
-        return (new \Illuminate\Http\Resources\Json\JsonResource($model))->resolve();
+        return (new $resourceClass($model))->resolve();
     }
 }

package/server/src/Imports/ContactImport.php

@@ -24,8 +24,17 @@ class ContactImport implements ToCollection, WithHeadingRow
                 $row = array_filter($row->toArray());
             }
 
-            Contact::createFromImport($row, true);
+            if (empty($row)) {
+                continue;
+            }
+
+            $this->createFromImport($row);
             $this->imported++;
         }
     }
+
+    protected function createFromImport(array $row): void
+    {
+        Contact::createFromImport($row, true);
+    }
 }

package/server/src/Imports/DriverImport.php

@@ -24,8 +24,17 @@ class DriverImport implements ToCollection, WithHeadingRow
                 $row = array_filter($row->toArray());
             }
 
-            Driver::createFromImport($row, true);
+            if (empty($row)) {
+                continue;
+            }
+
+            $this->createFromImport($row);
             $this->imported++;
         }
     }
+
+    protected function createFromImport(array $row): void
+    {
+        Driver::createFromImport($row, true);
+    }
 }

package/server/src/Imports/EquipmentImport.php

@@ -25,8 +25,13 @@ class EquipmentImport implements ToCollection, WithHeadingRow
                 continue;
             }
 
-            Equipment::createFromImport($row, true);
+            $this->createFromImport($row);
             $this->imported++;
         }
     }
+
+    protected function createFromImport(array $row): void
+    {
+        Equipment::createFromImport($row, true);
+    }
 }

package/server/src/Imports/FleetImport.php

@@ -24,8 +24,17 @@ class FleetImport implements ToCollection, WithHeadingRow
                 $row = array_filter($row->toArray());
             }
 
-            Fleet::createFromImport($row, true);
+            if (empty($row)) {
+                continue;
+            }
+
+            $this->createFromImport($row);
             $this->imported++;
         }
     }
+
+    protected function createFromImport(array $row): void
+    {
+        Fleet::createFromImport($row, true);
+    }
 }

package/server/src/Imports/FuelReportImport.php

@@ -24,8 +24,17 @@ class FuelReportImport implements ToCollection, WithHeadingRow
                 $row = array_filter($row->toArray());
             }
 
-            FuelReport::createFromImport($row, true);
+            if (empty($row)) {
+                continue;
+            }
+
+            $this->createFromImport($row);
             $this->imported++;
         }
     }
+
+    protected function createFromImport(array $row): void
+    {
+        FuelReport::createFromImport($row, true);
+    }
 }

package/server/src/Imports/IssueImport.php

@@ -24,8 +24,17 @@ class IssueImport implements ToCollection, WithHeadingRow
                 $row = array_filter($row->toArray());
             }
 
-            Issue::createFromImport($row, true);
+            if (empty($row)) {
+                continue;
+            }
+
+            $this->createFromImport($row);
             $this->imported++;
         }
     }
+
+    protected function createFromImport(array $row): void
+    {
+        Issue::createFromImport($row, true);
+    }
 }

package/server/src/Imports/MaintenanceImport.php

@@ -25,8 +25,13 @@ class MaintenanceImport implements ToCollection, WithHeadingRow
                 continue;
             }
 
-            Maintenance::createFromImport($row, true);
+            $this->createFromImport($row);
             $this->imported++;
         }
     }
+
+    protected function createFromImport(array $row): void
+    {
+        Maintenance::createFromImport($row, true);
+    }
 }

package/server/src/Imports/MaintenanceScheduleImport.php

@@ -25,8 +25,13 @@ class MaintenanceScheduleImport implements ToCollection, WithHeadingRow
                 continue;
             }
 
-            MaintenanceSchedule::createFromImport($row, true);
+            $this->createFromImport($row);
             $this->imported++;
         }
     }
+
+    protected function createFromImport(array $row): void
+    {
+        MaintenanceSchedule::createFromImport($row, true);
+    }
 }

package/server/src/Imports/PartImport.php

@@ -25,8 +25,13 @@ class PartImport implements ToCollection, WithHeadingRow
                 continue;
             }
 
-            Part::createFromImport($row, true);
+            $this->createFromImport($row);
             $this->imported++;
         }
     }
+
+    protected function createFromImport(array $row): void
+    {
+        Part::createFromImport($row, true);
+    }
 }

package/server/src/Imports/PlaceImport.php

@@ -24,8 +24,17 @@ class PlaceImport implements ToCollection, WithHeadingRow
                 $row = array_filter($row->toArray());
             }
 
-            Place::createFromImport($row, true);
+            if (empty($row)) {
+                continue;
+            }
+
+            $this->createFromImport($row);
             $this->imported++;
         }
     }
+
+    protected function createFromImport(array $row): void
+    {
+        Place::createFromImport($row, true);
+    }
 }

package/server/src/Imports/VehicleImport.php

@@ -24,8 +24,17 @@ class VehicleImport implements ToCollection, WithHeadingRow
                 $row = array_filter($row->toArray());
             }
 
-            Vehicle::createFromImport($row, true);
+            if (empty($row)) {
+                continue;
+            }
+
+            $this->createFromImport($row);
             $this->imported++;
         }
     }
+
+    protected function createFromImport(array $row): void
+    {
+        Vehicle::createFromImport($row, true);
+    }
 }

package/server/src/Imports/VendorImport.php

@@ -24,8 +24,17 @@ class VendorImport implements ToCollection, WithHeadingRow
                 $row = array_filter($row->toArray());
             }
 
-            Vendor::createFromImport($row, true);
+            if (empty($row)) {
+                continue;
+            }
+
+            $this->createFromImport($row);
             $this->imported++;
         }
     }
+
+    protected function createFromImport(array $row): void
+    {
+        Vendor::createFromImport($row, true);
+    }
 }

package/server/src/Imports/WorkOrderImport.php

@@ -25,8 +25,13 @@ class WorkOrderImport implements ToCollection, WithHeadingRow
                 continue;
             }
 
-            WorkOrder::createFromImport($row, true);
+            $this->createFromImport($row);
             $this->imported++;
         }
     }
+
+    protected function createFromImport(array $row): void
+    {
+        WorkOrder::createFromImport($row, true);
+    }
 }