@fleetbase/fleetops-engine 0.6.50 → 0.6.52

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/AnalyticsController.php

@@ -4,6 +4,7 @@ namespace Fleetbase\FleetOps\Http\Controllers\Internal\v1;
 
 use Fleetbase\FleetOps\Support\Analytics\AbstractAnalytics;
 use Fleetbase\FleetOps\Support\Analytics\FuelEfficiency;
+use Fleetbase\FleetOps\Support\Analytics\FuelProviderSummary;
 use Fleetbase\FleetOps\Support\Analytics\GeofenceViolations;
 use Fleetbase\FleetOps\Support\Analytics\IssuesInsights;
 use Fleetbase\FleetOps\Support\Analytics\LiveFleet;
@@ -64,6 +65,11 @@ class AnalyticsController extends Controller
         return $this->run($request, FuelEfficiency::class, defaultDays: 90);
     }
 
+    public function fuelProviders(Request $request)
+    {
+        return $this->run($request, FuelProviderSummary::class, defaultDays: 30);
+    }
+
     public function issuesInsights(Request $request)
     {
         return $this->run($request, IssuesInsights::class);

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);

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

@@ -8,9 +8,78 @@ use Fleetbase\Http\Controllers\Controller;
 use Fleetbase\Models\User;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Mail;
+use Illuminate\Support\Str;
 
 class CustomerController extends Controller
 {
+    public function createPortalLogin(Request $request)
+    {
+        $customer = $this->resolveCustomer($request);
+        $user     = $this->resolveCustomerUser($customer);
+
+        if (!$user) {
+            return response()->error('Unable to create customer portal login.');
+        }
+
+        if ($user->status !== 'active') {
+            $user->activate();
+        }
+
+        return response()->json([
+            'customer' => $this->customerPayload($customer->fresh()),
+        ]);
+    }
+
+    public function sendCredentials(Request $request)
+    {
+        $customer = $this->resolveCustomer($request);
+        $user     = $this->resolveCustomerUser($customer);
+
+        if (!$user) {
+            return response()->error('Unable to send customer portal credentials.');
+        }
+
+        $password = Str::random(16);
+        $user->changePassword($password);
+        Mail::to($user)->send(new CustomerCredentialsMail($password, $customer));
+
+        return response()->json([
+            'customer' => $this->customerPayload($customer->fresh()),
+        ]);
+    }
+
+    public function deactivatePortalLogin(Request $request)
+    {
+        $customer = $this->resolveCustomer($request);
+        $user     = $customer->user_uuid ? User::where('uuid', $customer->user_uuid)->first() : null;
+
+        if (!$user) {
+            return response()->error('Customer portal login not found.');
+        }
+
+        $user->deactivate();
+
+        return response()->json([
+            'customer' => $this->customerPayload($customer->fresh()),
+        ]);
+    }
+
+    public function reactivatePortalLogin(Request $request)
+    {
+        $customer = $this->resolveCustomer($request);
+        $user     = $customer->user_uuid ? User::where('uuid', $customer->user_uuid)->first() : null;
+
+        if (!$user) {
+            return response()->error('Customer portal login not found.');
+        }
+
+        $user->activate();
+
+        return response()->json([
+            'customer' => $this->customerPayload($customer->fresh()),
+        ]);
+    }
+
     /**
      * Resets the password for a specified customer and optionally sends the new credentials via email.
      *
@@ -72,13 +141,10 @@ class CustomerController extends Controller
             return response()->error('Passwords do not match.');
         }
 
-        $customer = Contact::where(['uuid' => $customerId, 'company_uuid' => session('company'), 'type' => 'customer'])->first();
-        if (!$customer) {
-            return response()->error('Customer not found to change password for.');
-        }
+        $customer = $this->resolveCustomer($request);
 
         // Load customer user
-        $user = $customer->user_uuid ? User::where('uuid', $customer->user_uuid)->first() : $customer->createUser();
+        $user = $this->resolveCustomerUser($customer);
         if (!$user) {
             return response()->error('Unable to reset customer credentials');
         }
@@ -91,6 +157,50 @@ class CustomerController extends Controller
             Mail::to($user)->send(new CustomerCredentialsMail($password, $customer));
         }
 
-        return response()->json(['status' => 'ok']);
+        return response()->json([
+            'status'   => 'ok',
+            'customer' => $this->customerPayload($customer->fresh()),
+        ]);
+    }
+
+    protected function resolveCustomer(Request $request): Contact
+    {
+        $customerId = $request->input('customer');
+
+        abort_if(!$customerId, 400, 'No customer specified.');
+
+        return Contact::where('company_uuid', session('company'))
+            ->where(function ($query) use ($customerId) {
+                $query->where('uuid', $customerId)
+                    ->orWhere('public_id', $customerId)
+                    ->orWhere('id', $customerId);
+            })
+            ->firstOrFail();
+    }
+
+    protected function resolveCustomerUser(Contact $customer): ?User
+    {
+        return $customer->user_uuid ? User::where('uuid', $customer->user_uuid)->first() : Contact::createUserFromContact($customer, false, true);
+    }
+
+    protected function customerPayload(Contact $customer): array
+    {
+        $customer->loadMissing('user');
+
+        return [
+            'id'        => $customer->public_id,
+            'uuid'      => $customer->uuid,
+            'user_uuid' => $customer->user_uuid,
+            'user'      => $customer->user ? [
+                'id'             => $customer->user->public_id,
+                'uuid'           => $customer->user->uuid,
+                'name'           => $customer->user->name,
+                'email'          => $customer->user->email,
+                'phone'          => $customer->user->phone,
+                'status'         => $customer->user->status,
+                'session_status' => $customer->user->session_status,
+                'avatar_url'     => $customer->user->avatar_url,
+            ] : null,
+        ];
     }
 }

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

@@ -3,6 +3,10 @@
 namespace Fleetbase\FleetOps\Http\Controllers\Internal\v1;
 
 use Fleetbase\FleetOps\Http\Controllers\FleetOpsController;
+use Fleetbase\FleetOps\Models\Device;
+use Fleetbase\FleetOps\Models\Vehicle;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
 
 class DeviceController extends FleetOpsController
 {
@@ -21,7 +25,23 @@ class DeviceController extends FleetOpsController
      */
     public static function onQueryRecord($query, $request): void
     {
-        $query->with(['telematic', 'warranty']);
+        $query->with(['telematic', 'warranty', 'attachable']);
+
+        if ($request->filled('attachment_state')) {
+            match ($request->input('attachment_state')) {
+                'attached'   => $query->whereNotNull('attachable_uuid'),
+                'unattached' => $query->whereNull('attachable_uuid'),
+                default      => null,
+            };
+        }
+
+        if ($request->filled('vehicle')) {
+            $query->where('attachable_uuid', $request->input('vehicle'));
+        }
+
+        if ($request->filled('device_id')) {
+            $query->where('device_id', 'like', '%' . $request->input('device_id') . '%');
+        }
     }
 
     /**
@@ -32,6 +52,60 @@ class DeviceController extends FleetOpsController
      */
     public static function onFindRecord($query, $request): void
     {
-        $query->with(['telematic', 'warranty']);
+        $query->with(['telematic', 'warranty', 'attachable']);
+    }
+
+    /**
+     * Attach a device to a supported FleetOps resource.
+     */
+    public function attach(Request $request, string $id): JsonResponse
+    {
+        $request->validate([
+            'vehicle' => 'required_without:attachable_uuid|nullable|string',
+        ]);
+
+        $device  = $this->findDevice($id);
+        $vehicle = $this->findVehicle($request->input('vehicle') ?? $request->input('attachable_uuid'));
+
+        $device->attachTo($vehicle);
+        $device->load(['telematic', 'warranty', 'attachable']);
+
+        return response()->json([
+            'status' => 'ok',
+            'device' => $device,
+        ]);
+    }
+
+    /**
+     * Detach a device from its current FleetOps resource.
+     */
+    public function detach(string $id): JsonResponse
+    {
+        $device = $this->findDevice($id);
+        $device->detach();
+        $device->load(['telematic', 'warranty', 'attachable']);
+
+        return response()->json([
+            'status' => 'ok',
+            'device' => $device,
+        ]);
+    }
+
+    protected function findDevice(string $id): Device
+    {
+        return Device::where(function ($query) use ($id) {
+            $query->where('uuid', $id)->orWhere('public_id', $id);
+        })
+            ->where('company_uuid', session('company'))
+            ->firstOrFail();
+    }
+
+    protected function findVehicle(?string $id): Vehicle
+    {
+        return Vehicle::where(function ($query) use ($id) {
+            $query->where('uuid', $id)->orWhere('public_id', $id);
+        })
+            ->where('company_uuid', session('company'))
+            ->firstOrFail();
     }
 }

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

@@ -3,6 +3,8 @@
 namespace Fleetbase\FleetOps\Http\Controllers\Internal\v1;
 
 use Fleetbase\FleetOps\Http\Controllers\FleetOpsController;
+use Fleetbase\FleetOps\Models\DeviceEvent;
+use Illuminate\Http\JsonResponse;
 
 class DeviceEventController extends FleetOpsController
 {
@@ -12,4 +14,46 @@ class DeviceEventController extends FleetOpsController
      * @var string
      */
     public $resource = 'device-event';
+
+    /**
+     * Query callback when querying record.
+     *
+     * @param \Illuminate\Database\Query\Builder $query
+     * @param Request                            $request
+     */
+    public static function onQueryRecord($query, $request): void
+    {
+        $query->with(['device']);
+
+        if ($request->filled('telematic')) {
+            $query->whereHas('device', function ($deviceQuery) use ($request) {
+                $deviceQuery->where('telematic_uuid', $request->input('telematic'));
+            });
+        }
+
+        if ($request->filled('processed')) {
+            match ($request->input('processed')) {
+                'processed'   => $query->whereNotNull('processed_at'),
+                'unprocessed' => $query->whereNull('processed_at'),
+                default       => null,
+            };
+        }
+    }
+
+    public function markProcessed(string $id): JsonResponse
+    {
+        $deviceEvent = DeviceEvent::where('company_uuid', session('company'))
+            ->where(function ($query) use ($id) {
+                $query->where('uuid', $id)->orWhere('public_id', $id);
+            })
+            ->firstOrFail();
+
+        $processed = $deviceEvent->markAsProcessed();
+
+        return response()->json([
+            'status'       => 'ok',
+            'message'      => $processed ? 'Event marked processed.' : 'Event was already processed.',
+            'device_event' => $deviceEvent->fresh(),
+        ]);
+    }
 }