diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php index 9255373..3f0181a 100644 --- a/app/Http/Controllers/AdminController.php +++ b/app/Http/Controllers/AdminController.php @@ -34,12 +34,12 @@ public function reports(Request $request) [$today->startOfYear()->toDateTimeString(), $today->endOfYear()->toDateTimeString()] ); - $client = null; + $requestClient = null; if($clientId) { $paymentQuery->whereHas('project', function($query) use ($clientId) { return $query->where('client_id', '=', $clientId); }); - $client = Client::find($clientId); + $requestClient = Client::find($clientId); } $paymentsInThisYear = $paymentQuery->get(); $thisYearPaymentGroup = $this->groupAndSumPaymentsByYear($paymentsInThisYear); @@ -63,6 +63,6 @@ public function reports(Request $request) 'sum' => $lastYearPaymentGroup->sum(), ], ]; - return view('reports', ['data' => $data, 'client' => $client, 'clients' => $clients]); + return view('reports', ['data' => $data, 'requestClient' => $requestClient, 'clients' => $clients]); } } diff --git a/resources/views/reports.blade.php b/resources/views/reports.blade.php index 9159b09..a250e3c 100644 --- a/resources/views/reports.blade.php +++ b/resources/views/reports.blade.php @@ -22,8 +22,8 @@ - @if($client) -