@fleetbase/fleetops-engine 0.6.58 → 0.6.60

package/server/src/Support/Ai/Capabilities/CreateOrderPreviewCapability.php

@@ -161,15 +161,13 @@ class CreateOrderPreviewCapability extends AbstractFleetOpsAICapability implemen
             'vehicle_query',
         ]);
 
-        /** @var OrderController $controller */
-        $controller = app(OrderController::class);
-        $response   = $controller->createRecord(new Request(['order' => $draft]));
+        $response = $this->orderController()->createRecord(new Request(['order' => $draft]));
 
-        if ($response instanceof JsonResponse && $response->getStatusCode() >= 400) {
+        if ($this->orderResponseFailed($response)) {
             throw new \RuntimeException((string) $response->getContent());
         }
 
-        $order = data_get($response, 'order');
+        $order = $this->orderFromResponse($response);
 
         return [
             'action'   => $this->key(),
@@ -185,6 +183,21 @@ class CreateOrderPreviewCapability extends AbstractFleetOpsAICapability implemen
         ];
     }
 
+    protected function orderController(): OrderController
+    {
+        return app(OrderController::class);
+    }
+
+    protected function orderResponseFailed($response): bool
+    {
+        return $response instanceof JsonResponse && $response->getStatusCode() >= 400;
+    }
+
+    protected function orderFromResponse($response)
+    {
+        return data_get($response, 'order');
+    }
+
     protected function sanitizeDraftForApply(array $draft): array
     {
         foreach (['pickup', 'dropoff', 'return'] as $role) {

package/server/src/Support/Ai/Capabilities/OrderInsightsCapability.php

@@ -37,7 +37,7 @@ class OrderInsightsCapability extends AbstractFleetOpsAICapability
         $prompt = $this->prompt($task);
         $window = $this->dateWindow($prompt);
         $amount = $this->amountThreshold($prompt);
-        $query  = Order::where('company_uuid', session('company'));
+        $query  = $this->orderQuery(session('company'));
 
         if ($window) {
             $query->whereBetween('created_at', [$window['start'], $window['end']]);
@@ -88,6 +88,11 @@ class OrderInsightsCapability extends AbstractFleetOpsAICapability
         return $this->relativeDateResolver()->resolveWindow($prompt);
     }
 
+    protected function orderQuery(?string $companyUuid): mixed
+    {
+        return Order::where('company_uuid', $companyUuid);
+    }
+
     protected function relativeDateResolver(): AiRelativeDateResolver
     {
         return function_exists('app') ? app(AiRelativeDateResolver::class) : new AiRelativeDateResolver(null);

package/server/src/Support/Ai/Capabilities/SearchResourcesCapability.php

@@ -74,8 +74,7 @@ class SearchResourcesCapability extends AbstractFleetOpsAICapability
             return [];
         }
 
-        return Order::with(['transaction', 'trackingNumber'])
-            ->where('company_uuid', session('company'))
+        return $this->orderSearchQuery()
             ->where(function ($query) use ($terms) {
                 $this->whereLikeAny($query, ['public_id', 'internal_id', 'uuid', 'status', 'type'], $terms);
                 $query->orWhereHas('trackingNumber', fn ($tracking) => $this->whereLikeAny($tracking, ['tracking_number', 'barcode'], $terms));
@@ -103,7 +102,7 @@ class SearchResourcesCapability extends AbstractFleetOpsAICapability
             return [];
         }
 
-        return Vehicle::where('company_uuid', session('company'))
+        return $this->vehicleSearchQuery()
             ->where(fn ($query) => $this->whereLikeAny($query, ['name', 'make', 'model', 'plate_number', 'vin', 'public_id', 'internal_id'], $terms))
             ->limit(5)
             ->get()
@@ -126,8 +125,7 @@ class SearchResourcesCapability extends AbstractFleetOpsAICapability
             return [];
         }
 
-        return Driver::with('user')
-            ->where('company_uuid', session('company'))
+        return $this->driverSearchQuery()
             ->where(function ($query) use ($terms) {
                 $this->whereLikeAny($query, ['public_id', 'uuid', 'drivers_license_number', 'status'], $terms);
                 $query->orWhereHas('user', fn ($user) => $this->whereLikeAny($user, ['name', 'email', 'phone'], $terms));
@@ -177,7 +175,7 @@ class SearchResourcesCapability extends AbstractFleetOpsAICapability
             return [];
         }
 
-        return $modelClass::where('company_uuid', session('company'))
+        return $this->genericSearchQuery($modelClass)
             ->where(fn ($query) => $this->whereLikeAny($query, $columns, $terms))
             ->limit(5)
             ->get()
@@ -192,4 +190,26 @@ class SearchResourcesCapability extends AbstractFleetOpsAICapability
             ->values()
             ->all();
     }
+
+    protected function orderSearchQuery()
+    {
+        return Order::with(['transaction', 'trackingNumber'])
+            ->where('company_uuid', session('company'));
+    }
+
+    protected function vehicleSearchQuery()
+    {
+        return Vehicle::where('company_uuid', session('company'));
+    }
+
+    protected function driverSearchQuery()
+    {
+        return Driver::with('user')
+            ->where('company_uuid', session('company'));
+    }
+
+    protected function genericSearchQuery(string $modelClass)
+    {
+        return $modelClass::where('company_uuid', session('company'));
+    }
 }

package/server/src/Support/Analytics/FuelEfficiency.php

@@ -35,9 +35,15 @@ class FuelEfficiency extends AbstractAnalytics
             ->orderBy('wk')
             ->pluck('total_distance', 'wk');
 
-        $labels    = [];
-        $costData  = [];
-        $cpkmData  = [];
+        return $this->buildFuelEfficiencyPayload($fuelByWeek, $distanceByWeek, $currency);
+    }
+
+    protected function buildFuelEfficiencyPayload(iterable $fuelByWeek, iterable $distanceByWeek, string $currency): array
+    {
+        $labels          = [];
+        $costData        = [];
+        $cpkmData        = [];
+        $distanceByWeek  = collect($distanceByWeek);
 
         foreach ($fuelByWeek as $row) {
             $labels[]   = Carbon::parse($row->wk_start)->format('M j');

package/server/src/Support/Analytics/FuelProviderSummary.php

@@ -9,11 +9,8 @@ class FuelProviderSummary extends AbstractAnalytics
 {
     public function get(): array
     {
-        $transactions = FuelProviderTransaction::where('company_uuid', $this->company->uuid)
-            ->whereBetween('transaction_at', [$this->start, $this->end])
-            ->get();
-
-        $connections = FuelProviderConnection::where('company_uuid', $this->company->uuid)->get();
+        $transactions = $this->transactions($this->company->uuid);
+        $connections  = $this->connections($this->company->uuid);
 
         $byProvider = $transactions
             ->groupBy('provider')
@@ -39,4 +36,16 @@ class FuelProviderSummary extends AbstractAnalytics
             'providers' => $byProvider,
         ];
     }
+
+    protected function transactions(string $companyUuid)
+    {
+        return FuelProviderTransaction::where('company_uuid', $companyUuid)
+            ->whereBetween('transaction_at', [$this->start, $this->end])
+            ->get();
+    }
+
+    protected function connections(string $companyUuid)
+    {
+        return FuelProviderConnection::where('company_uuid', $companyUuid)->get();
+    }
 }

package/server/src/Support/Analytics/GeofenceViolations.php

@@ -18,46 +18,66 @@ class GeofenceViolations extends AbstractAnalytics
         $start       = $this->start ?? Carbon::now()->subDays(7)->toDateTime();
         $end         = $this->end ?? Carbon::now()->toDateTime();
 
-        $violationsToday = GeofenceEventLog::where('company_uuid', $companyUuid)
+        $violationsToday = $this->violationsToday($companyUuid);
+
+        $violationsPeriod = $this->violationsPeriod($companyUuid, $start, $end);
+
+        $topDwells = $this->topDwells($companyUuid, $start, $end);
+
+        $byZoneRows = $this->byZoneRows($companyUuid, $start, $end);
+
+        return [
+            'violations_today'  => $violationsToday,
+            'violations_period' => $violationsPeriod,
+            'top_dwells'        => $topDwells->map(fn ($e) => [
+                'driver_uuid'      => $e->driver_uuid,
+                'driver_name'      => $e->subject_name,
+                'zone_name'        => $e->geofence_name,
+                'duration_minutes' => (int) $e->dwell_duration_minutes,
+                'occurred_at'      => $e->occurred_at,
+            ])->all(),
+            'by_zone' => [
+                'labels' => $byZoneRows->pluck('geofence_name')->map(fn ($n) => $n ?: 'Unnamed')->all(),
+                'data'   => $byZoneRows->pluck('total')->map(fn ($v) => (int) $v)->all(),
+            ],
+        ];
+    }
+
+    protected function violationsToday(string $companyUuid): int
+    {
+        return GeofenceEventLog::where('company_uuid', $companyUuid)
             ->where('event_type', 'dwelled')
             ->whereDate('occurred_at', Carbon::today())
             ->count();
+    }
 
-        $violationsPeriod = GeofenceEventLog::where('company_uuid', $companyUuid)
+    protected function violationsPeriod(string $companyUuid, \DateTimeInterface $start, \DateTimeInterface $end): int
+    {
+        return GeofenceEventLog::where('company_uuid', $companyUuid)
             ->where('event_type', 'dwelled')
             ->whereBetween('occurred_at', [$start, $end])
             ->count();
+    }
 
-        $topDwells = GeofenceEventLog::where('company_uuid', $companyUuid)
+    protected function topDwells(string $companyUuid, \DateTimeInterface $start, \DateTimeInterface $end)
+    {
+        return GeofenceEventLog::where('company_uuid', $companyUuid)
             ->where('event_type', 'dwelled')
             ->whereBetween('occurred_at', [$start, $end])
             ->whereNotNull('dwell_duration_minutes')
             ->orderByDesc('dwell_duration_minutes')
             ->limit(8)
             ->get(['subject_name', 'driver_uuid', 'geofence_name', 'dwell_duration_minutes', 'occurred_at']);
+    }
 
-        $byZoneRows = GeofenceEventLog::where('company_uuid', $companyUuid)
+    protected function byZoneRows(string $companyUuid, \DateTimeInterface $start, \DateTimeInterface $end)
+    {
+        return GeofenceEventLog::where('company_uuid', $companyUuid)
             ->whereBetween('occurred_at', [$start, $end])
             ->selectRaw('geofence_name, COUNT(*) as total')
             ->groupBy('geofence_name')
             ->orderByRaw('total DESC')
             ->limit(8)
             ->get();
-
-        return [
-            'violations_today'  => $violationsToday,
-            'violations_period' => $violationsPeriod,
-            'top_dwells'        => $topDwells->map(fn ($e) => [
-                'driver_uuid'      => $e->driver_uuid,
-                'driver_name'      => $e->subject_name,
-                'zone_name'        => $e->geofence_name,
-                'duration_minutes' => (int) $e->dwell_duration_minutes,
-                'occurred_at'      => $e->occurred_at,
-            ])->all(),
-            'by_zone' => [
-                'labels' => $byZoneRows->pluck('geofence_name')->map(fn ($n) => $n ?: 'Unnamed')->all(),
-                'data'   => $byZoneRows->pluck('total')->map(fn ($v) => (int) $v)->all(),
-            ],
-        ];
     }
 }

package/server/src/Support/Analytics/IssuesInsights.php

@@ -17,27 +17,13 @@ class IssuesInsights extends AbstractAnalytics
         $start       = $this->start ?? Carbon::now()->subDays(30)->toDateTime();
         $end         = $this->end ?? Carbon::now()->toDateTime();
 
-        $byCategory = Issue::where('company_uuid', $companyUuid)
-            ->whereBetween('created_at', [$start, $end])
-            ->selectRaw('category, COUNT(*) as total')
-            ->groupBy('category')
-            ->orderByRaw('total DESC')
-            ->get();
+        $byCategory = $this->byCategory($companyUuid, $start, $end);
 
-        $byPriority = Issue::where('company_uuid', $companyUuid)
-            ->whereBetween('created_at', [$start, $end])
-            ->selectRaw('priority, COUNT(*) as total')
-            ->groupBy('priority')
-            ->pluck('total', 'priority');
+        $byPriority = $this->byPriority($companyUuid, $start, $end);
 
-        $open = Issue::where('company_uuid', $companyUuid)
-            ->where('status', 'pending')
-            ->count();
+        $open = $this->openCount($companyUuid);
 
-        $resolvedInWindow = Issue::where('company_uuid', $companyUuid)
-            ->whereNotNull('resolved_at')
-            ->whereBetween('resolved_at', [$start, $end])
-            ->get(['created_at', 'resolved_at']);
+        $resolvedInWindow = $this->resolvedInWindow($companyUuid, $start, $end);
 
         $totalHours = 0.0;
         foreach ($resolvedInWindow as $issue) {
@@ -64,4 +50,38 @@ class IssuesInsights extends AbstractAnalytics
             'avg_resolution_hours'   => $avgResolutionHours,
         ];
     }
+
+    protected function byCategory(string $companyUuid, \DateTimeInterface $start, \DateTimeInterface $end)
+    {
+        return Issue::where('company_uuid', $companyUuid)
+            ->whereBetween('created_at', [$start, $end])
+            ->selectRaw('category, COUNT(*) as total')
+            ->groupBy('category')
+            ->orderByRaw('total DESC')
+            ->get();
+    }
+
+    protected function byPriority(string $companyUuid, \DateTimeInterface $start, \DateTimeInterface $end)
+    {
+        return Issue::where('company_uuid', $companyUuid)
+            ->whereBetween('created_at', [$start, $end])
+            ->selectRaw('priority, COUNT(*) as total')
+            ->groupBy('priority')
+            ->pluck('total', 'priority');
+    }
+
+    protected function openCount(string $companyUuid): int
+    {
+        return Issue::where('company_uuid', $companyUuid)
+            ->where('status', 'pending')
+            ->count();
+    }
+
+    protected function resolvedInWindow(string $companyUuid, \DateTimeInterface $start, \DateTimeInterface $end)
+    {
+        return Issue::where('company_uuid', $companyUuid)
+            ->whereNotNull('resolved_at')
+            ->whereBetween('resolved_at', [$start, $end])
+            ->get(['created_at', 'resolved_at']);
+    }
 }

package/server/src/Support/Analytics/MaintenanceOverview.php

@@ -17,54 +17,84 @@ class MaintenanceOverview extends AbstractAnalytics
         $currency    = $this->companyCurrency();
         $now         = Carbon::now();
 
-        $overdue = Maintenance::where('company_uuid', $companyUuid)
+        $overdue = $this->overdueCount($companyUuid, $now);
+
+        $next7d = $this->nextSevenDaysCount($companyUuid, $now);
+
+        $inProgress = $this->inProgressCount($companyUuid);
+
+        $costThisMonth = (float) $this->costThisMonth($companyUuid, $currency, $now);
+
+        $costYtd = (float) $this->costYtd($companyUuid, $currency, $now);
+
+        $upcoming = $this->upcomingMaintenance($companyUuid, $now);
+
+        return [
+            'overdue'           => $overdue,
+            'scheduled_next_7d' => $next7d,
+            'in_progress'       => $inProgress,
+            'cost_this_month'   => round($costThisMonth, 2),
+            'cost_ytd'          => round($costYtd, 2),
+            'currency'          => $currency,
+            'upcoming'          => $upcoming->map(fn ($m) => [
+                'uuid'         => $m->uuid,
+                'type'         => $m->type,
+                'priority'     => $m->priority,
+                'scheduled_at' => $m->scheduled_at,
+            ])->all(),
+        ];
+    }
+
+    protected function overdueCount(string $companyUuid, Carbon $now): int
+    {
+        return Maintenance::where('company_uuid', $companyUuid)
             ->where('scheduled_at', '<', $now)
             ->where('status', '!=', 'completed')
             ->where('status', '!=', 'canceled')
             ->count();
+    }
 
-        $next7d = Maintenance::where('company_uuid', $companyUuid)
+    protected function nextSevenDaysCount(string $companyUuid, Carbon $now): int
+    {
+        return Maintenance::where('company_uuid', $companyUuid)
             ->whereBetween('scheduled_at', [$now, $now->copy()->addDays(7)])
             ->whereIn('status', ['scheduled', 'pending'])
             ->count();
+    }
 
-        $inProgress = Maintenance::where('company_uuid', $companyUuid)
+    protected function inProgressCount(string $companyUuid): int
+    {
+        return Maintenance::where('company_uuid', $companyUuid)
             ->where('status', 'in_progress')
             ->count();
+    }
 
-        $costThisMonth = (float) Maintenance::where('company_uuid', $companyUuid)
+    protected function costThisMonth(string $companyUuid, string $currency, Carbon $now): int|float
+    {
+        return Maintenance::where('company_uuid', $companyUuid)
             ->where('currency', $currency)
             ->where('status', 'completed')
             ->whereBetween('completed_at', [$now->copy()->startOfMonth(), $now])
             ->sum('total_cost');
+    }
 
-        $costYtd = (float) Maintenance::where('company_uuid', $companyUuid)
+    protected function costYtd(string $companyUuid, string $currency, Carbon $now): int|float
+    {
+        return Maintenance::where('company_uuid', $companyUuid)
             ->where('currency', $currency)
             ->where('status', 'completed')
             ->whereBetween('completed_at', [$now->copy()->startOfYear(), $now])
             ->sum('total_cost');
+    }
 
-        $upcoming = Maintenance::where('company_uuid', $companyUuid)
+    protected function upcomingMaintenance(string $companyUuid, Carbon $now)
+    {
+        return Maintenance::where('company_uuid', $companyUuid)
             ->whereIn('status', ['scheduled', 'pending'])
             ->whereNotNull('scheduled_at')
             ->where('scheduled_at', '>=', $now)
             ->orderBy('scheduled_at', 'asc')
             ->limit(8)
             ->get(['uuid', 'maintainable_uuid', 'maintainable_type', 'type', 'priority', 'scheduled_at']);
-
-        return [
-            'overdue'           => $overdue,
-            'scheduled_next_7d' => $next7d,
-            'in_progress'       => $inProgress,
-            'cost_this_month'   => round($costThisMonth, 2),
-            'cost_ytd'          => round($costYtd, 2),
-            'currency'          => $currency,
-            'upcoming'          => $upcoming->map(fn ($m) => [
-                'uuid'         => $m->uuid,
-                'type'         => $m->type,
-                'priority'     => $m->priority,
-                'scheduled_at' => $m->scheduled_at,
-            ])->all(),
-        ];
     }
 }

package/server/src/Support/Analytics/OnTimeDelivery.php

@@ -3,6 +3,7 @@
 namespace Fleetbase\FleetOps\Support\Analytics;
 
 use Fleetbase\FleetOps\Models\Order;
+use Fleetbase\FleetOps\Support\Utils;
 use Illuminate\Support\Carbon;
 
 /**
@@ -48,7 +49,7 @@ class OnTimeDelivery extends AbstractAnalytics
     }
 
     /** @return array{0:int,1:int,2:int} [onTime, late, total] */
-    private function bucketCounts(\DateTimeInterface $start, \DateTimeInterface $end): array
+    protected function bucketCounts(\DateTimeInterface $start, \DateTimeInterface $end): array
     {
         $slaSeconds = $this->slaMinutes * 60;
 
@@ -57,7 +58,7 @@ class OnTimeDelivery extends AbstractAnalytics
             ->whereNotNull('scheduled_at')
             ->whereNotNull('updated_at')
             ->whereBetween('updated_at', [$start, $end])
-            ->selectRaw('TIMESTAMPDIFF(SECOND, scheduled_at, updated_at) as drift_seconds')
+            ->selectRaw(Utils::sqlSecondsDiff('scheduled_at', 'updated_at') . ' as drift_seconds')
             ->get();
 
         $onTime = 0;

package/server/src/Support/Analytics/OperationsPulse.php

@@ -19,41 +19,18 @@ class OperationsPulse extends AbstractAnalytics
     {
         $companyUuid = $this->company->uuid;
 
-        $activeOrders        = Order::where('company_uuid', $companyUuid)
-            ->whereIn('status', OrdersInProgressMetric::IN_PROGRESS_STATUSES)
-            ->count();
-
-        $driversOnline       = Driver::where('company_uuid', $companyUuid)
-            ->where('online', true)
-            ->whereNotNull('current_job_uuid')
-            ->count();
-
-        $totalDrivers        = Driver::where('company_uuid', $companyUuid)->count();
-
-        $vehiclesDeployed    = Vehicle::where('company_uuid', $companyUuid)
-            ->whereHas('driver', fn ($q) => $q->whereNotNull('current_job_uuid'))
-            ->count();
-
-        $totalVehicles       = Vehicle::where('company_uuid', $companyUuid)->count();
-
-        $issuesOpen          = Issue::where('company_uuid', $companyUuid)
-            ->where('status', 'pending')
-            ->count();
-
-        $todayStart          = Carbon::today();
-        $yesterdayStart      = Carbon::yesterday();
-        $todaySoFar          = Carbon::now();
-        $yesterdaySamePoint  = $yesterdayStart->copy()->setTime($todaySoFar->hour, $todaySoFar->minute);
-
-        $completedToday      = Order::where('company_uuid', $companyUuid)
-            ->where('status', 'completed')
-            ->whereBetween('updated_at', [$todayStart, $todaySoFar])
-            ->count();
-
-        $completedYesterdayToTime = Order::where('company_uuid', $companyUuid)
-            ->where('status', 'completed')
-            ->whereBetween('updated_at', [$yesterdayStart, $yesterdaySamePoint])
-            ->count();
+        $todayStart               = Carbon::today();
+        $yesterdayStart           = Carbon::yesterday();
+        $todaySoFar               = Carbon::now();
+        $yesterdaySamePoint       = $yesterdayStart->copy()->setTime($todaySoFar->hour, $todaySoFar->minute);
+        $activeOrders             = $this->activeOrders($companyUuid);
+        $driversOnline            = $this->driversOnline($companyUuid);
+        $totalDrivers             = $this->totalDrivers($companyUuid);
+        $vehiclesDeployed         = $this->vehiclesDeployed($companyUuid);
+        $totalVehicles            = $this->totalVehicles($companyUuid);
+        $issuesOpen               = $this->issuesOpen($companyUuid);
+        $completedToday           = $this->completedOrdersBetween($companyUuid, $todayStart, $todaySoFar);
+        $completedYesterdayToTime = $this->completedOrdersBetween($companyUuid, $yesterdayStart, $yesterdaySamePoint);
 
         return [
             'active_orders'     => ['value' => $activeOrders, 'delta_pct' => null],
@@ -75,6 +52,53 @@ class OperationsPulse extends AbstractAnalytics
         ];
     }
 
+    protected function activeOrders(string $companyUuid): int
+    {
+        return Order::where('company_uuid', $companyUuid)
+            ->whereIn('status', OrdersInProgressMetric::IN_PROGRESS_STATUSES)
+            ->count();
+    }
+
+    protected function driversOnline(string $companyUuid): int
+    {
+        return Driver::where('company_uuid', $companyUuid)
+            ->where('online', true)
+            ->whereNotNull('current_job_uuid')
+            ->count();
+    }
+
+    protected function totalDrivers(string $companyUuid): int
+    {
+        return Driver::where('company_uuid', $companyUuid)->count();
+    }
+
+    protected function vehiclesDeployed(string $companyUuid): int
+    {
+        return Vehicle::where('company_uuid', $companyUuid)
+            ->whereHas('driver', fn ($q) => $q->whereNotNull('current_job_uuid'))
+            ->count();
+    }
+
+    protected function totalVehicles(string $companyUuid): int
+    {
+        return Vehicle::where('company_uuid', $companyUuid)->count();
+    }
+
+    protected function issuesOpen(string $companyUuid): int
+    {
+        return Issue::where('company_uuid', $companyUuid)
+            ->where('status', 'pending')
+            ->count();
+    }
+
+    protected function completedOrdersBetween(string $companyUuid, Carbon $start, Carbon $end): int
+    {
+        return Order::where('company_uuid', $companyUuid)
+            ->where('status', 'completed')
+            ->whereBetween('updated_at', [$start, $end])
+            ->count();
+    }
+
     private function deltaPct(int $current, int $previous): ?float
     {
         if ($previous === 0) {

package/server/src/Support/Analytics/OrdersByStatus.php

@@ -25,13 +25,7 @@ class OrdersByStatus extends AbstractAnalytics
         $start = $this->start ?? Carbon::now()->subDays(14)->toDateTime();
         $end   = $this->end ?? Carbon::now()->toDateTime();
 
-        $rows = Order::where('company_uuid', $this->company->uuid)
-            ->whereBetween('created_at', [$start, $end])
-            ->whereIn('status', array_keys(self::STATUS_PALETTE))
-            ->selectRaw('DATE(created_at) as bucket, status, COUNT(*) as total')
-            ->groupBy('bucket', 'status')
-            ->orderBy('bucket')
-            ->get();
+        $rows = $this->statusRows($start, $end);
 
         $cursor    = Carbon::instance($start)->startOfDay();
         $endDay    = Carbon::instance($end)->startOfDay();
@@ -61,4 +55,15 @@ class OrdersByStatus extends AbstractAnalytics
             'datasets' => $datasets,
         ];
     }
+
+    protected function statusRows(\DateTimeInterface $start, \DateTimeInterface $end)
+    {
+        return Order::where('company_uuid', $this->company->uuid)
+            ->whereBetween('created_at', [$start, $end])
+            ->whereIn('status', array_keys(self::STATUS_PALETTE))
+            ->selectRaw('DATE(created_at) as bucket, status, COUNT(*) as total')
+            ->groupBy('bucket', 'status')
+            ->orderBy('bucket')
+            ->get();
+    }
 }

package/server/src/Support/Analytics/RevenueTrend.php

@@ -32,11 +32,7 @@ class RevenueTrend extends AbstractAnalytics
             default => '%Y-%m-%d',
         };
 
-        $rows = ActiveRevenueQuery::forCompany($this->company, $currency, $start, $end)
-            ->selectRaw('DATE_FORMAT(created_at, ?) as bucket, SUM(amount) as total', [$format])
-            ->groupBy('bucket')
-            ->orderBy('bucket')
-            ->get();
+        $rows = $this->revenueRows($currency, $start, $end, $format);
 
         $labels = $rows->pluck('bucket')->all();
         $data   = $rows->pluck('total')->map(fn ($v) => (float) $v)->all();
@@ -45,7 +41,7 @@ class RevenueTrend extends AbstractAnalytics
         $duration       = $end->getTimestamp() - $start->getTimestamp();
         $compareStart   = (clone $start);
         $compareStart   = (new \DateTime())->setTimestamp($start->getTimestamp() - $duration);
-        $previousTotal  = (float) ActiveRevenueQuery::forCompany($this->company, $currency, $compareStart, $start)->sum('amount');
+        $previousTotal  = $this->previousTotal($currency, $compareStart, $start);
 
         $deltaPct = $previousTotal > 0
             ? round((($total - $previousTotal) / $previousTotal) * 100, 1)
@@ -70,4 +66,18 @@ class RevenueTrend extends AbstractAnalytics
             ],
         ];
     }
+
+    protected function revenueRows(string $currency, \DateTimeInterface $start, \DateTimeInterface $end, string $format)
+    {
+        return ActiveRevenueQuery::forCompany($this->company, $currency, $start, $end)
+            ->selectRaw('DATE_FORMAT(created_at, ?) as bucket, SUM(amount) as total', [$format])
+            ->groupBy('bucket')
+            ->orderBy('bucket')
+            ->get();
+    }
+
+    protected function previousTotal(string $currency, \DateTimeInterface $compareStart, \DateTimeInterface $start): float
+    {
+        return (float) ActiveRevenueQuery::forCompany($this->company, $currency, $compareStart, $start)->sum('amount');
+    }
 }