@fleetbase/fleetops-engine 0.6.50 → 0.6.51

package/server/migrations/2026_06_03_000001_add_order_uuid_to_issues_table.php

@@ -0,0 +1,25 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    public function up(): void
+    {
+        Schema::table('issues', function (Blueprint $table) {
+            if (!Schema::hasColumn('issues', 'order_uuid')) {
+                $table->uuid('order_uuid')->nullable()->index()->after('vehicle_uuid');
+            }
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('issues', function (Blueprint $table) {
+            if (Schema::hasColumn('issues', 'order_uuid')) {
+                $table->dropColumn('order_uuid');
+            }
+        });
+    }
+};

package/server/migrations/2026_06_04_000001_backfill_order_transaction_subjects.php

@@ -0,0 +1,39 @@
+<?php
+
+use Fleetbase\FleetOps\Models\Order;
+use Fleetbase\FleetOps\Models\PurchaseRate;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\DB;
+
+return new class extends Migration {
+    public function up(): void
+    {
+        DB::table('orders')
+            ->whereNotNull('transaction_uuid')
+            ->orderBy('id')
+            ->select(['id', 'uuid', 'transaction_uuid', 'purchase_rate_uuid'])
+            ->chunkById(500, function ($orders) {
+                foreach ($orders as $order) {
+                    $updates = [
+                        'subject_uuid' => $order->uuid,
+                        'subject_type' => Order::class,
+                        'updated_at'   => now(),
+                    ];
+
+                    if ($order->purchase_rate_uuid) {
+                        $updates['context_uuid'] = $order->purchase_rate_uuid;
+                        $updates['context_type'] = PurchaseRate::class;
+                    }
+
+                    DB::table('transactions')
+                        ->where('uuid', $order->transaction_uuid)
+                        ->update($updates);
+                }
+            });
+    }
+
+    public function down(): void
+    {
+        // Intentionally no-op: this migration corrects broken order transaction linkage.
+    }
+};

package/server/migrations/2026_06_04_000002_backfill_order_transaction_directions.php

@@ -0,0 +1,24 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\DB;
+
+return new class extends Migration {
+    /**
+     * Backfill null directions for transactions linked to FleetOps orders.
+     */
+    public function up(): void
+    {
+        DB::table('transactions')
+            ->join('orders', 'orders.transaction_uuid', '=', 'transactions.uuid')
+            ->whereNull('transactions.direction')
+            ->update(['transactions.direction' => 'credit']);
+    }
+
+    /**
+     * Direction backfills are not reversible without losing real data.
+     */
+    public function down(): void
+    {
+    }
+};

package/server/resources/views/mail/customer-credentials.blade.php

@@ -1,23 +1,26 @@
 <x-mail-layout>
 <h2 style="font-size: 18px; font-weight: 600;">
-@if($currentHour < 12)
-    Good Morning, {{ $customer->name }}!
-@elseif($currentHour < 18)
-    Good Afternoon, {{ $customer->name }}!
-@else
-    Good Evening, {{ $customer->name }}!
-@endif
+Your customer portal access is ready
 </h2>
 
-Your login credentials:
+Hi {{ $customer->name }},
 <br />
 <br />
-Your Email: {{ $customer->user->email }}
+{{ $customer->company->name }} has created customer portal access for you. You can use the portal to view orders, invoices, support requests, and account details when available.
 <br />
-Your Password: {{ $plaintextPassword }}
-@if($customerPortalUrl)
 <br />
-Customer Portal URL: {{ $customerPortalUrl}}
-@endif
+<a href="{{ $customerPortalUrl }}" style="display:inline-block; background:#2563eb; color:#ffffff; text-decoration:none; border-radius:6px; padding:12px 18px; font-size:14px; line-height:20px; font-weight:700;">Sign in to customer portal</a>
+<br />
+<br />
+<strong>Your sign-in details</strong>
+<br />
+Email: {{ $customer->user->email }}
+<br />
+Temporary password: {{ $plaintextPassword }}
+<br />
+Portal URL: {{ $customerPortalUrl }}
+<br />
+<br />
+You can change your password after signing in.
 
 </x-mail-layout>

package/server/src/Expansions/UserFilterExpansion.php

@@ -47,6 +47,21 @@ class UserFilterExpansion implements Expansion
         };
     }
 
+    /**
+     * Filter where a user is not a customer.
+     *
+     * @return void
+     */
+    public static function isNotCustomer()
+    {
+        return function () {
+            /** @var \Fleetbase\Http\Filter\UserFilter|\Fleetbase\Http\Filter\Filter $this */
+            $this->builder->where(function ($query) {
+                $query->whereNull('type')->orWhere('type', '!=', 'customer');
+            });
+        };
+    }
+
     /**
      * Filter where doesnt have driver within the CURRENT organizations.
      *
@@ -62,6 +77,19 @@ class UserFilterExpansion implements Expansion
         };
     }
 
+    /**
+     * Filter where users can be driver.
+     *
+     * @return void
+     */
+    public static function canBeDriver()
+    {
+        return function () {
+            /** @var \Fleetbase\Http\Filter\UserFilter|\Fleetbase\Http\Filter\Filter $this */
+            $this->builder->whereIn('type', ['user', 'admin']);
+        };
+    }
+
     /**
      * @return void
      */

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

@@ -30,6 +30,7 @@ class IssueController extends Controller
             'type',
             'report',
             'priority',
+            'tags',
             'status',
         ]);
 
@@ -85,6 +86,7 @@ class IssueController extends Controller
             'type',
             'report',
             'priority',
+            'tags',
             'status',
         ]);
 

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

@@ -1013,11 +1013,10 @@ class OrderController extends Controller
         $driver->current_job_uuid = $order->uuid;
         $driver->save();
 
-        /** @var \Fleetbase\LaravelMysqlSpatial\Types\Point */
-        $location = $order->getLastLocation();
-
-        // set first destination for payload
-        $payload->setFirstWaypoint($activity, $location);
+        // set first service stop destination for multi-stop routes
+        if ($this->payloadUsesServiceStopActivity($payload)) {
+            $this->ensurePayloadCurrentServiceStop($payload);
+        }
         $order->setRelation('payload', $payload);
 
         // update order activity
@@ -1108,37 +1107,35 @@ class OrderController extends Controller
         /** @var \Fleetbase\LaravelMysqlSpatial\Types\Point */
         $location = $order->getLastLocation();
 
-        // Check if multiple waypoint order to update activity for.
-        $isMultipleWaypointOrder = $this->payloadHasWaypoints($order->payload);
+        $usesServiceStopActivity = $this->payloadUsesServiceStopActivity($order->payload);
+        $isLifecycleActivity     = Utils::isActivity($activity) && in_array($activity->code, ['created', 'dispatched', 'started'], true);
 
-        // also update for each order entities if not multiple drop order
-        // all entities will share the same activity status as is one drop order
-        if (!$isMultipleWaypointOrder) {
+        // Classic pickup/dropoff orders and static lifecycle statuses update the order.
+        if (!$usesServiceStopActivity || $isLifecycleActivity) {
             // Update order activity
             $order->updateActivity($activity, $proof);
 
-            // Only update entities belonging to the waypoint
-            foreach ($order->payload->entities as $entity) {
-                $entity->insertActivity($activity, $location, $proof);
+            if (!$usesServiceStopActivity) {
+                foreach ($order->payload->entities as $entity) {
+                    $entity->insertActivity($activity, $location, $proof);
+                }
+            }
+
+            if ($usesServiceStopActivity && $activity->is('started')) {
+                $this->ensurePayloadCurrentServiceStop($order->payload);
             }
+
             // Handle order completion
             if (Utils::isActivity($activity) && $activity->completesOrder()) {
                 $order->driverAssigned?->unassignCurrentJob();
                 $order->complete($this->resolveProof($proof));
             }
 
-            return new OrderResource($order);
+            return new OrderResource($order->refresh());
         }
 
-        if ($activity->is('started')) {
-            $order->updateActivity($activity, $proof);
-
-            $this->ensurePayloadCurrentServiceStop($order->payload);
-            if (!$this->payloadHasCurrentServiceStopActivity($order->payload, $activity)) {
-                $this->updateCurrentServiceStopActivity($order, $activity, $location, $proof);
-            }
-
-            return new OrderResource($order->refresh());
+        if (!$order->started && in_array($order->status, ['created', 'dispatched'], true)) {
+            return response()->apiError('Order must be started before waypoint activity can be updated.', 422);
         }
 
         $currentStop               = $this->ensurePayloadCurrentServiceStop($order->payload);
@@ -1192,9 +1189,13 @@ class OrderController extends Controller
             );
         }
 
+        $canUpdateServiceStopActivity = $this->payloadUsesServiceStopActivity($order->payload)
+            && ($order->started || $order->started_at || !in_array($order->status, ['created', 'dispatched'], true));
         $stop = null;
-        if ($waypointId) {
-            $stop = $this->resolveServiceStopFromKey($order->payload, $waypointId);
+        if ($canUpdateServiceStopActivity) {
+            $stop = $waypointId
+                ? $this->resolveServiceStopFromKey($order->payload, $waypointId)
+                : $this->payloadCurrentServiceStop($order->payload);
         }
 
         $orderConfig = $order->ensureOrderConfig();

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

@@ -7,15 +7,11 @@ use Fleetbase\FleetOps\Http\Requests\UpdatePlaceRequest;
 use Fleetbase\FleetOps\Http\Resources\v1\DeletedResource;
 use Fleetbase\FleetOps\Http\Resources\v1\Place as PlaceResource;
 use Fleetbase\FleetOps\Models\Place;
+use Fleetbase\FleetOps\Support\PlaceSearch;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Controllers\Controller;
 use Fleetbase\LaravelMysqlSpatial\Types\Point;
-use Geocoder\Laravel\Facades\Geocoder;
-use Geocoder\Provider\GoogleMapsPlaces\GoogleMapsPlaces;
-use Geocoder\Query\GeocodeQuery;
-use Http\Adapter\Guzzle7\Client;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;
 
 class PlaceController extends Controller
@@ -283,63 +279,19 @@ class PlaceController extends Controller
     {
         $searchQuery = strtolower($request->input('query'));
         $limit       = $request->input('limit', 10);
-        $geo         = $request->input('geo', false);
+        $geo         = $request->boolean('geo');
         $latitude    = $request->input('latitude', false);
         $longitude   = $request->input('longitude', false);
 
-        $results = DB::table('places')
-            ->where('company_uuid', session('company'))
-            ->whereNull('deleted_at')
-            ->where(function ($q) use ($searchQuery) {
-                if (Utils::notEmpty($searchQuery)) {
-                    $q->orWhere(DB::raw('lower(name)'), 'like', '%' . $searchQuery . '%');
-                    $q->orWhere(DB::raw('lower(street1)'), 'like', '%' . $searchQuery . '%');
-                    $q->orWhere(DB::raw('lower(postal_code)'), 'like', '%' . $searchQuery . '%');
-                }
-            })
-            ->limit($limit)
-            ->orderBy('name', 'desc')
-            ->get()
-            ->map(function ($place) {
-                $place             = (array) $place;
-                $place['location'] = Utils::mysqlPointAsGeometry($place['location']);
-                $place             = new Place($place);
-                $place->address    = $place->toAddressString();
-
-                return $place;
-            })
-            ->values();
-
-        if ($geo && Utils::notEmpty($searchQuery)) {
-            $httpClient = new Client();
-            $provider   = new \Geocoder\Provider\GoogleMaps\GoogleMaps($httpClient, null, env('GOOGLE_MAPS_API_KEY'));
-            $geocoder   = new \Geocoder\StatefulGeocoder($provider, 'en');
-
-            if ($latitude && $longitude) {
-                $geoResults = $geocoder->geocodeQuery(
-                    GeocodeQuery::create($searchQuery)
-                        ->withData('mode', GoogleMapsPlaces::GEOCODE_MODE_SEARCH)
-                        ->withData('location', "$latitude, $longitude")
-                );
-
-                $geoResults = collect($geoResults->all());
-            } else {
-                $geoResults = Geocoder::geocode($searchQuery)->get();
-            }
+        $query = Place::where('company_uuid', session('company'))->whereNull('deleted_at');
 
-            $geoResults = $geoResults
-                ->map(function ($googleAddress) {
-                    return Place::createFromGoogleAddress($googleAddress);
-                })
-                ->values();
-
-            $results = $results->merge($geoResults);
-        }
-
-        $results = $results
-            ->sortBy('name')
-            ->values()
-            ->toArray();
+        $results = PlaceSearch::search($query, $searchQuery, [
+            'limit'          => $limit,
+            'geo'            => $geo,
+            'latitude'       => $latitude,
+            'longitude'      => $longitude,
+            'no_query_order' => 'name_desc',
+        ]);
 
         return PlaceResource::collection($results);
     }

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

@@ -4,12 +4,23 @@ namespace Fleetbase\FleetOps\Http\Controllers\Internal\v1;
 
 use Fleetbase\FleetOps\Exports\ContactExport;
 use Fleetbase\FleetOps\Http\Controllers\FleetOpsController;
+use Fleetbase\FleetOps\Http\Resources\v1\Vendor as VendorResource;
 use Fleetbase\FleetOps\Imports\ContactImport;
+use Fleetbase\FleetOps\Mail\CustomerCredentialsMail;
 use Fleetbase\FleetOps\Models\Contact;
+use Fleetbase\FleetOps\Models\Entity;
+use Fleetbase\FleetOps\Models\Issue;
+use Fleetbase\FleetOps\Models\Order;
+use Fleetbase\FleetOps\Models\PurchaseRate;
+use Fleetbase\FleetOps\Models\Vendor;
+use Fleetbase\FleetOps\Models\VendorPersonnel;
+use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Requests\ExportRequest;
 use Fleetbase\Http\Requests\ImportRequest;
 use Fleetbase\Models\User;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Str;
 use Maatwebsite\Excel\Facades\Excel;
 
@@ -29,6 +40,7 @@ class ContactController extends FleetOpsController
     {
         $this->resolveUserInput($request, $input);
         $this->assertCustomerIdentityIsAvailable($input);
+        $this->assertCustomerPortalCanSendWelcomeEmail($input);
     }
 
     /**
@@ -51,6 +63,7 @@ class ContactController extends FleetOpsController
     {
         if ($contact->type === 'customer') {
             $contact->normalizeCustomerUser();
+            $this->sendCustomerPortalWelcomeEmail($contact);
         }
 
         $customFieldValues = $request->array('contact.custom_field_values');
@@ -95,6 +108,57 @@ class ContactController extends FleetOpsController
         ]);
     }
 
+    public function convertToVendor(Request $request, string $id)
+    {
+        $contact = Contact::where('company_uuid', session('company'))
+            ->where(function ($query) use ($id) {
+                $query->where('uuid', $id)->orWhere('public_id', $id)->orWhere('id', $id);
+            })
+            ->firstOrFail();
+
+        $vendor = DB::transaction(function () use ($contact, $request) {
+            $originalType = $contact->type;
+            $vendor       = Vendor::create([
+                'company_uuid' => $contact->company_uuid,
+                'place_uuid'   => $contact->place_uuid,
+                'name'         => $request->input('name', $contact->name),
+                'email'        => $request->input('email', $contact->email),
+                'phone'        => $request->input('phone', $contact->phone),
+                'status'       => 'active',
+                'type'         => 'customer',
+                'meta'         => [
+                    'converted_from_contact_uuid' => $contact->uuid,
+                    'converted_from_contact_type' => $originalType,
+                    'converted_by_uuid'           => session('user'),
+                    'converted_at'                => now()->toISOString(),
+                ],
+            ]);
+
+            VendorPersonnel::updateOrCreate(
+                ['vendor_uuid' => $vendor->uuid, 'contact_uuid' => $contact->uuid],
+                ['role' => 'admin', 'status' => 'active', 'invited_by_uuid' => session('user')]
+            );
+
+            $this->migrateContactCustomerContextToVendor($contact, $vendor);
+
+            $contact->update([
+                'type' => 'customer',
+                'meta' => array_merge((array) $contact->meta, [
+                    'converted_from_type'            => $originalType,
+                    'converted_to_vendor_uuid'       => $vendor->uuid,
+                    'converted_to_vendor_public_id'  => $vendor->public_id,
+                    'converted_to_vendor_at'         => now()->toISOString(),
+                ]),
+            ]);
+
+            return $vendor;
+        });
+
+        return response()->json([
+            'vendor' => (new VendorResource($vendor->load('personnels')))->resolve(),
+        ]);
+    }
+
     /**
      * Export the contacts to excel or csv.
      *
@@ -133,6 +197,29 @@ class ContactController extends FleetOpsController
         return response()->json(['status' => 'ok', 'message' => 'Import completed', 'imported' => $importedCount]);
     }
 
+    private function migrateContactCustomerContextToVendor(Contact $contact, Vendor $vendor): void
+    {
+        $contactType = Utils::getMutationType($contact);
+        $vendorType  = Utils::getMutationType($vendor);
+        $filter      = ['customer_uuid' => $contact->uuid, 'customer_type' => $contactType];
+        $replacement = ['customer_uuid' => $vendor->uuid, 'customer_type' => $vendorType];
+
+        Order::where($filter)->update($replacement);
+        PurchaseRate::where($filter)->update($replacement);
+        Entity::where($filter)->update($replacement);
+
+        Issue::where('company_uuid', $contact->company_uuid)
+            ->where('meta->customer_portal->customer_uuid', $contact->uuid)
+            ->where('meta->customer_portal->customer_type', 'contact')
+            ->get()
+            ->each(function (Issue $issue) use ($vendor) {
+                $meta = (array) $issue->meta;
+                data_set($meta, 'customer_portal.customer_uuid', $vendor->uuid);
+                data_set($meta, 'customer_portal.customer_type', 'vendor');
+                $issue->update(['meta' => $meta]);
+            });
+    }
+
     private function resolveUserInput(Request $request, array &$input): void
     {
         $user = data_get($input, 'user_uuid') ?? data_get($input, 'user') ?? $request->input('contact.user_uuid') ?? $request->input('contact.user');
@@ -149,6 +236,54 @@ class ContactController extends FleetOpsController
         unset($input['user']);
     }
 
+    private function assertCustomerPortalCanSendWelcomeEmail(array $input): void
+    {
+        $type = data_get($input, 'type', 'contact');
+        if ($type !== 'customer' || !data_get($input, 'meta.customer_portal.send_welcome_email')) {
+            return;
+        }
+
+        if (!$this->isCustomerPortalInstalled()) {
+            throw new \Exception('Customer portal must be installed before sending a customer welcome email.');
+        }
+    }
+
+    private function sendCustomerPortalWelcomeEmail(Contact $contact): void
+    {
+        if (!data_get($contact->meta, 'customer_portal.send_welcome_email')) {
+            return;
+        }
+
+        if (!$this->isCustomerPortalInstalled()) {
+            throw new \Exception('Customer portal must be installed before sending a customer welcome email.');
+        }
+
+        $user = $contact->getUser() ?? Contact::createUserFromContact($contact, false, true);
+        if (!$user) {
+            throw new \Exception('Unable to create customer portal login.');
+        }
+
+        $password = Str::random(16);
+        $user->changePassword($password);
+
+        if ($user->status !== 'active') {
+            $user->activate();
+        }
+
+        Mail::to($user)->send(new CustomerCredentialsMail($password, $contact));
+
+        $meta = (array) $contact->meta;
+        data_forget($meta, 'customer_portal.send_welcome_email');
+        $contact->forceFill(['meta' => $meta])->saveQuietly();
+        $contact->setAttribute('meta', $meta);
+    }
+
+    private function isCustomerPortalInstalled(): bool
+    {
+        return collect(Utils::getInstalledFleetbaseExtensions())
+            ->contains(fn ($package) => data_get($package, 'name') === 'fleetbase/customer-portal-api');
+    }
+
     private function assertCustomerIdentityIsAvailable(array $input, ?Contact $contact = null): void
     {
         $type = data_get($input, 'type', $contact?->type);