@fleetbase/fleetops-engine 0.6.31 → 0.6.33

package/addon/components/customer/orders.js

@@ -42,7 +42,7 @@ export default class CustomerOrdersComponent extends Component {
 
     get modalsManager() {
         const owner = getOwner(this);
-        const application = typeof this.universe.getApplicationInstance === 'function' ? this.universe.getApplicationInstance() : window.Fleetbase;
+        const application = this.universe.getApplicationInstance();
         const modalsManager = application ? application.lookup('service:modals-manager') : owner.lookup('service:modals-manager');
         return modalsManager;
     }

package/addon/services/leaflet-routing-control.js

@@ -67,7 +67,7 @@ export default class LeafletRoutingControlService extends Service {
 
     #initializeRegistry() {
         const registry = 'registry:routing-controls';
-        const application = typeof this.universe?.getApplicationInstance === 'function' ? this.universe.getApplicationInstance() : window.Fleetbase;
+        const application = this.universe.getApplicationInstance();
         if (!application.hasRegistration(registry)) {
             application.register(registry, new RoutingControlRegistry(), { instantiate: false });
         }

package/addon/services/movement-tracker.js

@@ -122,6 +122,7 @@ export class EventBuffer {
 
 export default class MovementTrackerService extends Service {
     @service socket;
+    @service universe;
     @tracked channels = [];
     @tracked buffers = new Map();
 
@@ -131,7 +132,7 @@ export default class MovementTrackerService extends Service {
     }
 
     #getOwner(owner = null) {
-        return owner ?? window.Fleetbase ?? getOwner(this);
+        return owner ?? this.universe.getApplicationInstance() ?? getOwner(this);
     }
 
     #getBuffer(key, model, opts = {}) {

package/addon/services/route-optimization.js

@@ -57,7 +57,7 @@ export default class RouteOptimizationService extends Service {
 
     #initializeRegistry() {
         const registry = 'registry:route-optimization-engines';
-        const application = typeof this.universe?.getApplicationInstance === 'function' ? this.universe.getApplicationInstance() : window.Fleetbase;
+        const application = this.universe.getApplicationInstance();
         if (!application.hasRegistration(registry)) {
             application.register(registry, new RouteOptimizationRegistry(), { instantiate: false });
         }

package/composer.json

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

package/extension.json

@@ -1,6 +1,6 @@
 {
     "name": "Fleet-Ops",
-    "version": "0.6.31",
+    "version": "0.6.33",
     "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.31",
+    "version": "0.6.33",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "fleetbase": {
         "route": "fleet-ops"
@@ -42,9 +42,9 @@
     },
     "dependencies": {
         "@babel/core": "^7.23.2",
-        "@fleetbase/ember-core": "^0.3.9",
-        "@fleetbase/ember-ui": "^0.3.15",
-        "@fleetbase/fleetops-data": "^0.1.24",
+        "@fleetbase/ember-core": "^0.3.10",
+        "@fleetbase/ember-ui": "^0.3.17",
+        "@fleetbase/fleetops-data": "^0.1.25",
         "@fleetbase/leaflet-routing-machine": "^3.2.17",
         "@fortawesome/ember-fontawesome": "^2.0.0",
         "@fortawesome/fontawesome-svg-core": "6.4.0",

package/server/src/Console/Commands/TestEmail.php

@@ -0,0 +1,98 @@
+<?php
+
+namespace Fleetbase\FleetOps\Console\Commands;
+
+use Fleetbase\FleetOps\Mail\CustomerCredentialsMail;
+use Fleetbase\FleetOps\Models\Contact;
+use Fleetbase\Models\Company;
+use Fleetbase\Models\User;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Mail;
+
+class TestEmail extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'fleetops:test-email {email} {--type=customer_credentials : The type of email to test}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Test FleetOps email templates';
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        $email = $this->argument('email');
+        $type = $this->option('type');
+
+        $this->info('Sending test email...');
+        $this->info("Type: {$type}");
+        $this->info("To: {$email}");
+
+        try {
+            switch ($type) {
+                case 'customer_credentials':
+                    $this->sendCustomerCredentialsEmail($email);
+                    break;
+
+                default:
+                    $this->error("Unknown email type: {$type}");
+                    return Command::FAILURE;
+            }
+
+            $this->info('✓ Test email sent successfully!');
+            return Command::SUCCESS;
+        } catch (\Exception $e) {
+            $this->error('Failed to send test email: ' . $e->getMessage());
+            return Command::FAILURE;
+        }
+    }
+
+    /**
+     * Send a test customer credentials email.
+     *
+     * @param string $email
+     * @return void
+     */
+    private function sendCustomerCredentialsEmail(string $email): void
+    {
+        // Create a mock user
+        $user = new User([
+            'name' => 'Test Customer',
+            'email' => $email,
+        ]);
+
+        // Create a mock company
+        $company = new Company([
+            'name' => 'Test Company',
+            'public_id' => 'test_company_123',
+        ]);
+
+        // Create a mock customer
+        $customer = new Contact([
+            'name' => 'Test Customer',
+            'email' => $email,
+            'phone' => '+1234567890',
+        ]);
+
+        // Set relations
+        $customer->setRelation('company', $company);
+        $customer->setRelation('user', $user);
+
+        // Mock password
+        $plaintextPassword = 'TestPassword123!';
+
+        // Send the email
+        Mail::to($email)->send(new CustomerCredentialsMail($plaintextPassword, $customer));
+    }
+}

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

@@ -62,6 +62,9 @@ class DriverController extends Controller
         // Apply user infos
         $userDetails = User::applyUserInfoFromRequest($request, $userDetails);
 
+        // Set company_uuid before creating user
+        $userDetails['company_uuid'] = $company->uuid;
+
         // create user account for driver
         $user = User::create($userDetails);
 

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

@@ -27,12 +27,10 @@ class VehicleController extends Controller
     {
         // get request input
         $input = $request->only(['status', 'make', 'model', 'year', 'trim', 'type', 'plate_number', 'vin', 'meta', 'online', 'location', 'altitude', 'heading', 'speed']);
+        
         // make sure company is set
         $input['company_uuid'] = session('company');
 
-        // create instance of vehicle model
-        $vehicle = new Vehicle();
-
         // set default online
         if (!isset($input['online'])) {
             $input['online'] = 0;
@@ -51,11 +49,8 @@ class VehicleController extends Controller
             $input['location'] = Utils::getPointFromCoordinates($request->only(['latitude', 'longitude']));
         }
 
-        // apply user input to vehicle
-        $vehicle = $vehicle->fill($input);
-
-        // save the vehicle
-        $vehicle->save();
+        // create the vehicle (fires 'created' event for billing resource tracking)
+        $vehicle = Vehicle::create($input);
 
         // driver assignment
         if ($request->has('driver')) {

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

@@ -136,7 +136,37 @@ class DriverController extends FleetOpsController
 
                     if ($input->has('user_uuid')) {
                         $user = User::where('uuid', $input->get('user_uuid'))->first();
-                        if ($user && $input->has('photo_uuid')) {
+                        
+                        // If user doesn't exist with provided UUID, create new user
+                        if (!$user) {
+                            $userInput = $input
+                                ->only(['name', 'password', 'email', 'phone', 'status', 'avatar_uuid'])
+                                ->filter()
+                                ->toArray();
+
+                            // handle `photo_uuid`
+                            if (isset($input['photo_uuid']) && Str::isUuid($input['photo_uuid'])) {
+                                $userInput['avatar_uuid'] = $input['photo_uuid'];
+                            }
+
+                            // Make sure password is set
+                            if (empty($userInput['password'])) {
+                                $userInput['password'] = Str::random(14);
+                            }
+
+                            // Set user company
+                            $userInput['company_uuid'] = session('company', $company->uuid);
+
+                            // Apply user infos
+                            $userInput = User::applyUserInfoFromRequest($request, $userInput);
+
+                            // Create user account
+                            $user = User::create($userInput);
+
+                            // Set the user type to driver
+                            $user->setType('driver');
+                        } elseif ($input->has('photo_uuid')) {
+                            // Update existing user's avatar if photo provided
                             $user->update(['avatar_uuid' => $input->get('photo_uuid')]);
                         }
                     } else {

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

@@ -139,6 +139,7 @@ class LiveController extends Controller
 
             if ($active) {
                 $query->whereHas('driverAssigned');
+                $query->whereNotIn('status', ['created', 'completed', 'expired', 'order_canceled', 'canceled', 'pending']);
             }
 
             if ($unassigned) {
@@ -166,7 +167,7 @@ class LiveController extends Controller
 
         return LiveCacheService::remember('drivers', $cacheParams, function () use ($bounds) {
             $query = Driver::where(['company_uuid' => session('company')])
-                ->with(['user', 'vehicle', 'currentJob'])
+                ->with(['user', 'vehicle'])
                 ->applyDirectivesForPermissions('fleet-ops list driver');
 
             // Filter out drivers with invalid coordinates

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

@@ -29,14 +29,12 @@ use Fleetbase\FleetOps\Models\Waypoint;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Requests\ExportRequest;
 use Fleetbase\Http\Requests\Internal\BulkActionRequest;
-use Fleetbase\Http\Requests\Internal\BulkDeleteRequest;
 use Fleetbase\Models\File;
 use Fleetbase\Models\Type;
 use Fleetbase\Support\TemplateString;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Database\QueryException;
 use Illuminate\Http\Request;
-use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Validator;
@@ -330,36 +328,6 @@ class OrderController extends FleetOpsController
         );
     }
 
-    /**
-     * Updates a order to canceled and updates order activity.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function bulkDelete(BulkDeleteRequest $request)
-    {
-        $ids = $request->input('ids', []);
-
-        if (!$ids) {
-            return response()->error('Nothing to delete.');
-        }
-
-        /** @var Order */
-        $count   = Order::whereIn('uuid', $ids)->count();
-        $deleted = Order::whereIn('uuid', $ids)->delete();
-
-        if (!$deleted) {
-            return response()->error('Failed to bulk delete orders.');
-        }
-
-        return response()->json(
-            [
-                'status'  => 'OK',
-                'message' => 'Deleted ' . $count . ' orders',
-                'count'   => $count,
-            ]
-        );
-    }
-
     /**
      * Updates a order to canceled and updates order activity.
      *

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

@@ -10,7 +10,6 @@ use Fleetbase\FleetOps\Models\Place;
 use Fleetbase\FleetOps\Support\Geocoding;
 use Fleetbase\Http\Requests\ExportRequest;
 use Fleetbase\Http\Requests\ImportRequest;
-use Fleetbase\Http\Requests\Internal\BulkDeleteRequest;
 use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Illuminate\Http\Request;
 use Illuminate\Support\Str;
@@ -150,38 +149,6 @@ class PlaceController extends FleetOpsController
         return Excel::download(new PlaceExport($selections), $fileName);
     }
 
-    /**
-     * Bulk deletes resources.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function bulkDelete(BulkDeleteRequest $request)
-    {
-        $ids = $request->input('ids', []);
-
-        if (!$ids) {
-            return response()->error('Nothing to delete.');
-        }
-
-        /**
-         * @var \Fleetbase\Models\Place
-         */
-        $count   = Place::whereIn('uuid', $ids)->applyDirectivesForPermissions('fleet-ops list place')->count();
-        $deleted = Place::whereIn('uuid', $ids)->applyDirectivesForPermissions('fleet-ops list place')->delete();
-
-        if (!$deleted) {
-            return response()->error('Failed to bulk delete places.');
-        }
-
-        return response()->json(
-            [
-                'status'  => 'OK',
-                'message' => 'Deleted ' . $count . ' places',
-            ],
-            200
-        );
-    }
-
     /**
      * Get all avatar options for an vehicle.
      *

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

@@ -9,7 +9,6 @@ use Fleetbase\FleetOps\Models\Driver;
 use Fleetbase\FleetOps\Models\Vendor;
 use Fleetbase\Http\Requests\ExportRequest;
 use Fleetbase\Http\Requests\ImportRequest;
-use Fleetbase\Http\Requests\Internal\BulkDeleteRequest;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;
@@ -85,36 +84,6 @@ class VendorController extends FleetOpsController
         return Excel::download(new VendorExport($selections), $fileName);
     }
 
-    /**
-     * Bulk delete resources.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function bulkDelete(BulkDeleteRequest $request)
-    {
-        $ids = $request->input('ids', []);
-
-        if (!$ids) {
-            return response()->error('Nothing to delete.');
-        }
-
-        /** @var \Fleetbase\Models\Vendor */
-        $count   = Vendor::whereIn('uuid', $ids)->count();
-        $deleted = Vendor::whereIn('uuid', $ids)->delete();
-
-        if (!$deleted) {
-            return response()->error('Failed to bulk delete vendors.');
-        }
-
-        return response()->json(
-            [
-                'status'  => 'OK',
-                'message' => 'Deleted ' . $count . ' vendors',
-            ],
-            200
-        );
-    }
-
     /**
      * Get all status options for an vehicle.
      *

package/server/src/Http/Filter/OrderFilter.php

@@ -116,7 +116,7 @@ class OrderFilter extends Filter
             $this->builder->where(
                 function ($q) {
                     $q->whereHas('driverAssigned');
-                    $q->whereNotIn('status', ['created', 'canceled', 'order_canceled', 'completed']);
+                    $q->whereNotIn('status', ['created', 'completed', 'expired', 'order_canceled', 'canceled', 'pending']);
                 }
             );
         }

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

@@ -36,8 +36,8 @@ class CreateServiceRateRequest extends FleetbaseRequest
             'base_fee'                      => ['numeric'],
             'per_meter_unit'                => ['required_if:rate_calculation_method,per_meter', 'string', 'in:km,m'],
             'per_meter_flat_rate_fee'       => ['required_if:rate_calculation_method,per_meter', 'numeric'],
-            'meter_fees'                    => [Rule::requiredIf(function ($input) {
-                return in_array($input->rate_calculation_method, ['fixed_meter', 'fixed_rate']);
+            'meter_fees'                    => [Rule::requiredIf(function () {
+                return in_array($this->input('rate_calculation_method'), ['fixed_meter', 'fixed_rate']);
             }), 'array'],
             'meter_fees.*.distance'         => ['numeric'],
             'meter_fees.*.fee'              => ['numeric'],

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

@@ -3,7 +3,9 @@
 namespace Fleetbase\FleetOps\Http\Requests\Internal;
 
 use Fleetbase\FleetOps\Http\Requests\CreateDriverRequest as CreateDriverApiRequest;
+use Fleetbase\FleetOps\Rules\ResolvablePoint;
 use Fleetbase\Support\Auth;
+use Illuminate\Validation\Rule;
 
 class CreateDriverRequest extends CreateDriverApiRequest
 {
@@ -25,13 +27,75 @@ class CreateDriverRequest extends CreateDriverApiRequest
     public function rules()
     {
         $isCreating = $this->isMethod('POST');
+        $isCreatingWithUser = $this->filled('driver.user_uuid');
+        $shouldValidateUserAttributes = $isCreating && !$isCreatingWithUser;
 
         return [
-            'password' => 'nullable|string',
-            'country'  => 'nullable|size:2',
-            'city'     => 'nullable|string',
-            'status'   => 'nullable|string|in:active,inactive',
-            'job'      => 'nullable|exists:orders,public_id',
+            // Required fields for driver creation
+            'name'                   => [Rule::requiredIf($shouldValidateUserAttributes), 'nullable', 'string', 'max:255'],
+            'email'                  => [
+                Rule::requiredIf($shouldValidateUserAttributes),
+                Rule::when($this->filled('email'), ['email']),
+                Rule::when($shouldValidateUserAttributes, [Rule::unique('users')->whereNull('deleted_at')])
+            ],
+            'phone'                  => [
+                Rule::requiredIf($shouldValidateUserAttributes),
+                Rule::when($shouldValidateUserAttributes, [Rule::unique('users')->whereNull('deleted_at')])
+            ],
+            
+            // Optional fields
+            'password'               => 'nullable|string|min:8',
+            'drivers_license_number' => 'nullable|string|max:255',
+            'internal_id'            => 'nullable|string|max:255',
+            'country'                => 'nullable|string|size:2',
+            'city'                   => 'nullable|string|max:255',
+            'vehicle'                => 'nullable|string|starts_with:vehicle_|exists:vehicles,public_id',
+            'status'                 => 'nullable|string|in:active,inactive',
+            'vendor'                 => 'nullable|exists:vendors,public_id',
+            'job'                    => 'nullable|exists:orders,public_id',
+            'location'               => ['nullable', new ResolvablePoint()],
+            'latitude'               => ['nullable', 'required_with:longitude', 'numeric'],
+            'longitude'              => ['nullable', 'required_with:latitude', 'numeric'],
+            
+            // Photo/avatar
+            'photo_uuid'             => 'nullable|exists:files,uuid',
+            'avatar_uuid'            => 'nullable|exists:files,uuid',
+        ];
+    }
+
+    /**
+     * Get custom attributes for validator errors.
+     *
+     * @return array
+     */
+    public function attributes()
+    {
+        return [
+            'name'                   => 'driver name',
+            'email'                  => 'email address',
+            'phone'                  => 'phone number',
+            'drivers_license_number' => 'driver\'s license number',
+            'internal_id'            => 'internal ID',
+            'photo_uuid'             => 'photo',
+            'avatar_uuid'            => 'avatar',
+        ];
+    }
+
+    /**
+     * Get custom messages for validator errors.
+     *
+     * @return array
+     */
+    public function messages()
+    {
+        return [
+            'name.required'  => 'Driver name is required.',
+            'email.required' => 'Email address is required.',
+            'email.email'    => 'Please provide a valid email address.',
+            'email.unique'   => 'This email address is already registered.',
+            'phone.required' => 'Phone number is required.',
+            'phone.unique'   => 'This phone number is already registered.',
+            'password.min'   => 'Password must be at least 8 characters.',
         ];
     }
 }

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

@@ -84,6 +84,7 @@ class Order extends FleetbaseResource
             'pod_method'           => $this->pod_method,
             'pod_required'         => (bool) data_get($this, 'pod_required', false),
             'dispatched'           => (bool) data_get($this, 'dispatched', false),
+            'started'              => (bool) data_get($this, 'started', false),
             'adhoc'                => (bool) data_get($this, 'adhoc', false),
             'adhoc_distance'       => (int) $this->getAdhocDistance(),
             'distance'             => (int) $this->distance,

package/server/src/Models/Driver.php

@@ -262,12 +262,12 @@ class Driver extends Model
 
     public function currentJob(): BelongsTo|Builder
     {
-        return $this->belongsTo(Order::class)->select(['id', 'uuid', 'public_id', 'payload_uuid', 'driver_assigned_uuid'])->without(['driver']);
+        return $this->belongsTo(Order::class)->without(['driver']);
     }
 
     public function currentOrder(): BelongsTo|Builder
     {
-        return $this->belongsTo(Order::class, 'current_job_uuid')->select(['id', 'uuid', 'public_id', 'payload_uuid', 'driver_assigned_uuid'])->without(['driver']);
+        return $this->belongsTo(Order::class, 'current_job_uuid')->without(['driver']);
     }
 
     public function jobs(): HasMany|Builder

package/server/src/Models/Place.php

@@ -333,6 +333,28 @@ class Place extends Model
     {
         $instance = (new static())->fillWithGoogleAddress($address);
 
+        // Before saving or returning this instance check the database for a duplicate address
+        // it cannot have any owner, and must belong to this session
+        if ($companyUuid = session('company')) {
+            $duplicate = static::where([
+                'company_uuid' => $companyUuid,
+                'street1'      => $instance->street1,
+                'city'         => $instance->city,
+                'country'      => $instance->country,
+            ])
+            ->when(
+                $instance->postal_code !== null,
+                fn ($q) => $q->where('postal_code', $instance->postal_code),
+                fn ($q) => $q->whereNull('postal_code')
+            )
+            ->whereNull('owner_uuid')
+            ->first();
+
+            if ($duplicate) {
+                return $duplicate;
+            }
+        }
+
         if ($saveInstance) {
             $instance->save();
         }

package/server/src/Observers/OrderObserver.php

@@ -18,6 +18,20 @@ class OrderObserver
         $this->invalidateCache($order);
     }
 
+    /**
+     * Handle the Order "updating" event.
+     *
+     * This event is fired before the order is persisted to the database.
+     * It is used to mutate attributes as part of the same update operation
+     * without triggering additional save cycles.
+     *
+     * @param Order $order The order being updated
+     */
+    public function updating(Order $order): void
+    {
+        $this->ensureOrderStarted($order);
+    }
+
     /**
      * Handle the Order "updated" event.
      *
@@ -62,4 +76,40 @@ class OrderObserver
             Cache::forget("order:{$order->uuid}:tracker");
         }
     }
+
+    /**
+     * Detects when an order has just transitioned to the "started" status
+     * and initializes start-related fields.
+     *
+     * This method should be called during the "updating" lifecycle event
+     * to ensure that the changes are persisted as part of the same database
+     * update and do not trigger additional observer events.
+     *
+     * An order is considered "started" when:
+     * - The "status" attribute is being changed in the current update
+     * - The previous status was not "started"
+     * - The new status is "started"
+     *
+     * When these conditions are met, the order's start timestamp and
+     * started flag are set if they have not already been initialized.
+     *
+     * @param Order $order The order being evaluated for a start transition
+     */
+    protected function ensureOrderStarted(Order $order): void
+    {
+        if (
+            $order->isDirty('status')
+            && $order->getOriginal('status') === 'dispatched'
+            && $order->status === 'started'
+        ) {
+            // Only set defaults if not explicitly provided
+            if (is_null($order->started_at)) {
+                $order->started_at = now();
+            }
+
+            if (!$order->started) {
+                $order->started = true;
+            }
+        }
+    }
 }

package/server/src/Providers/FleetOpsServiceProvider.php

@@ -60,6 +60,7 @@ class FleetOpsServiceProvider extends CoreServiceProvider
         \Fleetbase\FleetOps\Console\Commands\PurgeUnpurchasedServiceQuotes::class,
         \Fleetbase\FleetOps\Console\Commands\SendDriverNotification::class,
         \Fleetbase\FleetOps\Console\Commands\ReplayVehicleLocations::class,
+        \Fleetbase\FleetOps\Console\Commands\TestEmail::class,
     ];
 
     /**