@fleetbase/fleetops-engine 0.4.19 → 0.4.21

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

@@ -7,6 +7,7 @@ use Fleetbase\FleetOps\Models\Order;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\LaravelMysqlSpatial\Types\Point;
 use Illuminate\Console\Command;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Support\Carbon;
 
 class DispatchAdhocOrders extends Command
@@ -28,52 +29,56 @@ class DispatchAdhocOrders extends Command
     /**
      * Execute the console command.
      *
-     * This method is responsible for the main logic of the command.
-     * It fetches dispatchable orders, notifies about the current time and number of orders,
-     * and then dispatches each order if there are nearby drivers.
-     *
-     * @return int
+     * Processes and dispatches ad-hoc orders based on their scheduled dispatch time and driver availability.
+     * Orders without an assigned driver and that have surpassed the dispatch time threshold are considered for dispatch.
+     * The command supports sandbox and testing modes for different operational environments.
      */
-    public function handle()
+    public function handle(): void
     {
-        // Set UTC as default timezone
         date_default_timezone_set('UTC');
 
-        // Get all dispatchable orders
+        $sandboxMode = Utils::castBoolean($this->option('sandbox'));
+        $this->info('Running in ' . ($sandboxMode ? 'sandbox' : 'production') . ' mode.');
+
         $orders = $this->getDispatchableOrders();
 
-        // Notify Current Time and # of Orders in Alera
-        $this->alert('Found (' . $orders->count() . ') Orders to be Dispatched -- Current Time: ' . Carbon::now()->toDateTimeString());
+        $this->alert($orders->count() . ' orders found for ad-hoc dispatch. Current Time: ' . Carbon::now()->toDateTimeString());
 
-        // Iterate for each order
-        $orders->each(
-            function ($order) {
-                $pickup   = $order->getPickupLocation();
-                $distance = $order->getAdhocPingDistance();
+        foreach ($orders as $order) {
+            $pickup   = $order->getPickupLocation();
+            $distance = $order->getAdhocPingDistance();
 
-                if (!Utils::isPoint($pickup)) {
-                    return;
-                }
+            if (!Utils::isPoint($pickup)) {
+                $this->error('Invalid pickup location for order ' . $order->public_id);
+                continue;
+            }
 
-                // Get nearby drivers for this order
-                $drivers = $this->getNearbyDriversForOrder($order, $pickup, $distance);
+            $drivers = $this->getNearbyDriversForOrder($order, $pickup, $distance);
 
-                // Inform
-                $this->alert('Found (' . $drivers->count() . ') driver within ' . $distance . ' meters of the pickup location for order ' . $order->public_id);
+            $this->line('Checking order ' . $order->public_id . ' for nearby drivers within ' . $distance . ' meters.');
 
-                // Dispatch if there is nearby drivers
-                if ($drivers->count()) {
-                    $order->dispatch(true);
-                    $this->info('Order ' . $order->public_id . ' dispatched!');
+            if ($drivers->count()) {
+                $order->dispatch(true);
+                $this->info('Order ' . $order->public_id . ' dispatched successfully to ' . $drivers->count() . ' nearby drivers.');
+                foreach ($drivers as $driver) {
+                    $this->info('Pinging driver ' . $driver->name . ' (' . $driver->public_id . ') ...');
                 }
+            } else {
+                $this->warn('No available drivers found for order ' . $order->public_id);
             }
-        );
+        }
     }
 
     /**
-     * Fetches dispatchable orders based on certain criteria.
+     * Fetches ad-hoc dispatchable orders based on certain criteria.
+     *
+     * Retrieves orders that are marked as ad-hoc and have not been dispatched yet. The orders
+     * are filtered by their scheduled dispatch time, order status, and whether a driver has been
+     * assigned to them. The method also applies filters based on sandbox mode.
+     *
+     * @return Collection returns a collection of orders that meet the criteria
      */
-    public function getDispatchableOrders(): \Illuminate\Database\Eloquent\Collection
+    public function getDispatchableOrders(): Collection
     {
         $sandbox  = Utils::castBoolean($this->option('sandbox'));
         $interval = 4;
@@ -100,8 +105,17 @@ class DispatchAdhocOrders extends Command
 
     /**
      * Fetches nearby drivers for a given order based on the pickup location and distance.
+     *
+     * Retrieves drivers who are within a specified distance from the pickup location of the order.
+     * The method supports a testing mode to simulate driver availability.
+     *
+     * @param Order $order    the order for which drivers are being sought
+     * @param Point $pickup   the geographic point representing the pickup location
+     * @param int   $distance the maximum distance (in meters) within which drivers should be located
+     *
+     * @return Collection returns a collection of nearby drivers
      */
-    public function getNearbyDriversForOrder(Order $order, Point $pickup, int $distance): \Illuminate\Database\Eloquent\Collection
+    public function getNearbyDriversForOrder(Order $order, Point $pickup, int $distance): Collection
     {
         $testing = Utils::castBoolean($this->option('testing'));
 

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

@@ -14,7 +14,7 @@ class DispatchOrders extends Command
      *
      * @var string
      */
-    protected $signature = 'fleetops:dispatch-orders {--sandbox=false}';
+    protected $signature = 'fleetops:dispatch-orders {--sandbox=false : Whether to use the sandbox database for testing purposes.}';
 
     /**
      * The console command description.
@@ -26,41 +26,47 @@ class DispatchOrders extends Command
     /**
      * Execute the console command.
      *
-     * @return int
+     * Processes and dispatches orders that are scheduled for today. Orders are
+     * filtered based on their dispatch status, scheduled time, and other criteria.
+     * The command allows for a sandbox mode for testing.
      */
-    public function handle()
+    public function handle(): void
     {
         // Set UTC as default timezone
         date_default_timezone_set('UTC');
 
+        $sandboxMode = Utils::castBoolean($this->option('sandbox'));
+        $this->info('Running in ' . ($sandboxMode ? 'sandbox' : 'production') . ' mode.');
+
         // Get all scheduled dispatchable orders
-        $orders = $this->getScheduledOrders();
+        $orders = $this->getScheduledOrders($sandboxMode);
 
-        // Notify Current Time and # of Orders in Alera
-        $this->alert('Found (' . $orders->count() . ') Orders Scheduled for Dispatched -- Current Time: ' . Carbon::now()->toDateTimeString());
+        $this->alert('Found ' . $orders->count() . ' orders scheduled for dispatch. Current Time: ' . Carbon::now()->toDateTimeString());
 
         // Dispatch each order
-        $orders->each(
-            function ($order) {
-                if ($order->shouldDispatch()) {
-                    $order->dispatch();
-
-                    $this->info('Order ' . $order->public_id . ' dispatched! (' . $order->scheduled_at . ')');
-                } else {
-                    $this->warn('Order ' . $order->public_id . ' will be dispatched today today AT ' . $order->scheduled_at);
-                }
+        foreach ($orders as $order) {
+            if ($order->shouldDispatch()) {
+                $order->dispatch();
+                $this->info('Order ' . $order->public_id . ' dispatched successfully (' . $order->scheduled_at . ').');
+            } else {
+                $this->warn('Order ' . $order->public_id . ' is not ready for dispatch (' . $order->scheduled_at . ').');
             }
-        );
+        }
     }
 
     /**
-     * Fetches scheduled dispatchable orders based on certain criteria.
+     * Fetches scheduled dispatchable orders.
+     *
+     * Retrieves orders that are scheduled for today and have not yet been dispatched.
+     * Filters orders based on dispatch status, order status, and scheduled date.
+     *
+     * @param bool $sandboxMode whether to use the sandbox database
+     *
+     * @return \Illuminate\Database\Eloquent\Collection returns a collection of orders that meet the criteria
      */
-    public function getScheduledOrders(): \Illuminate\Database\Eloquent\Collection
+    protected function getScheduledOrders(bool $sandboxMode): \Illuminate\Database\Eloquent\Collection
     {
-        $sandbox = Utils::castBoolean($this->option('sandbox'));
-
-        return Order::on($sandbox ? 'sandbox' : 'mysql')
+        return Order::on($sandboxMode ? 'sandbox' : 'mysql')
             ->withoutGlobalScopes()
             ->where('dispatched', 0)
             ->whereIn('status', ['pending', 'created'])

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

@@ -0,0 +1,96 @@
+<?php
+
+namespace Fleetbase\FleetOps\Console\Commands;
+
+use Illuminate\Console\Command;
+use Illuminate\Support\Str;
+
+class FixInvalidPolymorphicRelationTypeNamespaces extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'fleetops:fix-invalid-polymorphic-relation-type-namespaces';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Fixes invalid namespaces in polymorphic relations across multiple models';
+
+    /**
+     * Handle the console command execution.
+     *
+     * Iterates over a predefined list of models and their respective polymorphic columns,
+     * calling a method to fix invalid namespace references in these polymorphic relations.
+     * This allows correction across multiple models in a single command execution.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        $models = [
+            ['model' => \Fleetbase\FleetOps\Models\Order::class, 'columns' => ['customer_type', 'facilitator_type']],
+            ['model' => \Fleetbase\FleetOps\Models\Place::class, 'columns' => ['owner_type']],
+            ['model' => \Fleetbase\FleetOps\Models\Entity::class, 'columns' => ['customer_type']],
+        ];
+
+        foreach ($models as $modelConfig) {
+            $this->fixModelRelations($modelConfig['model'], $modelConfig['columns']);
+        }
+    }
+
+    /**
+     * Fixes invalid namespace references in polymorphic relations for a specific model.
+     *
+     * Given a model class and an array of its polymorphic relation columns, this method
+     * iterates through each record of the model, correcting any invalid namespaces in
+     * these columns. It outputs information about the process, including the number of
+     * records updated. This function is designed to be reusable for different models.
+     *
+     * @param string $modelClass the class name of the model to be processed
+     * @param array  $columns    an array of column names that have polymorphic relations
+     */
+    protected function fixModelRelations(string $modelClass, array $columns): void
+    {
+        $modelInstance = new $modelClass();
+        $modelName     = class_basename($modelInstance);
+
+        $this->info("Processing $modelName...");
+
+        $records = $modelInstance::query();
+        foreach ($columns as $column) {
+            $records->orWhereNotNull($column);
+        }
+        $records      = $records->get();
+        $updatedCount = 0;
+        $this->alert('Checking ' . $records->count() . ' ' . Str::plural($modelName, $records->count()) . ' for invalid polymorphic relation type namespaces.');
+
+        foreach ($records as $record) {
+            foreach ($columns as $column) {
+                if (isset($record->$column)) {
+                    $original           = $record->$column;
+                    $normalizedOriginal = ltrim($original, '\\');
+
+                    if (Str::startsWith($normalizedOriginal, 'Fleetbase\Models')) {
+                        $newNamespace    = Str::replaceFirst('Fleetbase\Models', 'Fleetbase\FleetOps\Models', $normalizedOriginal);
+                        $record->$column = $newNamespace;
+                        $updatedCount++;
+
+                        $this->info("{$modelName} ID {$record->id}: Corrected namespace from '$original' to '$newNamespace'.");
+                    }
+                }
+            }
+
+            if ($record->isDirty()) {
+                $record->save();
+                $this->info("Saved changes for $modelName ID {$record->public_id}.");
+            }
+        }
+
+        $this->info("Finished processing $modelName. Total updated records: $updatedCount.");
+    }
+}

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

@@ -13,7 +13,7 @@ class TrackOrderDistanceAndTime extends Command
      *
      * @var string
      */
-    protected $signature = 'fleetops:update-estimations';
+    protected $signature = 'fleetops:update-estimations {--provider : The distance and time calculation provider (calculate, google, or osrm)}';
 
     /**
      * The console command description.
@@ -32,31 +32,46 @@ class TrackOrderDistanceAndTime extends Command
         // Set UTC as default timezone
         date_default_timezone_set('UTC');
 
-        // Get all active/ready order
-        $orders = $this->getActiveOrders();
+        // Determine the provider
+        $provider = $this->option('provider') ?? config('fleetops.distance_matrix.provider');
+        $this->info("Using '{$provider}' as the provider for calculations.");
 
-        // Track updated orders
-        $updated = [];
+        // Get all active/ready orders
+        $orders = $this->getActiveOrders();
 
-        // Notify Current Time and # of Orders in Alera
-        $this->alert('Found (' . $orders->count() . ') Orders to update Tracking Estimation -- Current Time: ' . Carbon::now()->toDateTimeString());
+        // Notify Current Time and # of Orders
+        $this->alert('Found ' . $orders->count() . ' orders to update tracking estimations. Current Time: ' . Carbon::now()->toDateTimeString());
 
         // Update for each order
-        $orders->each(
-            function ($order) use (&$updated) {
-                $updated[] = $order->setDistanceAndTime()->id;
+        $updated = 0;
+        foreach ($orders as $order) {
+            try {
+                // Update order distance and time estimations based on the provider
+                $order->setDistanceAndTime(['provider' => $provider]);
+                $updated++;
+                $this->info("Order ID {$order->id} - Distance & Time estimations updated.");
+            } catch (\Exception $e) {
+                $this->error("Failed to update Order ID {$order->id} - Error: " . $e->getMessage());
             }
-        );
+        }
 
-        // Update info
-        $this->info('Updated ' . count($updated) . '/' . $orders->count() . ' orders Distance & Time Estimations.');
+        // Summary info
+        $this->info("Updated $updated/" . $orders->count() . " orders' Distance & Time Estimations.");
     }
 
     /**
      * Fetches active orders.
+     *
+     * @return \Illuminate\Database\Eloquent\Collection
      */
-    public function getActiveOrders(): \Illuminate\Database\Eloquent\Collection
+    protected function getActiveOrders()
     {
-        return Order::whereNotIn('status', ['completed', 'canceled'])->whereNull(['deleted_at'])->whereNotNull('company_uuid')->whereHas('payload')->with(['payload', 'payload.waypoints', 'payload.pickup', 'payload.dropoff'])->withoutGlobalScopes()->get();
+        return Order::whereNotIn('status', ['completed', 'canceled'])
+                    ->whereNull('deleted_at')
+                    ->whereNotNull('company_uuid')
+                    ->whereHas('payload')
+                    ->with(['payload', 'payload.waypoints', 'payload.pickup', 'payload.dropoff'])
+                    ->withoutGlobalScopes()
+                    ->get();
     }
 }

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

@@ -11,7 +11,6 @@ use Fleetbase\FleetOps\Http\Resources\v1\Driver as DriverResource;
 use Fleetbase\FleetOps\Jobs\SimulateDrivingRoute;
 use Fleetbase\FleetOps\Models\Driver;
 use Fleetbase\FleetOps\Models\Order;
-use Fleetbase\FleetOps\Support\Flow;
 use Fleetbase\FleetOps\Support\OSRM;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Controllers\Controller;

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

@@ -25,6 +25,7 @@ use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Controllers\Controller;
 use Fleetbase\Models\Company;
 use Fleetbase\Models\File;
+use Fleetbase\Models\Setting;
 use Fleetbase\Support\Auth;
 use Illuminate\Http\Request;
 use Illuminate\Support\Carbon;
@@ -433,8 +434,6 @@ class OrderController extends Controller
     public function query(Request $request)
     {
         $results = Order::queryWithRequest($request, function (&$query, $request) {
-            $query->where('company_uuid', session('company'));
-
             if ($request->has('payload')) {
                 $query->whereHas('payload', function ($q) use ($request) {
                     $q->where('public_id', $request->input('payload'));
@@ -1364,4 +1363,52 @@ class OrderController extends Controller
 
         return new ProofResource($proof);
     }
+
+    /**
+     * Retrieves editable fields for a specific order entity based on its configuration.
+     *
+     * This function looks up an order by its ID and retrieves configurable editable fields
+     * associated with it, as defined in the settings. If the order is not found, it returns
+     * a 404 response with an error message. Otherwise, it returns the editable fields for
+     * the order entity.
+     *
+     * @param string  $id      the unique identifier of the order
+     * @param Request $request the incoming request instance
+     *
+     * @return \Illuminate\Http\JsonResponse returns a JSON response containing either an error message
+     *                                       or the editable fields for the order entity
+     *
+     * @throws \Illuminate\Database\Eloquent\ModelNotFoundException thrown if the order with the given ID cannot be found
+     */
+    public function getEditableEntityFields(string $id, Request $request)
+    {
+        try {
+            $order = Order::findRecordOrFail($id);
+        } catch (\Illuminate\Database\Eloquent\ModelNotFoundException $exception) {
+            return response()->json(
+                [
+                    'error' => 'Order resource not found.',
+                ],
+                404
+            );
+        }
+
+        // Define settings as array
+        $entityEditingSettings = [];
+
+        // get the order config id
+        $orderConfigId = data_get($order, 'order_config_uuid');
+
+        // Get entity editing settings
+        $savedEntityEditingSettings = Setting::where('key', 'fleet-ops.entity-editing-settings')->value('value');
+
+        if ($orderConfigId && $savedEntityEditingSettings) {
+            $resolvedEntityEditingSettings = data_get($savedEntityEditingSettings, $orderConfigId, []);
+            if ($resolvedEntityEditingSettings) {
+                $entityEditingSettings = data_get($resolvedEntityEditingSettings, 'editable_entity_fields', []);
+            }
+        }
+
+        return response()->json($entityEditingSettings);
+    }
 }

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

@@ -47,4 +47,24 @@ class SettingController extends Controller
 
         return response()->json(['visibilitySettings' => $visibilitySettings]);
     }
+
+    public function saveEntityEditingSettings(Request $request)
+    {
+        $entityEditingSettings  = $request->input('entityEditingSettings', []);
+        $isEntityFieldsEditable = $request->boolean('isEntityFieldsEditable');
+
+        // Save entity editing settings
+        Setting::configure('fleet-ops.entity-editing-settings', $entityEditingSettings);
+        Setting::configure('fleet-ops.entity-fields-editable', $isEntityFieldsEditable);
+
+        return response()->json(['entityEditingSettings' => $entityEditingSettings, 'isEntityFieldsEditable' => $isEntityFieldsEditable]);
+    }
+
+    public function getEntityEditingSettings()
+    {
+        $entityEditingSettings  = Setting::where('key', 'fleet-ops.entity-editing-settings')->value('value');
+        $isEntityFieldsEditable = Setting::where('key', 'fleet-ops.entity-fields-editable')->value('value');
+
+        return response()->json(['entityEditingSettings' => $entityEditingSettings, 'isEntityFieldsEditable' => $isEntityFieldsEditable]);
+    }
 }

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

@@ -22,6 +22,11 @@ class ContactFilter extends Filter
         );
     }
 
+    public function queryForPublic()
+    {
+        $this->builder->where('company_uuid', $this->session->get('company'));
+    }
+
     public function query(?string $searchQuery)
     {
         $this->builder->search($searchQuery);

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

@@ -23,6 +23,11 @@ class DriverFilter extends Filter
         );
     }
 
+    public function queryForPublic()
+    {
+        $this->queryForInternal();
+    }
+
     public function query(?string $searchQuery)
     {
         $this->builder->where(function ($query) use ($searchQuery) {

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

@@ -0,0 +1,18 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Filter;
+
+use Fleetbase\Http\Filter\Filter;
+
+class EntityFilter extends Filter
+{
+    public function queryForInternal()
+    {
+        $this->builder->where('company_uuid', $this->session->get('company'));
+    }
+
+    public function queryForPublic()
+    {
+        $this->builder->where('company_uuid', $this->session->get('company'));
+    }
+}

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

@@ -12,6 +12,11 @@ class FleetFilter extends Filter
         $this->builder->where('company_uuid', $this->session->get('company'))->with(['serviceArea', 'zone']);
     }
 
+    public function queryForPublic()
+    {
+        $this->builder->where('company_uuid', $this->session->get('company'));
+    }
+
     public function query(?string $searchQuery)
     {
         $this->builder->where(function ($query) use ($searchQuery) {

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

@@ -13,6 +13,11 @@ class FuelReportFilter extends Filter
         $this->builder->where('company_uuid', $this->session->get('company'));
     }
 
+    public function queryForPublic()
+    {
+        $this->builder->where('company_uuid', $this->session->get('company'));
+    }
+
     public function query(?string $searchQuery)
     {
         $this->builder->search($searchQuery);

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

@@ -13,6 +13,11 @@ class IssueFilter extends Filter
         $this->builder->where('company_uuid', $this->session->get('company'));
     }
 
+    public function queryForPublic()
+    {
+        $this->builder->where('company_uuid', $this->session->get('company'));
+    }
+
     public function query(?string $searchQuery)
     {
         $this->builder->search($searchQuery);

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

@@ -10,4 +10,9 @@ class OrderConfigFilter extends Filter
     {
         $this->builder->where('company_uuid', $this->session->get('company'));
     }
+
+    public function queryForPublic()
+    {
+        $this->builder->where('company_uuid', $this->session->get('company'));
+    }
 }

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

@@ -36,6 +36,11 @@ class OrderFilter extends Filter
             );
     }
 
+    public function queryForPublic()
+    {
+        $this->builder->where('company_uuid', $this->session->get('company'))->whereHas('trackingNumber')->whereHas('payload');
+    }
+
     public function unassigned(bool $unassigned)
     {
         if ($unassigned) {

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

@@ -0,0 +1,18 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Filter;
+
+use Fleetbase\Http\Filter\Filter;
+
+class PayloadFilter extends Filter
+{
+    public function queryForInternal()
+    {
+        $this->builder->where('company_uuid', $this->session->get('company'));
+    }
+
+    public function queryForPublic()
+    {
+        $this->builder->where('company_uuid', $this->session->get('company'));
+    }
+}

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

@@ -15,6 +15,11 @@ class PlaceFilter extends Filter
         $this->builder->where('company_uuid', $this->session->get('company'));
     }
 
+    public function queryForPublic()
+    {
+        $this->builder->where('company_uuid', $this->session->get('company'));
+    }
+
     public function query(?string $searchQuery)
     {
         $this->builder->search($searchQuery);

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

@@ -0,0 +1,18 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Filter;
+
+use Fleetbase\Http\Filter\Filter;
+
+class PurchaseRateFilter extends Filter
+{
+    public function queryForInternal()
+    {
+        $this->builder->where('company_uuid', $this->session->get('company'));
+    }
+
+    public function queryForPublic()
+    {
+        $this->builder->where('company_uuid', $this->session->get('company'));
+    }
+}

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

@@ -10,4 +10,9 @@ class ServiceAreaFilter extends Filter
     {
         $this->builder->where('company_uuid', $this->session->get('company'));
     }
+
+    public function queryForPublic()
+    {
+        $this->builder->where('company_uuid', $this->session->get('company'));
+    }
 }

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

@@ -10,4 +10,9 @@ class ServiceQuoteFilter extends Filter
     {
         $this->builder->where('company_uuid', $this->session->get('company'));
     }
+
+    public function queryForPublic()
+    {
+        $this->builder->where('company_uuid', $this->session->get('company'));
+    }
 }

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

@@ -11,6 +11,11 @@ class ServiceRateFilter extends Filter
         $this->builder->where('company_uuid', $this->session->get('company'));
     }
 
+    public function queryForPublic()
+    {
+        $this->builder->where('company_uuid', $this->session->get('company'));
+    }
+
     public function serviceArea(?string $serviceArea)
     {
         $this->builder->whereHas(