diff --git a/app/Services/Invoice/InvoiceOneFeePerStudent.php b/app/Services/Invoice/InvoiceOneFeePerStudent.php index 69b5fe5..4a04bd4 100644 --- a/app/Services/Invoice/InvoiceOneFeePerStudent.php +++ b/app/Services/Invoice/InvoiceOneFeePerStudent.php @@ -35,7 +35,7 @@ class InvoiceOneFeePerStudent implements InvoiceDataService /** @noinspection PhpArrayIndexImmediatelyRewrittenInspection */ $invoiceData['grandTotal'] = 0; - $entries = $school->entries()->with('audition')->orderBy('created_at', 'desc')->get()->groupBy('student_id'); + $entries = $school->entries()->where('for_seating', true)->with('audition')->orderBy('created_at', 'desc')->get()->groupBy('student_id'); foreach ($school->students as $student) { $firstEntryForStudent = true; foreach ($entries[$student->id] ?? [] as $entry) { diff --git a/app/Services/Invoice/InvoiceOneFeePerStudentPerEvent.php b/app/Services/Invoice/InvoiceOneFeePerStudentPerEvent.php index ca37ddd..d1ee6e4 100644 --- a/app/Services/Invoice/InvoiceOneFeePerStudentPerEvent.php +++ b/app/Services/Invoice/InvoiceOneFeePerStudentPerEvent.php @@ -35,7 +35,7 @@ class InvoiceOneFeePerStudentPerEvent implements InvoiceDataService /** @noinspection PhpArrayIndexImmediatelyRewrittenInspection */ $invoiceData['grandTotal'] = 0; - $entries = $school->entries()->with('audition')->orderBy('created_at', 'desc')->get()->groupBy('student_id'); + $entries = $school->entries()->where('for_seating', true)->with('audition')->orderBy('created_at', 'desc')->get()->groupBy('student_id'); foreach ($school->students as $student) { $eventsEntered = []; foreach ($entries[$student->id] ?? [] as $entry) {