diff --git a/app/Services/FundScheduleService.php b/app/Services/FundScheduleService.php index 132c60f8..a5c55abc 100644 --- a/app/Services/FundScheduleService.php +++ b/app/Services/FundScheduleService.php @@ -315,13 +315,13 @@ public function getMonthlySummary(int $year, int $month): array 'count' => $incomeSchedules->count(), 'total' => $incomeSchedules->sum('amount'), 'pending' => $incomeSchedules->where('status', FundSchedule::STATUS_PENDING)->sum('amount'), - 'completed' => $incomeSchedules->where('status', FundSchedule::STATUS_COMPLETED)->sum('completed_amount'), + 'completed' => $incomeSchedules->where('status', FundSchedule::STATUS_COMPLETED)->sum(fn($s) => $s->completed_amount ?: $s->amount), ], 'expense' => [ 'count' => $expenseSchedules->count(), 'total' => $expenseSchedules->sum('amount'), 'pending' => $expenseSchedules->where('status', FundSchedule::STATUS_PENDING)->sum('amount'), - 'completed' => $expenseSchedules->where('status', FundSchedule::STATUS_COMPLETED)->sum('completed_amount'), + 'completed' => $expenseSchedules->where('status', FundSchedule::STATUS_COMPLETED)->sum(fn($s) => $s->completed_amount ?: $s->amount), ], 'net' => $incomeSchedules->sum('amount') - $expenseSchedules->sum('amount'), ];