Fix semester context, attendance rosters, and billing workflows
Deploy to Shared Hosting / Shared hosting deploy (push) Failing after 31s
Tests / PHPUnit (push) Failing after 55s

- load global semester helpers consistently and use date-based semester defaults
- fix grading and daily attendance duplicate student/section rows
- keep attendance violations scoped to the current semester by default
- update invoice, refund, discount, payment, and financial aid flows
- add configuration cleanup migrations for duplicate calendar/semester keys
- refresh parent registration/report-card and print request handling
- update related models, services, views, cron notes, and test coverage
This commit is contained in:
root
2026-08-16 17:41:11 -04:00
parent 36c7e3fc6d
commit 0ac3a8375e
99 changed files with 1598 additions and 814 deletions
+50 -11
View File
@@ -23,7 +23,7 @@ class FeeCalculationService
$schoolYear = $configModel->getConfig('school_year');
$refundDeadline = date('Y-m-d', strtotime($configModel->getConfig('refund_deadline')));
$weekOfStudy = (float) ($configModel->getConfig('weeks_study') ?? 8);
$schoolEndDate = date('Y-m-d', strtotime($configModel->getConfig('last_school_day')));
$schoolEndDate = date('Y-m-d', strtotime($configModel->getConfig('last_day_of_school')));
$totalPaid = $paymentModel->getTotalPaidByParentId($parentId, $schoolYear);
if ($totalPaid <= 0) {
@@ -55,7 +55,18 @@ class FeeCalculationService
return 0;
}
// Combine all students for proper fee tiering
usort($withdrawnStudents, function ($a, $b) {
$leftDate = strtotime((string)($a['withdrawal_date'] ?? '')) ?: PHP_INT_MAX;
$rightDate = strtotime((string)($b['withdrawal_date'] ?? '')) ?: PHP_INT_MAX;
if ($leftDate !== $rightDate) {
return $leftDate <=> $rightDate;
}
return $this->compareGrades($a['grade'], $b['grade']);
});
// Combine all students for proper fee tiering before withdrawal.
$allStudents = array_merge($registeredStudents, $withdrawnStudents);
// Sort all students by grade for correct tiering
@@ -67,17 +78,16 @@ class FeeCalculationService
$firstStudentFee = (float) ($configModel->getConfig('first_student_fee') ?? 380);
$secondStudentFee = (float) ($configModel->getConfig('second_student_fee') ?? 280);
// Assign tuition_fee to all students (before filtering refunds)
$studentCount = 0;
foreach ($allStudents as &$student) {
$studentFee = ($studentCount === 0) ? $firstStudentFee : $secondStudentFee;
$studentCount++;
$student['tuition_fee'] = $studentFee;
}
unset($student);
$refundFeeStack = $this->reverseTuitionRefundFeeStack(
count($allStudents),
count($registeredStudents),
$firstStudentFee,
$secondStudentFee
);
// Calculate refund for withdrawn students
$refundAmount = 0;
$withdrawnRefundIndex = 0;
foreach ($withdrawnStudents as $student) {
if (empty($student['withdrawal_date'])) {
@@ -96,7 +106,8 @@ class FeeCalculationService
$daysRemaining = $withdrawDateObj->diff($schoolEndDateObj)->days;
$weeksRemaining = min($weekOfStudy, max(0, ceil($daysRemaining / 7)));
$studentFee = (float) ($student['tuition_fee'] ?? 0);
$studentFee = (float) ($refundFeeStack[$withdrawnRefundIndex] ?? 0);
$withdrawnRefundIndex++;
$proportionalRefund = ($studentFee / $weekOfStudy) * $weeksRemaining;
$refundAmount += $proportionalRefund;
@@ -112,6 +123,34 @@ class FeeCalculationService
return $refundAmount;
}
/**
* Refunds reverse the family tuition stack.
*
* Example: three students are charged [first, additional, additional].
* If one student withdraws, refund the last/additional fee first, not the
* withdrawn student's sorted family position.
*
* @return array<int,float>
*/
private function reverseTuitionRefundFeeStack(
int $originalStudentCount,
int $remainingStudentCount,
float $firstStudentFee,
float $additionalStudentFee
): array {
$withdrawnCount = max(0, $originalStudentCount - $remainingStudentCount);
if ($withdrawnCount === 0) {
return [];
}
$fees = [];
for ($position = $originalStudentCount; $position > $remainingStudentCount; $position--) {
$fees[] = $position === 1 ? $firstStudentFee : $additionalStudentFee;
}
return $fees;
}
private function compareGrades($gradeA, $gradeB)
{