diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php index d063b5f..ca18a6b 100644 --- a/app/Http/Controllers/AdminController.php +++ b/app/Http/Controllers/AdminController.php @@ -23,13 +23,21 @@ private function groupAndSumPaymentsByYear($payments) }); } - public function reports() + public function reports(Request $request) { + $clientId = $request->get('client_id'); $today = Carbon::today(); - $paymentsInThisYear = Payment::whereBetween( + $paymentQuery = Payment::whereBetween( 'created_at', [$today->startOfYear()->toDateTimeString(), $today->endOfYear()->toDateTimeString()] - )->get(); + ); + + if($clientId) { + $paymentQuery->whereHas('project', function($query) use ($clientId) { + return $query->where('client_id', '=', $clientId); + }); + } + $paymentsInThisYear = $paymentQuery->get(); $thisYearPaymentGroup = $this->groupAndSumPaymentsByYear($paymentsInThisYear); $lastYearToday = $today->clone()->modify('-1 year');