diff --git a/flexiapi/app/Http/Controllers/Admin/StatisticsController.php b/flexiapi/app/Http/Controllers/Admin/StatisticsController.php index 9a45fa6..7c89b70 100644 --- a/flexiapi/app/Http/Controllers/Admin/StatisticsController.php +++ b/flexiapi/app/Http/Controllers/Admin/StatisticsController.php @@ -106,9 +106,13 @@ class StatisticsController extends Controller $fromQuery = StatisticsCall::query(); $toQuery = StatisticsCall::query(); - if ($request->get('domain')) { - $fromQuery->where('to_domain', $request->get('domain')); - $toQuery->where('from_domain', $request->get('domain')); + $domain = $request->user()->superAdmin + ? $request->get('domain') + : $request->space->domain; + + if ($domain) { + $fromQuery->where('to_domain', $domain); + $toQuery->where('from_domain', $domain); } if ($request->get('to')) { diff --git a/flexiapi/app/Libraries/StatisticsGraphFactory.php b/flexiapi/app/Libraries/StatisticsGraphFactory.php index 1a5e993..5c3cbee 100644 --- a/flexiapi/app/Libraries/StatisticsGraphFactory.php +++ b/flexiapi/app/Libraries/StatisticsGraphFactory.php @@ -57,9 +57,9 @@ class StatisticsGraphFactory $fromQuery = StatisticsMessage::query(); $toQuery = StatisticsMessage::query(); - if (!Auth::user()?->admin) { - $fromQuery->where('from_domain', space()->domain); - $toQuery->toDomain($this->domain); + if (!Auth::user()?->superAdmin) { + $fromQuery->where('from_domain', $this->request->space->domain); + $toQuery->toDomain(space()->domain); } elseif ($this->domain) { $fromQuery->where('from_domain', $this->domain); $toQuery->toDomain($this->domain);