diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php index ca18a6b..9255373 100644 --- a/app/Http/Controllers/AdminController.php +++ b/app/Http/Controllers/AdminController.php @@ -2,6 +2,7 @@ namespace App\Http\Controllers; +use App\Models\Client; use App\Models\Payment; use Carbon\Carbon; use Illuminate\Http\Request; @@ -25,6 +26,7 @@ private function groupAndSumPaymentsByYear($payments) public function reports(Request $request) { + $clients = Client::all(); $clientId = $request->get('client_id'); $today = Carbon::today(); $paymentQuery = Payment::whereBetween( @@ -32,10 +34,12 @@ public function reports(Request $request) [$today->startOfYear()->toDateTimeString(), $today->endOfYear()->toDateTimeString()] ); + $client = null; if($clientId) { $paymentQuery->whereHas('project', function($query) use ($clientId) { return $query->where('client_id', '=', $clientId); }); + $client = Client::find($clientId); } $paymentsInThisYear = $paymentQuery->get(); $thisYearPaymentGroup = $this->groupAndSumPaymentsByYear($paymentsInThisYear); @@ -59,6 +63,6 @@ public function reports(Request $request) 'sum' => $lastYearPaymentGroup->sum(), ], ]; - return view('reports', ['data' => $data]); + return view('reports', ['data' => $data, 'client' => $client, 'clients' => $clients]); } } diff --git a/resources/views/reports.blade.php b/resources/views/reports.blade.php index a1a583a..aa720e0 100644 --- a/resources/views/reports.blade.php +++ b/resources/views/reports.blade.php @@ -4,6 +4,25 @@