adalal/solidtime
1
0
Fork 0
mirror of https://github.com/solidtime-io/solidtime.git synced 2026-08-16 20:22:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

only show Weekly Billable Amount of current organization on dashboard, fixes #977

Browse Source
This commit is contained in:
Gregor Vostrak
2025-12-02 13:30:08 +01:00
parent 280032ee02
commit 7a51fca2f9
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Service/DashboardService.php
View File

@@ -266,7 +266,8 @@ class DashboardService
) as aggregate')) ) as aggregate'))
->where('billable', '=', true) ->where('billable', '=', true)
->whereNotNull('billable_rate') ->whereNotNull('billable_rate')
->where('user_id', '=', $user->id); ->where('user_id', '=', $user->getKey())
->where('organization_id', '=', $organization->getKey());
$query = $this->constrainDateByPossibleDates($query, $possibleDays, $timezone); $query = $this->constrainDateByPossibleDates($query, $possibleDays, $timezone);
/** @var Collection<int, object{aggregate: int}> $resultDb */ /** @var Collection<int, object{aggregate: int}> $resultDb */