From 7a51fca2f92c793202a092e12acaa7b1a955105b Mon Sep 17 00:00:00 2001
From: Gregor Vostrak <gregor@solidtime.io>
Date: Tue, 2 Dec 2025 13:30:08 +0100
Subject: [PATCH] only show Weekly Billable Amount of current organization on
 dashboard, fixes #977

---
 app/Service/DashboardService.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Service/DashboardService.php b/app/Service/DashboardService.php
index 456a782b..250bc7f9 100644
--- a/app/Service/DashboardService.php
+++ b/app/Service/DashboardService.php
@@ -266,7 +266,8 @@ class DashboardService
                ) as aggregate'))
             ->where('billable', '=', true)
             ->whereNotNull('billable_rate')
-            ->where('user_id', '=', $user->id);
+            ->where('user_id', '=', $user->getKey())
+            ->where('organization_id', '=', $organization->getKey());
 
         $query = $this->constrainDateByPossibleDates($query, $possibleDays, $timezone);
         /** @var Collection<int, object{aggregate: int}> $resultDb */