@fleetbase/fleetops-engine 0.4.18 → 0.4.20

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

@@ -39,6 +39,9 @@ class ServiceRateController extends FleetOpsController
             $waypoints,
             function ($query) use ($request) {
                 $query->where('company_uuid', $request->session()->get('company'));
+                if ($request->filled('service_type')) {
+                    $query->where('service_type', $request->input('service_type'));
+                }
             }
         );
 

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(

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

@@ -0,0 +1,18 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Filter;
+
+use Fleetbase\Http\Filter\Filter;
+
+class TrackingNumberFilter 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/TrackingStatusFilter.php

@@ -11,6 +11,11 @@ class TrackingStatusFilter 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 trackingNumber(string $trackingNumber)
     {
         $this->builder->whereHas('trackingNumber', function ($query) use ($trackingNumber) {

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

@@ -12,6 +12,11 @@ class VehicleFilter 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 $query)
     {
         $this->builder->search($query);

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

@@ -12,6 +12,11 @@ class VendorFilter 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/ZoneFilter.php

@@ -10,4 +10,9 @@ class ZoneFilter 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/Requests/CreateOrderRequest.php

@@ -2,6 +2,7 @@
 
 namespace Fleetbase\FleetOps\Http\Requests;
 
+use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Requests\FleetbaseRequest;
 use Fleetbase\Rules\ExistsInAny;
 
@@ -25,21 +26,26 @@ class CreateOrderRequest extends FleetbaseRequest
     public function rules()
     {
         $validations = [
-            'adhoc'          => 'in:true,false,1,0',
-            'dispatch'       => ['nullable', 'boolean'],
-            'adhoc_distance' => 'numeric',
-            'pod_required'   => 'in:true,false,1,0',
-            'pod_method'     => 'in:' . config('api.pod_methods'),
-            'scheduled_at'   => ['nullable', 'date'],
-            'driver'         => 'nullable|exists:drivers,public_id',
-            'service_quote'  => 'nullable|exists:service_quotes,public_id',
-            'purchase_rate'  => 'nullable|exists:purchase_rates,public_id',
-            'facilitator'    => ['nullable', new ExistsInAny(['vendors', 'contacts', 'integrated_vendors'], ['public_id', 'provider'])],
-            'customer'       => ['nullable', new ExistsInAny(['vendors', 'contacts'], 'public_id')],
-            'status'         => 'string',
-            'type'           => 'string',
+            'adhoc'             => ['nullable', 'boolean'],
+            'dispatch'          => ['nullable', 'boolean'],
+            'adhoc_distance'    => ['nullable', 'numeric'],
+            'pod_required'      => ['nullable', 'boolean'],
+            'pod_method'        => ['nullable', 'in:' . config('fleetops.pod_methods')],
+            'scheduled_at'      => ['nullable', 'date'],
+            'driver'            => ['nullable', 'exists:drivers,public_id'],
+            'service_quote'     => ['nullable', 'exists:service_quotes,public_id'],
+            'purchase_rate'     => ['nullable', 'exists:purchase_rates,public_id'],
+            'facilitator'       => ['nullable', new ExistsInAny(['vendors', 'contacts', 'integrated_vendors'], ['public_id', 'provider'])],
+            'customer'          => ['nullable', new ExistsInAny(['vendors', 'contacts'], 'public_id')],
+            'status'            => ['nullable', 'string'],
+            'type'              => ['string'],
         ];
 
+        // Conditionally require 'pod_method' if 'pod_required' is truthy
+        if (Utils::isTrue($this->input('pod_required'))) {
+            $validations['pod_method'] = ['required', 'in:' . implode(',', config('fleetops.pod_methods'))];
+        }
+
         if ($this->has('payload')) {
             $validations['payload.entities']  = 'array';
             $validations['payload.waypoints'] = 'array';
@@ -77,4 +83,17 @@ class CreateOrderRequest extends FleetbaseRequest
 
         return $validations;
     }
+
+    /**
+     * Get custom attributes for validator errors.
+     *
+     * @return array<string, string>
+     */
+    public function attributes(): array
+    {
+        return [
+            'pod_required' => 'proof of delivery required',
+            'pod_method'   => 'proof of delivery method',
+        ];
+    }
 }

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

@@ -2,6 +2,7 @@
 
 namespace Fleetbase\FleetOps\Http\Requests\Internal;
 
+use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Requests\FleetbaseRequest;
 use Fleetbase\Rules\ExistsInAny;
 
@@ -25,22 +26,27 @@ class CreateOrderRequest extends FleetbaseRequest
     public function rules()
     {
         $validations = [
-            'order_config_uuid' => 'required',
-            // 'adhoc'             => 'in:true,false,1,0',
+            'order_config_uuid' => ['required'],
+            'adhoc'             => ['nullable', 'boolean'],
             'dispatch'          => ['nullable', 'boolean'],
-            // 'adhoc_distance'    => 'numeric',
-            'pod_required'      => 'in:true,false,1,0',
-            'pod_method'        => 'in:' . config('api.pod_methods'),
+            'adhoc_distance'    => ['nullable', 'numeric'],
+            'pod_required'      => ['nullable', 'boolean'],
+            'pod_method'        => ['nullable', 'in:' . config('fleetops.pod_methods')],
             'scheduled_at'      => ['nullable', 'date'],
-            'driver'            => 'nullable|exists:drivers,uuid',
-            'service_quote'     => 'nullable|exists:service_quotes,uuid',
-            'purchase_rate'     => 'nullable|exists:purchase_rates,uuid',
+            'driver'            => ['nullable', 'exists:drivers,uuid'],
+            'service_quote'     => ['nullable', 'exists:service_quotes,uuid'],
+            'purchase_rate'     => ['nullable', 'exists:purchase_rates,uuid'],
             'facilitator'       => ['nullable', new ExistsInAny(['vendors', 'contacts', 'integrated_vendors'], ['uuid', 'provider'])],
             'customer'          => ['nullable', new ExistsInAny(['vendors', 'contacts'], 'uuid')],
-            'status'            => 'nullable|string',
-            'type'              => 'string',
+            'status'            => ['nullable', 'string'],
+            'type'              => ['string'],
         ];
 
+        // Conditionally require 'pod_method' if 'pod_required' is truthy
+        if (Utils::isTrue($this->input('order.pod_required'))) {
+            $validations['pod_method'] = ['required', 'in:' . config('fleetops.pod_methods')];
+        }
+
         if ($this->has('payload')) {
             $validations['payload.entities']  = 'array';
             $validations['payload.waypoints'] = 'array';
@@ -63,4 +69,29 @@ class CreateOrderRequest extends FleetbaseRequest
 
         return $validations;
     }
+
+    /**
+     * Get the error messages for the defined validation rules.
+     *
+     * @return array<string, string>
+     */
+    public function messages(): array
+    {
+        return [
+            'pod_method.required'   => 'A proof of delivery method is required.',
+        ];
+    }
+
+    /**
+     * Get custom attributes for validator errors.
+     *
+     * @return array<string, string>
+     */
+    public function attributes(): array
+    {
+        return [
+            'pod_required' => 'proof of delivery required',
+            'pod_method'   => 'proof of delivery method',
+        ];
+    }
 }

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

@@ -39,6 +39,7 @@ class Order extends FleetbaseResource
             'service_quote_uuid'   => $this->when(Http::isInternalRequest(), $this->service_quote_uuid),
             'has_driver_assigned'  => $this->when(Http::isInternalRequest(), $this->has_driver_assigned),
             'is_scheduled'         => $this->when(Http::isInternalRequest(), $this->is_scheduled),
+            'order_config_id'      => $this->when(Http::isInternalRequest(), $this->order_config_id),
             'order_config'         => $this->when(Http::isInternalRequest(), $this->whenLoaded('orderConfig', $this->orderConfig), data_get($this->orderConfig, 'public_id')),
             'custom_field_values'  => $this->when(Http::isInternalRequest(), $this->customFieldValues),
             'customer'             => $this->setCustomerType(Resolve::resourceForMorph($this->customer_type, $this->customer_uuid)),

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

@@ -18,37 +18,40 @@ class ServiceRate extends FleetbaseResource
     public function toArray($request)
     {
         return [
-            'id'                            => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
-            'uuid'                          => $this->when(Http::isInternalRequest(), $this->uuid),
-            'public_id'                     => $this->when(Http::isInternalRequest(), $this->public_id),
-            'service_area'                  => $this->whenLoaded('serviceArea', new ServiceArea($this->serviceArea)),
-            'service_area_name'             => $this->when(Http::isInternalRequest(), data_get($this, 'serviceArea.name')),
-            'zone'                          => $this->whenLoaded('zone', new Zone($this->zone)),
-            'zone_name'                     => $this->when(Http::isInternalRequest(), data_get($this, 'zone.name')),
-            'service_name'                  => $this->service_name,
-            'service_type'                  => $this->service_type,
-            'base_fee'                      => $this->base_fee,
-            'rate_calculation_method'       => $this->rate_calculation_method,
-            'per_meter_flat_rate_fee'       => $this->per_meter_flat_rate_fee,
-            'per_meter_unit'                => $this->per_meter_unit,
-            'meter_fees'                    => ServiceRateFee::collection($this->rateFees ?? []),
-            'parcel_fees'                   => ServiceRateParcelFee::collection($this->rateFees ?? []),
-            'algorithm'                     => $this->algorithm,
-            'has_cod_fee'                   => Utils::castBoolean($this->has_cod_fee),
-            'cod_calculation_method'        => $this->cod_calculation_method,
-            'cod_flat_fee'                  => $this->cod_flat_fee,
-            'cod_percent'                   => $this->cod_percent,
-            'has_peak_hours_fee'            => Utils::castBoolean($this->has_peak_hours_fee),
-            'peak_hours_calculation_method' => $this->peak_hours_calculation_method,
-            'peak_hours_flat_fee'           => $this->peak_hours_flat_fee,
-            'peak_hours_percent'            => $this->peak_hours_percent,
-            'peak_hours_start'              => $this->peak_hours_start,
-            'peak_hours_end'                => $this->peak_hours_end,
-            'currency'                      => $this->currency,
-            'duration_terms'                => $this->duration_terms,
-            'estimated_days'                => $this->estimated_days,
-            'updated_at'                    => $this->updated_at,
-            'created_at'                    => $this->created_at,
+            'id'                                         => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
+            'uuid'                                       => $this->when(Http::isInternalRequest(), $this->uuid),
+            'service_area_uuid'                          => $this->when(Http::isInternalRequest(), $this->service_area_uuid),
+            'zone_uuid'                                  => $this->when(Http::isInternalRequest(), $this->zone_uuid),
+            'order_config_uuid'                          => $this->when(Http::isInternalRequest(), $this->order_config_uuid),
+            'public_id'                                  => $this->when(Http::isInternalRequest(), $this->public_id),
+            'service_area'                               => $this->whenLoaded('serviceArea', new ServiceArea($this->serviceArea)),
+            'service_area_name'                          => $this->when(Http::isInternalRequest(), data_get($this, 'serviceArea.name')),
+            'zone'                                       => $this->whenLoaded('zone', new Zone($this->zone)),
+            'zone_name'                                  => $this->when(Http::isInternalRequest(), data_get($this, 'zone.name')),
+            'service_name'                               => $this->service_name,
+            'service_type'                               => $this->service_type,
+            'base_fee'                                   => $this->base_fee,
+            'rate_calculation_method'                    => $this->rate_calculation_method,
+            'per_meter_flat_rate_fee'                    => $this->per_meter_flat_rate_fee,
+            'per_meter_unit'                             => $this->per_meter_unit,
+            'meter_fees'                                 => ServiceRateFee::collection($this->rateFees ?? []),
+            'parcel_fees'                                => ServiceRateParcelFee::collection($this->rateFees ?? []),
+            'algorithm'                                  => $this->algorithm,
+            'has_cod_fee'                                => Utils::castBoolean($this->has_cod_fee),
+            'cod_calculation_method'                     => $this->cod_calculation_method,
+            'cod_flat_fee'                               => $this->cod_flat_fee,
+            'cod_percent'                                => $this->cod_percent,
+            'has_peak_hours_fee'                         => Utils::castBoolean($this->has_peak_hours_fee),
+            'peak_hours_calculation_method'              => $this->peak_hours_calculation_method,
+            'peak_hours_flat_fee'                        => $this->peak_hours_flat_fee,
+            'peak_hours_percent'                         => $this->peak_hours_percent,
+            'peak_hours_start'                           => $this->peak_hours_start,
+            'peak_hours_end'                             => $this->peak_hours_end,
+            'currency'                                   => $this->currency,
+            'duration_terms'                             => $this->duration_terms,
+            'estimated_days'                             => $this->estimated_days,
+            'updated_at'                                 => $this->updated_at,
+            'created_at'                                 => $this->created_at,
         ];
     }
 

package/server/src/Models/Driver.php

@@ -157,7 +157,7 @@ class Driver extends Model
      *
      * @var array
      */
-    protected $filterParams = ['vendor', 'facilitator', 'customer', 'fleet', 'photo_uuid', 'avatar_uuid'];
+    protected $filterParams = ['vendor', 'facilitator', 'customer', 'fleet', 'photo_uuid', 'avatar_uuid', 'avatar_value'];
 
     /**
      * Get the activity log options for the model.

package/server/src/Models/ServiceRate.php

@@ -53,6 +53,7 @@ class ServiceRate extends Model
         'company_uuid',
         'service_area_uuid',
         'zone_uuid',
+        'order_config_uuid',
         'service_name',
         'service_type',
         'per_meter_flat_rate_fee',
@@ -124,6 +125,14 @@ class ServiceRate extends Model
         return $this->hasMany(ServiceRateParcelFee::class);
     }
 
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function orderConfig()
+    {
+        return $this->belongsTo(OrderConfig::class)->withTrashed();
+    }
+
     /**
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */

package/server/src/Providers/FleetOpsServiceProvider.php

@@ -80,9 +80,9 @@ class FleetOpsServiceProvider extends CoreServiceProvider
         $this->registerObservers();
         $this->registerCommands();
         $this->scheduleCommands(function ($schedule) {
-            $schedule->command('fleetops:dispatch-orders')->everyMinute();
-            $schedule->command('fleetops:dispatch-adhoc')->everyMinute();
-            $schedule->command('fleetops:update-estimations')->everyFifteenMinutes();
+            $schedule->command('fleetops:dispatch-orders')->everyMinute()->withoutOverlapping()->storeOutputInDb();
+            $schedule->command('fleetops:dispatch-adhoc')->everyMinute()->withoutOverlapping()->storeOutputInDb();
+            $schedule->command('fleetops:update-estimations')->everyFiveMinutes()->withoutOverlapping();
         });
         $this->registerNotifications();
         $this->registerExpansionsFrom(__DIR__ . '/../Expansions');