matt
/
auditionadmin
1
0
Fork 0
Code Issues 16 Pull Requests Packages Projects Releases Wiki Activity

only bill for students entered for seating.

This commit is contained in:
Matt Young 2025-11-05 06:40:39 -06:00
parent 834de902ac
commit 7347059d96
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Services/Invoice/InvoiceOneFeePerStudent.php
View File

@ -35,7 +35,7 @@ class InvoiceOneFeePerStudent implements InvoiceDataService
/** @noinspection PhpArrayIndexImmediatelyRewrittenInspection */ /** @noinspection PhpArrayIndexImmediatelyRewrittenInspection */
$invoiceData['grandTotal'] = 0; $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) { foreach ($school->students as $student) {
$firstEntryForStudent = true; $firstEntryForStudent = true;
foreach ($entries[$student->id] ?? [] as $entry) { foreach ($entries[$student->id] ?? [] as $entry) {

2
app/Services/Invoice/InvoiceOneFeePerStudentPerEvent.php
View File

@ -35,7 +35,7 @@ class InvoiceOneFeePerStudentPerEvent implements InvoiceDataService
/** @noinspection PhpArrayIndexImmediatelyRewrittenInspection */ /** @noinspection PhpArrayIndexImmediatelyRewrittenInspection */
$invoiceData['grandTotal'] = 0; $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) { foreach ($school->students as $student) {
$eventsEntered = []; $eventsEntered = [];
foreach ($entries[$student->id] ?? [] as $entry) { foreach ($entries[$student->id] ?? [] as $entry) {