@fleetbase/fleetops-engine 0.4.8 → 0.4.10

package/server/src/Support/Metrics.php

@@ -25,7 +25,7 @@ class Metrics
     protected Company $company;
     protected array $metrics = [];
 
-    public static function new(Company $company, \DateTime $start = null, \DateTime $end = null): Metrics
+    public static function new(Company $company, ?\DateTime $start = null, ?\DateTime $end = null): Metrics
     {
         $start = $start === null ? Carbon::create(1900)->toDateTime() : $start;
         $end   = $end === null ? Carbon::tomorrow()->toDateTime() : $end;
@@ -33,7 +33,7 @@ class Metrics
         return (new static())->setCompany($company)->between($start, $end);
     }
 
-    public static function forCompany(Company $company, \DateTime $start = null, \DateTime $end = null): Metrics
+    public static function forCompany(Company $company, ?\DateTime $start = null, ?\DateTime $end = null): Metrics
     {
         return static::new($company, $start, $end);
     }
@@ -106,7 +106,7 @@ class Metrics
         return $this;
     }
 
-    public function earnings(callable $callback = null): Metrics
+    public function earnings(?callable $callback = null): Metrics
     {
         $query = Transaction::where('company_uuid', $this->company->uuid)->whereBetween('created_at', [$this->start, $this->end]);
 
@@ -119,7 +119,7 @@ class Metrics
         return $this->set('earnings', (int) $data);
     }
 
-    public function fuelCosts(callable $callback = null): Metrics
+    public function fuelCosts(?callable $callback = null): Metrics
     {
         $query = FuelReport::where('company_uuid', $this->company->uuid)->whereBetween('created_at', [$this->start, $this->end]);
 
@@ -132,7 +132,7 @@ class Metrics
         return $this->set('fuel_costs', (int) $data);
     }
 
-    public function totalDistanceTraveled(callable $callback = null): Metrics
+    public function totalDistanceTraveled(?callable $callback = null): Metrics
     {
         $query = Order::where(
             [
@@ -151,7 +151,7 @@ class Metrics
         return $this->set('total_distance_traveled', (int) $data);
     }
 
-    public function totalTimeTraveled(callable $callback = null): Metrics
+    public function totalTimeTraveled(?callable $callback = null): Metrics
     {
         $query = Order::where(
             [
@@ -170,7 +170,7 @@ class Metrics
         return $this->set('total_distance_traveled', (int) $data);
     }
 
-    public function ordersCanceled(callable $callback = null): Metrics
+    public function ordersCanceled(?callable $callback = null): Metrics
     {
         $query = Order::where('company_uuid', $this->company->uuid)
             ->whereBetween('created_at', [$this->start, $this->end])
@@ -185,7 +185,7 @@ class Metrics
         return $this->set('orders_canceled', $data);
     }
 
-    public function ordersCompleted(callable $callback = null): Metrics
+    public function ordersCompleted(?callable $callback = null): Metrics
     {
         $query = Order::where('company_uuid', $this->company->uuid)
             ->whereBetween('created_at', [$this->start, $this->end])
@@ -200,7 +200,7 @@ class Metrics
         return $this->set('orders_completed', $data);
     }
 
-    public function ordersInProgress(callable $callback = null): Metrics
+    public function ordersInProgress(?callable $callback = null): Metrics
     {
         $query = Order::where('company_uuid', $this->company->uuid)
             ->whereBetween('created_at', [$this->start, $this->end])
@@ -215,7 +215,7 @@ class Metrics
         return $this->set('orders_in_progress', $data);
     }
 
-    public function ordersScheduled(callable $callback = null): Metrics
+    public function ordersScheduled(?callable $callback = null): Metrics
     {
         $query = Order::where('company_uuid', $this->company->uuid)
             ->whereBetween('created_at', [$this->start, $this->end])
@@ -231,7 +231,7 @@ class Metrics
         return $this->set('orders_scheduled', $data);
     }
 
-    public function driversOnline(callable $callback = null): Metrics
+    public function driversOnline(?callable $callback = null): Metrics
     {
         $query = Driver::where('company_uuid', $this->company->uuid)
             ->where('online', true)
@@ -246,7 +246,7 @@ class Metrics
         return $this->set('drivers_online', $data);
     }
 
-    public function totalDrivers(callable $callback = null): Metrics
+    public function totalDrivers(?callable $callback = null): Metrics
     {
         $query = Driver::where('company_uuid', $this->company->uuid);
 
@@ -259,7 +259,7 @@ class Metrics
         return $this->set('total_drivers', $data);
     }
 
-    public function totalCustomers(callable $callback = null): Metrics
+    public function totalCustomers(?callable $callback = null): Metrics
     {
         $query = Contact::where('company_uuid', $this->company->uuid)
             ->where('type', 'customer');
@@ -273,7 +273,7 @@ class Metrics
         return $this->set('total_customers', $data);
     }
 
-    public function openIssues(callable $callback = null): Metrics
+    public function openIssues(?callable $callback = null): Metrics
     {
         $query = Issue::where('company_uuid', session('company'))
             ->whereBetween('created_at', [$this->start, $this->end])
@@ -288,7 +288,7 @@ class Metrics
         return $this->set('open_issues', $data);
     }
 
-    public function resolvedIssues(callable $callback = null): Metrics
+    public function resolvedIssues(?callable $callback = null): Metrics
     {
         $query = Issue::where('company_uuid', session('company'))
             ->whereBetween('created_at', [$this->start, $this->end])

package/server/src/routes.php

@@ -23,7 +23,7 @@ Route::prefix(config('fleetops.api.routing.prefix', null))->namespace('Fleetbase
         | End-user API routes, these are routes that the SDK and applications will interface with, and require API credentials.
         */
         Route::prefix('v1')
-            ->middleware(['fleetbase.api', \Fleetbase\FleetOps\Http\Middleware\TransformLocationMiddleware::class])
+            ->middleware(['fleetbase.api', Fleetbase\FleetOps\Http\Middleware\TransformLocationMiddleware::class])
             ->namespace('Api\v1')
             ->group(function ($router) {
                 // drivers routes
@@ -194,7 +194,7 @@ Route::prefix(config('fleetops.api.routing.prefix', null))->namespace('Fleetbase
                 });
 
                 // auth:sanctum
-                $router->group(['middleware' => ['fleetbase.protected', \Fleetbase\FleetOps\Http\Middleware\TransformLocationMiddleware::class]], function () use ($router) {
+                $router->group(['middleware' => ['fleetbase.protected', Fleetbase\FleetOps\Http\Middleware\TransformLocationMiddleware::class]], function () use ($router) {
                     $router->group(['prefix' => 'orders'], function () use ($router) {
                         $router->post('/', 'Api\v1\OrderController@create');
                         $router->get('/', 'Api\v1\OrderController@query');
@@ -249,7 +249,7 @@ Route::prefix(config('fleetops.api.routing.prefix', null))->namespace('Fleetbase
                 );
 
                 $router->group(
-                    ['prefix' => 'v1', 'namespace' => 'v1', 'middleware' => ['fleetbase.protected', \Fleetbase\FleetOps\Http\Middleware\TransformLocationMiddleware::class]],
+                    ['prefix' => 'v1', 'namespace' => 'v1', 'middleware' => ['fleetbase.protected', Fleetbase\FleetOps\Http\Middleware\TransformLocationMiddleware::class]],
                     function ($router) {
                         $router->fleetbaseRoutes(
                             'contacts',